chore: build dist deploy-cloudrun (#32)

Author: google-github-actions-bot

dist/index.js

@@ -36386,6 +36386,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudRun = void 0;
 const core = __importStar(__webpack_require__(470));
 const googleapis_1 = __webpack_require__(819);
+const lodash_1 = __webpack_require__(998);
 /**
  * Wraps interactions with the Google Cloud Run API.
  *
@@ -36545,8 +36546,10 @@ class CloudRun {
                 };
                 serviceResponse = yield this.run.namespaces.services.create(createServiceRequest, this.methodOptions);
             }
+            const url = yield this.pollService(serviceResponse.data);
             core.info(`Service ${service.name} has been successfully deployed.`);
-            return serviceResponse.data;
+            // return serviceResponse.data;
+            return url;
         });
     }
     /**
@@ -36619,8 +36622,68 @@ class CloudRun {
             yield this.run.projects.locations.services.setIamPolicy(setIamPolicyRequest, this.methodOptions);
         });
     }
+    /**
+     * Poll service revision until ready
+     * @param serviceResponse
+     * @returns service url or revision url
+     */
+    pollService(serviceResponse) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = getUrl(serviceResponse);
+            const maxAttempts = 60; // Timeout after 300 seconds
+            let attempt = 0;
+            // Revision is ready and url is found before timeout
+            while (!getReadyStatus(serviceResponse) && !url && attempt < maxAttempts) {
+                attempt += 1;
+                yield sleep(5000);
+                serviceResponse = yield this.getService(serviceResponse.metadata.name);
+                url = getUrl(serviceResponse);
+            }
+            if (!url)
+                throw new Error('Timeout error: service revision is not ready.');
+            return url;
+        });
+    }
 }
 exports.CloudRun = CloudRun;
+/** Retrieve status of new revision */
+function getReadyStatus(serviceResponse) {
+    // Retrieve the revision name
+    const revisionName = lodash_1.get(serviceResponse, 'spec.template.metadata.name');
+    // Retrieve the revision statuses
+    const createdRevision = lodash_1.get(serviceResponse, 'status.latestCreatedRevisionName');
+    const latestRevision = lodash_1.get(serviceResponse, 'status.latestReadyRevisionName');
+    // Latest created revision must equal latest ready revision
+    if (revisionName) {
+        // After first deployment, revision name is set
+        return (revisionName &&
+            createdRevision &&
+            latestRevision &&
+            revisionName == createdRevision &&
+            revisionName == latestRevision);
+    }
+    else {
+        // First deployment will not have a revision name
+        return (createdRevision && latestRevision && latestRevision == createdRevision);
+    }
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/** Get service url or tagged revision url */
+function getUrl(serviceResponse) {
+    const revisionName = lodash_1.get(serviceResponse, 'spec.template.metadata.name');
+    // Find revision url
+    const traffic = lodash_1.get(serviceResponse, 'status.traffic');
+    let revision;
+    if (traffic) {
+        revision = traffic.find((revision) => {
+            return revision.revisionName == revisionName && revision.url;
+        });
+    }
+    // Or return service url
+    return lodash_1.get(revision, 'url') || lodash_1.get(serviceResponse, 'status.url') || '';
+}
 
 
 /***/ }),
