Repository: apollographql/apollo-tooling
Pull request #1888 (2020-04-11 08:16:33)

chore(deps): update dependency mkdirp to v1
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [mkdirp](https://togithub.com/isaacs/node-mkdirp) | dependencies | major | [`0.5.5` -> `1.0.4`](https://renovatebot.com/diffs/npm/mkdirp/0.5.5/1.0.4) |
| [@types/mkdirp](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | devDependencies | patch | [`1.0.0` -> `1.0.1`](https://renovatebot.com/diffs/npm/@types%2fmkdirp/1.0.0/1.0.1) |

---

### Release Notes

<details>
<summary>isaacs/node-mkdirp</summary>

### [`v1.0.4`](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4)

[Compare Source](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4)

### [`v1.0.3`](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.2...v1.0.3)

[Compare Source](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.2...v1.0.3)

### [`v1.0.2`](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.1...v1.0.2)

[Compare Source](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.1...v1.0.2)

### [`v1.0.1`](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.0...v1.0.1)

[Compare Source](https://togithub.com/isaacs/node-mkdirp/compare/v1.0.0...v1.0.1)

### [`v1.0.0`](https://togithub.com/isaacs/node-mkdirp/compare/v0.5.5...v1.0.0)

[Compare Source](https://togithub.com/isaacs/node-mkdirp/compare/v0.5.5...v1.0.0)

</details>

---

### Renovate configuration

:date: **Schedule**: "every weekend" in timezone America/Los_Angeles.

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/apollographql/apollo-tooling).


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c978a334..aec518e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@
 - `apollo-env`
   - <First `apollo-env` related entry goes here>
 - `apollo-graphql`
-  - <First `apollo-graphql` related entry goes here>
+  - Rename `defaultEngineReportingSignature` to `defaultUsageReportingSignature`; the old name continues to be exported as well.
 - `apollo-language-server`
   - <First `apollo-language-server` related entry goes here>
 - `apollo-tools`
diff --git a/package-lock.json b/package-lock.json
index da258560..ef0796f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3,53 +3,6 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "@apollo/federation": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.19.1.tgz",
-      "integrity": "sha512-32l2XoyDZfqwCObm2iazwa2vlsEYHzBLwsoCJccd6pdW8PAoK+IoKWJqNrMTwVYYNvRvd6YI+VtZPGo460GqDA==",
-      "requires": {
-        "apollo-graphql": "^0.5.0",
-        "apollo-server-env": "^2.4.5",
-        "core-js": "^3.4.0",
-        "lodash.xorby": "^4.7.0"
-      },
-      "dependencies": {
-        "apollo-env": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz",
-          "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==",
-          "requires": {
-            "@types/node-fetch": "2.5.7",
-            "core-js": "^3.0.1",
-            "node-fetch": "^2.2.0",
-            "sha.js": "^2.4.11"
-          }
-        },
-        "apollo-graphql": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.5.0.tgz",
-          "integrity": "sha512-YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig==",
-          "requires": {
-            "apollo-env": "^0.6.5",
-            "lodash.sortby": "^4.7.0"
-          }
-        },
-        "apollo-server-env": {
-          "version": "2.4.5",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
-          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
-          "requires": {
-            "node-fetch": "^2.1.2",
-            "util.promisify": "^1.0.0"
-          }
-        },
-        "core-js": {
-          "version": "3.6.5",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
-        }
-      }
-    },
     "@apollographql/apollo-tools": {
       "version": "file:packages/apollo-tools",
       "requires": {
@@ -2850,9 +2803,9 @@
       "dev": true
     },
     "@types/mkdirp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.0.tgz",
-      "integrity": "sha512-ONFY9//bCEr3DWKON3iDv/Q8LXnhaYYaNDeFSN0AtO5o4sLf9F0pstJKKKjQhXE0kJEeHs8eR6SAsROhhc2Csw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
+      "integrity": "sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -3161,7 +3114,7 @@
         "listr": "0.14.3",
         "lodash.identity": "3.0.0",
         "lodash.pickby": "4.6.0",
-        "mkdirp": "0.5.5",
+        "mkdirp": "1.0.4",
         "moment": "2.27.0",
         "strip-ansi": "5.2.0",
         "table": "5.4.6",
@@ -3701,18 +3654,10 @@
             "picomatch": "^2.0.5"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "moment": {
           "version": "2.27.0",
@@ -4559,7 +4504,7 @@
     "apollo-language-server": {
       "version": "file:packages/apollo-language-server",
       "requires": {
-        "@apollo/federation": "0.19.1",
+        "@apollo/federation": "0.20.0",
         "@apollographql/apollo-tools": "file:packages/apollo-tools",
         "@apollographql/graphql-language-service-interface": "^2.0.2",
         "@endemolshinegroup/cosmiconfig-typescript-loader": "^1.0.0",
@@ -4586,6 +4531,33 @@
         "vscode-uri": "1.0.6"
       },
       "dependencies": {
+        "@apollo/federation": {
+          "version": "0.20.0",
+          "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.0.tgz",
+          "integrity": "sha512-Q2eGSjrArtY04FSVIxUK3/JaVDDw4aJZBRl0+UZ1dwrpk6YtBpydW2u4X6dPTnBqRDpKVGVmc9gkQr8d3LpcKA==",
+          "requires": {
+            "apollo-graphql": "^0.5.0",
+            "apollo-server-env": "^2.4.5",
+            "core-js": "^3.4.0",
+            "lodash.xorby": "^4.7.0"
+          },
+          "dependencies": {
+            "core-js": {
+              "version": "3.6.5",
+              "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+              "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+            }
+          }
+        },
+        "apollo-server-env": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
+          "requires": {
+            "node-fetch": "^2.1.2",
+            "util.promisify": "^1.0.0"
+          }
+        },
         "moment": {
           "version": "2.27.0",
           "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
diff --git a/package.json b/package.json
index 3cf890df..b8d27976 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@types/lodash.pickby": "4.6.6",
     "@types/lodash.sortby": "4.7.6",
     "@types/minimatch": "3.0.3",
-    "@types/mkdirp": "1.0.0",
+    "@types/mkdirp": "1.0.1",
     "@types/nock": "10.0.3",
     "@types/node": "8.10.62",
     "@types/node-fetch": "2.5.7",
diff --git a/packages/apollo-graphql/src/index.ts b/packages/apollo-graphql/src/index.ts
index 8c605def..c539b34f 100644
--- a/packages/apollo-graphql/src/index.ts
+++ b/packages/apollo-graphql/src/index.ts
@@ -1,7 +1,9 @@
 export {
-  defaultEngineReportingSignature,
   defaultOperationRegistrySignature,
+  defaultUsageReportingSignature,
   operationRegistrySignature,
-  operationHash
+  operationHash,
+  // deprecated name for this function:
+  defaultUsageReportingSignature as defaultEngineReportingSignature
 } from "./operationId";
 export * from "./schema";
diff --git a/packages/apollo-graphql/src/operationId.ts b/packages/apollo-graphql/src/operationId.ts
index cf1a791d..5d34234b 100644
--- a/packages/apollo-graphql/src/operationId.ts
+++ b/packages/apollo-graphql/src/operationId.ts
@@ -1,18 +1,20 @@
-// In Engine, we want to group requests making the same query together, and
-// treat different queries distinctly. But what does it mean for two queries to
-// be "the same"?  And what if you don't want to send the full text of the query
-// to Apollo Engine's servers, either because it contains sensitive data or
-// because it contains extraneous operations or fragments?
+// In Apollo Studio, we want to group requests making the same query together,
+// and treat different queries distinctly. But what does it mean for two queries
+// to be "the same"?  And what if you don't want to send the full text of the
+// query to Apollo's servers, either because it contains sensitive data
+// or because it contains extraneous operations or fragments?
 //
-// To solve these problems, EngineReportingAgent has the concept of
+// To solve these problems, ApolloServerPluginUsageReporting has the concept of
 // "signatures". We don't (by default) send the full query string of queries to
-// the Engine servers. Instead, each trace has its query string's "signature".
+// Apollo's servers. Instead, each trace has its query string's "signature".
 //
-// You can specify any function mapping a GraphQL query AST (DocumentNode) to
-// string as your signature algorithm by providing it as the 'signature' option
-// to the EngineReportingAgent constructor. Ideally, your signature should be a
-// valid GraphQL query, though as of now the Engine servers do not re-parse your
-// signature and do not expect it to match the execution tree in the trace.
+// You can technically specify any function mapping a GraphQL query AST
+// (DocumentNode) to string as your signature algorithm by providing it as the
+// 'calculateSignature' option to ApolloServerPluginUsageReporting. (This option
+// is not recommended, because Apollo's servers make some assumptions about the
+// semantics of your operation based on the signature.) This file defines the
+// default function used for this purpose: defaultUsageReportingSignature
+// (formerly known as defaultEngineReportingSignature).
 //
 // This module utilizes several AST transformations from the adjacent
 // 'transforms' module (which are also for writing your own signature method).
@@ -27,22 +29,29 @@
 // - printWithReducedWhitespace, a variant on graphql-js's 'print'
 //   which gets rid of unneeded whitespace
 //
-// defaultEngineReportingSignature consists of applying all of these building blocks.
+// defaultUsageReportingSignature consists of applying all of these building
+// blocks.
 //
 // Historical note: the default signature algorithm of the Go engineproxy
-// performed all of the above operations, and the Engine servers then re-ran a
+// performed all of the above operations, and Apollo's servers then re-ran a
 // mostly identical signature implementation on received traces. This was
 // primarily to deal with edge cases where some users used literal interpolation
 // instead of GraphQL variables, included randomized alias names, etc. In
 // addition, the servers relied on the fact that dropUnusedDefinitions had been
 // called in order (and that the signature could be parsed as GraphQL) to
 // extract the name of the operation for display. This caused confusion, as the
-// query document shown in the Engine UI wasn't the same as the one actually
-// sent. apollo-engine-reporting uses a new reporting API which requires it to
-// explicitly include the operation name with each signature; this means that
-// the server no longer needs to parse the signature or run its own signature
-// algorithm on it, and the details of the signature algorithm are now up to the
-// reporting agent.
+// query document shown in the Studio UI wasn't the same as the one actually
+// sent. ApolloServerPluginUsageReporting (previously apollo-engine-reporting)
+// uses a reporting API which requires it to explicitly include the operation
+// name with each signature; this means that the server no longer needs to parse
+// the signature or run its own signature algorithm on it, and the details of
+// the signature algorithm are now up to the reporting agent. That said, not all
+// Studio features will work properly if your signature function changes the
+// signature in unexpected ways.
+//
+// This file also exports operationRegistrySignature and
+// defaultOperationRegistrySignature, which are slightly different normalization
+// functions used in other contextes.
 import { DocumentNode } from "graphql";
 import { createHash } from "apollo-env";
 import {
@@ -54,10 +63,10 @@ import {
   hideLiterals
 } from "./transforms";
 
-// The engine reporting signature function consists of removing extra whitespace,
+// The usage reporting signature function consists of removing extra whitespace,
 // sorting the AST in a deterministic manner, hiding literals, and removing
 // unused definitions.
-export function defaultEngineReportingSignature(
+export function defaultUsageReportingSignature(
   ast: DocumentNode,
   operationName: string
 ): string {
@@ -71,7 +80,7 @@ export function defaultEngineReportingSignature(
 // The operation registry signature function consists of removing extra whitespace,
 // sorting the AST in a deterministic manner, potentially hiding string and numeric
 // literals, and removing unused definitions. This is a less aggressive transform
-// than its engine reporting signature counterpart.
+// than its usage reporting signature counterpart.
 export function operationRegistrySignature(
   ast: DocumentNode,
   operationName: string,
diff --git a/packages/apollo-graphql/src/transforms.ts b/packages/apollo-graphql/src/transforms.ts
index 8a55a1d7..befb37ae 100644
--- a/packages/apollo-graphql/src/transforms.ts
+++ b/packages/apollo-graphql/src/transforms.ts
@@ -26,7 +26,7 @@ import sortBy from "lodash.sortby";
 // values. Leaves enums alone (since there's no consistent "zero" enum). This
 // can help combine similar queries if you substitute values directly into
 // queries rather than use GraphQL variables, and can hide sensitive data in
-// your query (say, a hardcoded API key) from Engine servers, but in general
+// your query (say, a hardcoded API key) from Apollo's servers, but in general
 // avoiding those situations is better than working around them.
 export function hideLiterals(ast: DocumentNode): DocumentNode {
   return visit(ast, {
diff --git a/packages/apollo-language-server/package.json b/packages/apollo-language-server/package.json
index 5f0d6297..e3fec9dd 100644
--- a/packages/apollo-language-server/package.json
+++ b/packages/apollo-language-server/package.json
@@ -17,7 +17,7 @@
     "npm": ">=6"
   },
   "dependencies": {
-    "@apollo/federation": "0.19.1",
+    "@apollo/federation": "0.20.0",
     "@apollographql/apollo-tools": "file:../apollo-tools",
     "@apollographql/graphql-language-service-interface": "^2.0.2",
     "@endemolshinegroup/cosmiconfig-typescript-loader": "^1.0.0",
diff --git a/packages/apollo-language-server/src/engine/index.ts b/packages/apollo-language-server/src/engine/index.ts
index fbb9268f..8d8336fe 100644
--- a/packages/apollo-language-server/src/engine/index.ts
+++ b/packages/apollo-language-server/src/engine/index.ts
@@ -262,7 +262,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
     });
 
-    if (!(data && data.service) || errors) {
+    if (!(data && data.service && data.service.schemaTags) || errors) {
       throw new Error(
         errors
           ? errors.map(error => error.message).join("\n")
diff --git a/packages/apollo-language-server/src/graphqlTypes.ts b/packages/apollo-language-server/src/graphqlTypes.ts
index 529bf7af..6bd76e7a 100644
--- a/packages/apollo-language-server/src/graphqlTypes.ts
+++ b/packages/apollo-language-server/src/graphqlTypes.ts
@@ -540,7 +540,7 @@ export interface SchemaTagsAndFieldStats_service {
    * Get schema tags, with optional filtering to a set of tags. Always sorted by creation
    * date in reverse chronological order.
    */
-  schemaTags: SchemaTagsAndFieldStats_service_schemaTags[];
+  schemaTags: SchemaTagsAndFieldStats_service_schemaTags[] | null;
   stats: SchemaTagsAndFieldStats_service_stats;
 }
 
@@ -1672,6 +1672,7 @@ export enum IntrospectionDirectiveLocation {
   SCHEMA = "SCHEMA",
   SUBSCRIPTION = "SUBSCRIPTION",
   UNION = "UNION",
+  VARIABLE_DEFINITION = "VARIABLE_DEFINITION",
 }
 
 export enum IntrospectionTypeKind {
diff --git a/packages/apollo/package.json b/packages/apollo/package.json
index b1f062b2..f4254e21 100644
--- a/packages/apollo/package.json
+++ b/packages/apollo/package.json
@@ -61,7 +61,7 @@
     "listr": "0.14.3",
     "lodash.identity": "3.0.0",
     "lodash.pickby": "4.6.0",
-    "mkdirp": "0.5.5",
+    "mkdirp": "1.0.4",
     "moment": "2.27.0",
     "strip-ansi": "5.2.0",
     "table": "5.4.6",
diff --git a/packages/apollo/src/git.ts b/packages/apollo/src/git.ts
index 036247af..a39c8647 100644
--- a/packages/apollo/src/git.ts
+++ b/packages/apollo/src/git.ts
@@ -39,11 +39,12 @@ export const sanitizeGitRemote = (remote?: string) => {
 
   // we only support github and bitbucket sources
   const source = info.source.toLowerCase();
-  if (source !== "github.com" && source !== "bitbucket.com") return null;
+  if (source !== "github.com" && source !== "bitbucket.org") return null;
 
   if (info.user !== "" && info.user !== "git") {
     info.user = "REDACTED";
   }
+  info.token = "";
 
   // just to make sure that with an unknown `protocol` that stringify doesn't
   // just print the old, dirty url


Test patch:
diff --git a/packages/apollo-graphql/src/__tests__/__snapshots__/operationId.test.ts.snap b/packages/apollo-graphql/src/__tests__/__snapshots__/operationId.test.ts.snap
index 1b35cd58..d09e539b 100644
--- a/packages/apollo-graphql/src/__tests__/__snapshots__/operationId.test.ts.snap
+++ b/packages/apollo-graphql/src/__tests__/__snapshots__/operationId.test.ts.snap
@@ -1,20 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`defaultEngineReportingSignature basic test 1`] = `"{user{name}}"`;
+exports[`defaultUsageReportingSignature basic test 1`] = `"{user{name}}"`;
 
-exports[`defaultEngineReportingSignature basic test with query 1`] = `"{user{name}}"`;
+exports[`defaultUsageReportingSignature basic test with query 1`] = `"{user{name}}"`;
 
-exports[`defaultEngineReportingSignature basic with operation name 1`] = `"query OpName{user{name}}"`;
+exports[`defaultUsageReportingSignature basic with operation name 1`] = `"query OpName{user{name}}"`;
 
-exports[`defaultEngineReportingSignature fragment 1`] = `"fragment Bar on User{asd}{user{name...Bar}}"`;
+exports[`defaultUsageReportingSignature fragment 1`] = `"fragment Bar on User{asd}{user{name...Bar}}"`;
 
-exports[`defaultEngineReportingSignature fragments in various order 1`] = `"fragment Bar on User{asd}{user{name...Bar}}"`;
+exports[`defaultUsageReportingSignature fragments in various order 1`] = `"fragment Bar on User{asd}{user{name...Bar}}"`;
 
-exports[`defaultEngineReportingSignature full test 1`] = `"fragment Bar on User{age@skip(if:$a)...Nested}fragment Nested on User{blah}query Foo($a:Boolean,$b:Int){user(age:0,name:\\"\\"){name tz...Bar...on User{bee hello}}}"`;
+exports[`defaultUsageReportingSignature full test 1`] = `"fragment Bar on User{age@skip(if:$a)...Nested}fragment Nested on User{blah}query Foo($a:Boolean,$b:Int){user(age:0,name:\\"\\"){name tz...Bar...on User{bee hello}}}"`;
 
-exports[`defaultEngineReportingSignature with various argument types 1`] = `"query OpName($a:[[Boolean!]!],$b:EnumType,$c:Int!){user{name(apple:$a,bag:$b,cat:$c)}}"`;
+exports[`defaultUsageReportingSignature with various argument types 1`] = `"query OpName($a:[[Boolean!]!],$b:EnumType,$c:Int!){user{name(apple:$a,bag:$b,cat:$c)}}"`;
 
-exports[`defaultEngineReportingSignature with various inline types 1`] = `"query OpName{user{name(apple:[],bag:{},cat:ENUM_VALUE)}}"`;
+exports[`defaultUsageReportingSignature with various inline types 1`] = `"query OpName{user{name(apple:[],bag:{},cat:ENUM_VALUE)}}"`;
 
 exports[`operationRegistrySignature basic test 1`] = `"{user{name}}"`;
 
diff --git a/packages/apollo-graphql/src/__tests__/operationId.test.ts b/packages/apollo-graphql/src/__tests__/operationId.test.ts
index dc1dc93f..e03a966a 100644
--- a/packages/apollo-graphql/src/__tests__/operationId.test.ts
+++ b/packages/apollo-graphql/src/__tests__/operationId.test.ts
@@ -1,6 +1,6 @@
 import { default as gql, disableFragmentWarnings } from "graphql-tag";
 import {
-  defaultEngineReportingSignature,
+  defaultUsageReportingSignature,
   operationRegistrySignature
 } from "../operationId";
 
@@ -8,7 +8,7 @@ import {
 // breaks if you turn it off in tests.
 disableFragmentWarnings();
 
-describe("defaultEngineReportingSignature", () => {
+describe("defaultUsageReportingSignature", () => {
   const cases = [
     // Test cases borrowed from optics-agent-js.
     {
@@ -140,7 +140,7 @@ describe("defaultEngineReportingSignature", () => {
   cases.forEach(({ name, operationName, input }) => {
     test(name, () => {
       expect(
-        defaultEngineReportingSignature(input, operationName)
+        defaultUsageReportingSignature(input, operationName)
       ).toMatchSnapshot();
     });
   });
diff --git a/packages/apollo/src/__tests__/git.test.ts b/packages/apollo/src/__tests__/git.test.ts
index d67a9b3b..0749481b 100644
--- a/packages/apollo/src/__tests__/git.test.ts
+++ b/packages/apollo/src/__tests__/git.test.ts
@@ -25,9 +25,9 @@ describe("strip usernames/passwords from git remotes", () => {
   });
   it("removes username from remote with only a username present", () => {
     let clean = sanitizeGitRemote(
-      "https://un@bitbucket.com/apollographql/test"
+      "https://un@bitbucket.org/apollographql/test"
     );
-    expect(clean).toEqual("https://REDACTED@bitbucket.com/apollographql/test");
+    expect(clean).toEqual("https://REDACTED@bitbucket.org/apollographql/test");
   });
   it("does not mind case", () => {
     let clean = sanitizeGitRemote("https://un@GITHUB.com/apollographql/test");
@@ -44,10 +44,10 @@ describe("strip usernames/passwords from git remotes", () => {
     expect(clean).toEqual("https://REDACTED@github.com/apollographql/test");
 
     let bbClean = sanitizeGitRemote(
-      "https://un:p%40ssw%3Ard@bitbucket.com/apollographql/test"
+      "https://un:p%40ssw%3Ard@bitbucket.org/apollographql/test"
     );
     expect(bbClean).toEqual(
-      "https://REDACTED@bitbucket.com/apollographql/test"
+      "https://REDACTED@bitbucket.org/apollographql/test"
     );
   });
   it("works with non-url remotes from github with git user ONLY", () => {
@@ -65,15 +65,15 @@ describe("strip usernames/passwords from git remotes", () => {
   });
   it("works with non-url remotes from bitbucket with git user ONLY", () => {
     let clean = sanitizeGitRemote(
-      "git@bitbucket.com:apollographql/apollo-tooling.git"
+      "git@bitbucket.org:apollographql/apollo-tooling.git"
     );
-    expect(clean).toEqual("git@bitbucket.com:apollographql/apollo-tooling.git");
+    expect(clean).toEqual("git@bitbucket.org:apollographql/apollo-tooling.git");
 
     let clean2 = sanitizeGitRemote(
-      "bob@bitbucket.com:apollographql/apollo-tooling.git"
+      "bob@bitbucket.org:apollographql/apollo-tooling.git"
     );
     expect(clean2).toEqual(
-      "REDACTED@bitbucket.com:apollographql/apollo-tooling.git"
+      "REDACTED@bitbucket.org:apollographql/apollo-tooling.git"
     );
   });
   it("does not allow non-url remotes from unrecognized providers (not github)", () => {