Merge branch 'master' into adam/19/10/colors

Author: JakeDawkins

.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2.1
 orbs:
   # `oss` is a local reference to the package.  The source for Apollo Orbs can
   # be found at http://github.com/apollographql/CircleCI-Orbs.
-  oss: apollo/oss-ci-cd-tooling@0.0.7
+  oss: apollo/oss-ci-cd-tooling@0.0.8
 
 commands:
   # These are the steps used for each version of Node which we're testing

packages/apollo/src/commands/service/__tests__/__snapshots__/list.test.ts.snap

@@ -3,8 +3,8 @@
 exports[`service:list integration should display non federated message for a non federated service vanilla 1`] = `
 "Loading Apollo Project [started]
 Loading Apollo Project [completed]
-Fetching list of services for graph engine [started]
-Fetching list of services for graph engine [completed]
+Fetching list of services for graph engine@master [started]
+Fetching list of services for graph engine@master [completed]
 
 There are no services on this federated graph
 "
@@ -13,8 +13,8 @@ There are no services on this federated graph
 exports[`service:list integration should list services correctly for a federated service vanilla 1`] = `
 "Loading Apollo Project [started]
 Loading Apollo Project [completed]
-Fetching list of services for graph engine [started]
-Fetching list of services for graph engine [completed]
+Fetching list of services for graph engine@master [started]
+Fetching list of services for graph engine@master [completed]
 ╔═══════════╤═══════════════════════════════╤═══════════════════════════╗
 ║ Name      │ URL                           │ Last Updated              ║
 ╟───────────┼───────────────────────────────┼───────────────────────────╢

packages/apollo/src/commands/service/list.ts

@@ -124,7 +124,7 @@ export default class ServiceList extends ProjectCommand {
         return [
           {
             title: `Fetching list of services for graph ${chalk.cyan(
-              graphName
+              graphName + "@" + variant
             )}`,
             task: async (ctx: TasksOutput, task) => {
               const {