@@ -124607,44 +124670,41 @@ class Service {
      * @param prevService the previous Cloud Run service revision
      */
     merge(prevService) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        const currentService = lodash_1.cloneDeep(this.request);
         // Get Revision names if set
-        const name = lodash_1.get(this.request, 'spec.template.metadata.name');
+        const name = lodash_1.get(currentService, 'spec.template.metadata.name');
         const previousName = lodash_1.get(prevService, 'spec.template.metadata.name');
-        // Merge Revision metadata
-        const labels = Object.assign(Object.assign({}, (_c = (_b = (_a = prevService.spec) === null || _a === void 0 ? void 0 : _a.template) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.labels), (_f = (_e = (_d = this.request.spec) === null || _d === void 0 ? void 0 : _d.template) === null || _e === void 0 ? void 0 : _e.metadata) === null || _f === void 0 ? void 0 : _f.labels);
-        const annotations = Object.assign(Object.assign({}, (_j = (_h = (_g = prevService.spec) === null || _g === void 0 ? void 0 : _g.template) === null || _h === void 0 ? void 0 : _h.metadata) === null || _j === void 0 ? void 0 : _j.annotations), (_m = (_l = (_k = this.request.spec) === null || _k === void 0 ? void 0 : _k.template) === null || _l === void 0 ? void 0 : _l.metadata) === null || _m === void 0 ? void 0 : _m.annotations);
-        this.request.spec.template.metadata = {
-            annotations,
-            labels,
-        };
-        // Force update with Revision name change
-        this.request.spec.template.metadata.name = this.generateRevisionName(name, previousName);
-        // Merge Container spec
-        const prevContainer = prevService.spec.template.spec.containers[0];
-        const currentContainer = this.request.spec.template.spec.containers[0];
-        const container = Object.assign(Object.assign({}, prevContainer), currentContainer);
-        // Merge Revision spec
-        const spec = Object.assign(Object.assign({}, (_p = (_o = prevService.spec) === null || _o === void 0 ? void 0 : _o.template) === null || _p === void 0 ? void 0 : _p.spec), this.request.spec.template.spec);
-        if (!currentContainer.command) {
-            // Remove entrypoint cmd and arguments if not specified
-            delete container.command;
-            delete container.args;
-        }
+        const generatedName = this.generateRevisionName(name, previousName);
         // Merge Env vars
+        const prevEnvVars = lodash_1.get(prevService, 'spec.template.spec.containers')[0]
+            .env;
+        const currentEnvVars = lodash_1.get(currentService, 'spec.template.spec.containers')[0].env;
         let env = [];
-        if (currentContainer.env) {
-            env = currentContainer.env.map((envVar) => envVar);
+        if (currentEnvVars) {
+            env = currentEnvVars.map((envVar) => envVar);
         }
         const keys = env === null || env === void 0 ? void 0 : env.map((envVar) => envVar.name);
-        (_q = prevContainer.env) === null || _q === void 0 ? void 0 : _q.forEach((envVar) => {
+        prevEnvVars === null || prevEnvVars === void 0 ? void 0 : prevEnvVars.forEach((envVar) => {
             if (!keys.includes(envVar.name)) {
-                return env.push(envVar);
+                // Add old env vars without duplicating
+                env.push(envVar);
             }
         });
-        container.env = env;
-        spec.containers = [container];
-        this.request.spec.template.spec = spec;
+        const newEnv = lodash_1.cloneDeep(env);
+        // Deep Merge Service
+        const mergedServices = lodash_1.merge(prevService, currentService);
+        // Force update with Revision name change
+        if (!lodash_1.get(mergedServices, 'spec.template.metadata')) {
+            mergedServices.spec.template.metadata = {
+                name: generatedName,
+            };
+        }
+        else {
+            mergedServices.spec.template.metadata.name = generatedName;
+        }
+        // Merge Container spec
+        mergedServices.spec.template.spec.containers[0].env = newEnv;
+        this.request = mergedServices;
     }
     generateRevisionName(name, prevName) {
         const message = 'Resource name must use only lowercase letters, numbers and ' +
@@ -126252,10 +126312,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(__webpack_require__(470));
 const cloudRun_1 = __webpack_require__(115);
 const service_1 = __webpack_require__(304);
-const lodash_1 = __webpack_require__(998);
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 /**
  * Executes the main action. It includes the main business logic and is the
  * primary entry point. It is documented inline.
@@ -126276,13 +126332,9 @@ function run() {
             // Initialize service
             const service = new service_1.Service({ image, name, envVars, yaml });
             // Deploy service
-            let serviceResponse = yield client.deploy(service);
-            while (!lodash_1.get(serviceResponse, 'status.url')) {
-                serviceResponse = yield client.getService(service.name);
-                yield sleep(2000);
-            }
+            const url = yield client.deploy(service);
             // Set URL as output
-            core.setOutput('url', lodash_1.get(serviceResponse, 'status.url'));
+            core.setOutput('url', url);
         }
         catch (error) {
             core.setFailed(error.message);