Merge pull request #699 from porter-dev/0.3.0-cron-job-filter-fix

[0.3.0] Fix cron job filter when waiting for GHA

dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -181,7 +181,8 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
   };
 
   setupCronJobWebsocket = (chart: ChartType) => {
-    let chartVersion = `${chart.chart.metadata.name}-${chart.chart.metadata.version}`;
+    let releaseName = chart.name
+    let releaseNamespace = chart.namespace
 
     let { currentCluster, currentProject } = this.context;
     let protocol = process.env.NODE_ENV == "production" ? "wss" : "ws";
@@ -203,15 +204,14 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
         this.state.imageIsPlaceholder
       ) {
         // filter job belonging to chart
-        let chartLabel = event.Object?.metadata?.labels["helm.sh/chart"];
-        let releaseLabel =
-          event.Object?.metadata?.labels["meta.helm.sh/release-name"];
-        console.log("filtering job belonging to chart");
+        let relNameAnn = event.Object?.metadata?.annotations["meta.helm.sh/release-name"]
+        let relNamespaceAnn = event.Object?.metadata?.annotations["meta.helm.sh/release-namespace"]
+        
         if (
-          chartLabel &&
-          releaseLabel &&
-          chartLabel == chartVersion &&
-          releaseLabel == chart.name
+          relNameAnn &&
+          relNamespaceAnn &&
+          releaseName == relNameAnn &&
+          releaseNamespace == relNamespaceAnn
         ) {
           console.log("belonged to chart");
           let newestImage =

server/api/oauth_github_handler.go

@@ -131,21 +131,22 @@ func (app *App) HandleGithubOAuthCallback(w http.ResponseWriter, r *http.Request
 		}
 
 		// send to segment
-		client := *app.segmentClient
-		client.Enqueue(segment.Identify{
-			UserId: fmt.Sprintf("%v", user.ID),
-			Traits: segment.NewTraits().
-				SetEmail(user.Email).
-				Set("github", "true"),
-		})
-
-		client.Enqueue(segment.Track{
-			UserId: fmt.Sprintf("%v", user.ID),
-			Event: "New User",
-			Properties: segment.NewProperties().
-				Set("email", user.Email),
-		})
-
+		if app.segmentClient != nil {
+			client := *app.segmentClient
+			client.Enqueue(segment.Identify{
+				UserId: fmt.Sprintf("%v", user.ID),
+				Traits: segment.NewTraits().
+					SetEmail(user.Email).
+					Set("github", "true"),
+			})
+
+			client.Enqueue(segment.Track{
+				UserId: fmt.Sprintf("%v", user.ID),
+				Event:  "New User",
+				Properties: segment.NewProperties().
+					Set("email", user.Email),
+			})
+		}
 
 		// log the user in
 		app.Logger.Info().Msgf("New user created: %d", user.ID)

server/api/release_handler.go

@@ -929,13 +929,15 @@ func (app *App) HandleReleaseDeployWebhook(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	client := *app.segmentClient
-	client.Enqueue(segment.Track{
-		UserId: "anonymous",
-		Event:  "Triggered Re-deploy via Webhook",
-		Properties: segment.NewProperties().
-			Set("repository", repository),
-	})
+	if app.segmentClient != nil {
+		client := *app.segmentClient
+		client.Enqueue(segment.Track{
+			UserId: "anonymous",
+			Event:  "Triggered Re-deploy via Webhook",
+			Properties: segment.NewProperties().
+				Set("repository", repository),
+		})
+	}
 
 	w.WriteHeader(http.StatusOK)
 }

server/api/user_handler.go

@@ -51,21 +51,23 @@ func (app *App) HandleCreateUser(w http.ResponseWriter, r *http.Request) {
 
 	if err == nil {
 		// send to segment
-		client := *app.segmentClient
-
-		client.Enqueue(segment.Identify{
-			UserId: fmt.Sprintf("%v", user.ID),
-			Traits: segment.NewTraits().
-				SetEmail(user.Email).
-				Set("github", "false"),
-		})
-
-		client.Enqueue(segment.Track{
-			UserId: fmt.Sprintf("%v", user.ID),
-			Event:  "New User",
-			Properties: segment.NewProperties().
-				Set("email", user.Email),
-		})
+		if app.segmentClient != nil {
+			client := *app.segmentClient
+
+			client.Enqueue(segment.Identify{
+				UserId: fmt.Sprintf("%v", user.ID),
+				Traits: segment.NewTraits().
+					SetEmail(user.Email).
+					Set("github", "false"),
+			})
+
+			client.Enqueue(segment.Track{
+				UserId: fmt.Sprintf("%v", user.ID),
+				Event:  "New User",
+				Properties: segment.NewProperties().
+					Set("email", user.Email),
+			})
+		}
 
 		app.Logger.Info().Msgf("New user created: %d", user.ID)
 		var redirect string