From 0a50943e7e2173b0aa6c9d976e7b7cd5a345d65c Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 4 Mar 2020 07:41:10 -0800
Subject: [PATCH] Revert "Update
 packages/apollo-gateway/src/loadServicesFromStorage.ts"

This reverts commit 4d4ab5b8219449d34e01d854371d141fdfea8b33.
---
 .../src/loadServicesFromStorage.ts            | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts
index e42f1aed2fa..48a294e8a28 100644
--- a/packages/apollo-gateway/src/loadServicesFromStorage.ts
+++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts
@@ -80,15 +80,16 @@ function fetchApolloGcs(
       // Google Cloud Storage returns an `application/xml` error under error
       // conditions.  We'll special-case our known errors, and resort to
       // printing the body for others.
-      if (
-        response.headers.get('content-type') === 'application/xml' &&
-        response.status === 403 &&
-        body.includes("<Error><Code>AccessDenied</Code>") &&
-        body.includes("Anonymous caller does not have storage.objects.get")
-      ) {
-        throw new Error(
-          Unable to authenticate with Apollo Graph Manager storage " +
-          "while fetching " + url);
+      if (response.headers.get('content-type') === 'application/xml') {
+        if (
+          response.status === 403 &&
+          body.includes("<Error><Code>AccessDenied</Code>") &&
+          body.includes("Anonymous caller does not have storage.objects.get")
+        ) {
+          throw new Error(
+            "Unable to authenticate with Apollo Graph Manager storage " +
+            "while fetching " + url);
+        }
       }
 
       // Normally, we'll try to keep the logs clean with errors we expect.