switched to using async/await consistently

google-github-actions · Jan 30, 2020 · 0c88840 · 0c88840
1 parent 735a1c2
commit 0c88840
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 45 deletions.
diff --git a/setup-gcloud/dist/index.js b/setup-gcloud/dist/index.js
@@ -424,19 +424,21 @@ function getReleaseURL(os, arch, version) {
             const url = formatReleaseURL(os, arch, version);
             const client = new httpm.HttpClient(install_util_1.GCLOUD_METRICS_LABEL);
             return attempt_1.retry((context) => __awaiter(this, void 0, void 0, function* () {
-                return client
-                    .head(url)
-                    .then(res => res.message.statusCode === 200
-                    ? Promise.resolve(url)
-                    : Promise.reject(`error code: ${res.message.statusCode}`));
+                const res = yield client.head(url);
+                if (res.message.statusCode === 200) {
+                    return url;
+                }
+                else {
+                    throw new Error(`error code: ${res.message.statusCode}`);
+                }
             }), {
                 delay: 200,
                 factor: 2,
                 maxAttempts: 4,
             });
         }
         catch (err) {
-            return Promise.reject(`Error trying to get gcloud SDK release URL: os: ${os} arch: ${arch} version: ${version}, err: ${err}`);
+            throw new Error(`Error trying to get gcloud SDK release URL: os: ${os} arch: ${arch} version: ${version}, err: ${err}`);
         }
     });
 }
@@ -1173,18 +1175,16 @@ function getLatestGcloudSDKVersion() {
         const queryUrl = 'https://dl.google.com/dl/cloudsdk/channels/rapid/components-2.json';
         const client = new httpm.HttpClient(install_util_1.GCLOUD_METRICS_LABEL);
         return yield attempt_1.retry((context) => __awaiter(this, void 0, void 0, function* () {
-            return client.get(queryUrl).then(res => {
-                if (res.message.statusCode != 200) {
-                    return Promise.reject(`Failed to retrieve gcloud SDK version, HTTP error code: ${res.message.statusCode} url: ${queryUrl}`);
-                }
-                return res.readBody().then(body => {
-                    const responseObject = JSON.parse(body);
-                    if (!responseObject.version) {
-                        return Promise.reject(`Failed to retrieve gcloud SDK version, invalid response body: ${body}`);
-                    }
-                    return Promise.resolve(responseObject.version);
-                });
-            });
+            const res = yield client.get(queryUrl);
+            if (res.message.statusCode != 200) {
+                throw new Error(`Failed to retrieve gcloud SDK version, HTTP error code: ${res.message.statusCode} url: ${queryUrl}`);
+            }
+            const body = yield res.readBody();
+            const responseObject = JSON.parse(body);
+            if (!responseObject.version) {
+                throw new Error(`Failed to retrieve gcloud SDK version, invalid response body: ${body}`);
+            }
+            return responseObject.version;
         }), {
             delay: 200,
             factor: 2,

diff --git a/setup-gcloud/src/format-url.ts b/setup-gcloud/src/format-url.ts
@@ -68,24 +68,24 @@ export async function getReleaseURL(
 ): Promise<string> {
   try {
     const url = formatReleaseURL(os, arch, version);
-    const client: httpm.HttpClient = new httpm.HttpClient(GCLOUD_METRICS_LABEL);
+    const client = new httpm.HttpClient(GCLOUD_METRICS_LABEL);
     return retry(
-      async context =>
-        client
-          .head(url)
-          .then(res =>
-            res.message.statusCode === 200
-              ? Promise.resolve(url)
-              : Promise.reject(`error code: ${res.message.statusCode}`),
-          ),
+      async context => {
+        const res = await client.head(url);
+        if (res.message.statusCode === 200) {
+          return url;
+        } else {
+          throw new Error(`error code: ${res.message.statusCode}`);
+        }
+      },
       {
         delay: 200,
         factor: 2,
         maxAttempts: 4,
       },
     );
   } catch (err) {
-    return Promise.reject(
+    throw new Error(
       `Error trying to get gcloud SDK release URL: os: ${os} arch: ${arch} version: ${version}, err: ${err}`,
     );
   }

diff --git a/setup-gcloud/src/version-util.ts b/setup-gcloud/src/version-util.ts
@@ -30,24 +30,23 @@ export async function getLatestGcloudSDKVersion(): Promise<string> {
     'https://dl.google.com/dl/cloudsdk/channels/rapid/components-2.json';
   const client: httpm.HttpClient = new httpm.HttpClient(GCLOUD_METRICS_LABEL);
   return await retry(
-    async context =>
-      client.get(queryUrl).then(res => {
-        if (res.message.statusCode != 200) {
-          return Promise.reject(
-            `Failed to retrieve gcloud SDK version, HTTP error code: ${res.message.statusCode} url: ${queryUrl}`,
-          );
-        }
+    async context => {
+      const res = await client.get(queryUrl);
+      if (res.message.statusCode != 200) {
+        throw new Error(
+          `Failed to retrieve gcloud SDK version, HTTP error code: ${res.message.statusCode} url: ${queryUrl}`,
+        );
+      }
 
-        return res.readBody().then(body => {
-          const responseObject = JSON.parse(body);
-          if (!responseObject.version) {
-            return Promise.reject(
-              `Failed to retrieve gcloud SDK version, invalid response body: ${body}`,
-            );
-          }
-          return Promise.resolve(responseObject.version);
-        });
-      }),
+      const body = await res.readBody();
+      const responseObject = JSON.parse(body);
+      if (!responseObject.version) {
+        throw new Error(
+          `Failed to retrieve gcloud SDK version, invalid response body: ${body}`,
+        );
+      }
+      return responseObject.version;
+    },
     {
       delay: 200,
       factor: 2,