fix: emit CloudRunServiceReady event even if default url is disabled

bskaplan · Sep 10, 2024 · 18e7ba5 · 18e7ba5
1 parent 1d83c09
commit 18e7ba5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/skaffold/deploy/cloudrun/status.go b/pkg/skaffold/deploy/cloudrun/status.go
@@ -302,10 +302,10 @@ func (s *Monitor) printStatusCheckSummary(out io.Writer, c *counter, r *runResou
 		return
 	}
 	eventV2.ResourceStatusCheckEventCompleted(r.resource.String(), curStatus.ae)
-	r.sub.reportSuccess()
 	if curStatus.ae.ErrCode != proto.StatusCode_STATUSCHECK_SUCCESS {
 		output.Default.Fprintln(out, fmt.Sprintf("Cloud Run %s %s failed with error: %s", r.resource.Type(), r.resource.Name(), curStatus.ae.Message))
 	} else {
+		r.sub.reportSuccess()
 		output.Default.Fprintln(out, fmt.Sprintf("Cloud Run %s %s finished: %s. %s", r.resource.Type(), r.resource.Name(), curStatus.ae.Message, c.remaining()))
 	}
 }
@@ -344,9 +344,13 @@ func (r *runServiceResource) getTerminalStatus(crClient *run.APIService) (*run.G
 	return ready, nil
 }
 func (r *runServiceResource) reportSuccess() {
-	if r.url != "" {
-		eventV2.CloudRunServiceReady(r.path, r.url, r.latestRevision)
+	url := r.url
+	if url == "" {
+		// a URL may not be present if the default URL is disabled. Use - instead of empty in case anyone is parsing the
+		// event status
+		url = "-"
 	}
+		eventV2.CloudRunServiceReady(r.path, url, r.latestRevision)
 }
 
 type runJobResource struct {