Merge remote-tracking branch 'origin' into release-2.15.0

apollographql · Jun 17, 2020 · 0b5105c · 0b5105c
2 parents b608b8d + e5a56ee
commit 0b5105c
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,10 @@ The version headers in this history reflect the versions of Apollo Server itself
 - `apollo-engine-reporting`: Make Apollo Server throw if schema reporting is enabled for a gateway or federated service. [PR #4246](https://github.com/apollographql/apollo-server/pull/4246)
 - `apollo-engine-reporting`: Remove the `experimental_` prefix from schema reporting options, and specifically rename `experimental_schemaReporting` option name to `reportSchema`. (The old option names remain functional, but are deprecated.) [PR #4236](https://github.com/apollographql/apollo-server/pull/4236)
 
+### v2.14.5
+
+- `apollo-engine-reporting`: Make Apollo Server throw if schema reporting is enabled for a gateway or federated service. [PR #4246](https://github.com/apollographql/apollo-server/pull/4246)
+
 ### v2.14.4
 
 - `apollo-engine-reporting`: Add environment variable `APOLLO_SCHEMA_REPORTING` that can enable schema reporting. If `experimental__schemaReporting` is set it will override the environment variable. [PR #4206](https://github.com/apollographql/apollo-server/pull/4206)

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "gatsby": "2.23.3",
-    "gatsby-theme-apollo-docs": "4.2.7",
+    "gatsby-theme-apollo-docs": "4.2.9",
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }

diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-engine-reporting",
-  "version": "2.1.0-alpha.0",
+  "version": "2.1.0",
   "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation",
-  "version": "0.16.7-alpha.0",
+  "version": "0.16.7",
   "description": "Apollo Federation Utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "0.16.7-alpha.0",
+  "version": "0.16.7",
   "description": "Apollo Gateway",
   "author": "opensource@apollographql.com",
   "main": "dist/index.js",

diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+### 0.4.1
+
+- __BREAKING__: Use a content delivery network, fetch storage secrets and operation manifests from different domains: https://storage-secrets.api.apollographql.com and https://operations.api.apollographql.com. Please mind any firewall for outgoing traffic.
+
+### 0.4.0:
+
+- This version was accidentally skipped due to a manual update of `package.json`, see `v0.4.1` - @trevor-scheer
+
 ### 0.3.1:
 
 - The `schemaTag` option is now deprecated and superseded by `graphVariant`.

diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-plugin-operation-registry",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "description": "Apollo Server operation registry",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts
@@ -6,33 +6,25 @@ export const envOverrideOperationManifest =
 
 export const envOverrideStorageSecretBaseUrl = 'APOLLO_STORAGE_SECRET_BASE_URL';
 
-export const fakeTestBaseUrl = 'https://fake-host-for-apollo-op-reg-tests/';
+export const fakeTestBaseUrl = 'https://fake-host-for-apollo-op-reg-tests';
 
 // Generate and cache our desired operation manifest URL.
-export const urlOperationManifestBase: string = ((): string => {
-  const desiredUrl =
-    process.env[envOverrideOperationManifest] ||
-    // See src/__tests__/jestSetup.ts for more details on this env. variable.
-    process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true'
-      ? fakeTestBaseUrl
-      : 'https://storage.googleapis.com/engine-op-manifest-storage-prod/';
-
-  // Make sure it has NO trailing slash.
-  return desiredUrl.replace(/\/$/, '');
-})();
+export const urlOperationManifestBase: string =
+  // Remove trailing slash if any.
+  process.env[envOverrideOperationManifest]?.replace(/\/$/, '') ||
+  // See src/__tests__/jestSetup.ts for more details on this env. variable.
+  process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true'
+    ? fakeTestBaseUrl
+    : 'https://operations.api.apollographql.com';
 
 // Generate and cache our desired storage secret URL.
-export const urlStorageSecretBase: string = ((): string => {
-  const desiredUrl =
-    process.env[envOverrideStorageSecretBaseUrl] ||
-    // See src/__tests__/jestSetup.ts for more details on this env. variable.
-    process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true'
-      ? fakeTestBaseUrl
-      : 'https://storage.googleapis.com/engine-partial-schema-prod/';
-
-  // Make sure it has NO trailing slash.
-  return desiredUrl.replace(/\/$/, '');
-})();
+export const urlStorageSecretBase: string =
+  // Remove trailing slash if any.
+  process.env[envOverrideStorageSecretBaseUrl]?.replace(/\/$/, '') ||
+  // See src/__tests__/jestSetup.ts for more details on this env. variable.
+  process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true'
+    ? fakeTestBaseUrl
+    : 'https://storage-secrets.api.apollographql.com';
 
 export const getStoreKey = (signature: string) => `${signature}`;