chore: avoid listing all metapipeline sub steps as they are quite ver…

…bose and not that interesting to be notified about
jenkins-x-plugins · Mar 18, 2020 · fc19f9a · fc19f9a
1 parent 45b9b11
commit fc19f9a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/build-deploy.sh b/build-deploy.sh
@@ -12,15 +12,11 @@ VERSION=$1
 make linux && docker build -t rawlingsj80/slack:$VERSION . && \
   docker push rawlingsj80/slack:$VERSION
 
-helm uninstall slack || true
-cd charts/slack && helm install --set googleSecretsManager=true --set image.repository=rawlingsj80/slack --set image.tag=$VERSION slack .
+# helm upgrade slack jx-labs/slack
+helm upgrade --set googleSecretsManager=true --set image.repository=rawlingsj80/slack --set image.tag=$VERSION slack jx-labs/slack
 
 #kubectl apply -f  ~/.jx/localSecrets/slack.yaml
 
-# hack until we watch for new SlackBot kinds being added
-#kubectl scale deploy slack-slack --replicas 0
-#kubectl scale deploy slack-slack --replicas 1
-
 sleep 10
 
 kubectl logs -f deploy/slack-slack
diff --git a/pkg/slackbot/bot.go b/pkg/slackbot/bot.go
@@ -731,16 +731,16 @@ func (o *SlackBotOptions) createAttachments(activity *jenkinsv1.PipelineActivity
 	stage := step.Stage
 	promote := step.Promote
 	if stage != nil {
-		return o.createStageAttachments(activity, step, stage)
+		return o.createStageAttachments(activity, stage)
 	} else if promote != nil {
-		return o.createPromoteAttachments(activity, step, promote)
+		return o.createPromoteAttachments(activity, promote)
 	}
 	return []slack.Attachment{}
 
 }
 
 func (o *SlackBotOptions) createStageAttachments(activity *jenkinsv1.PipelineActivity,
-	step *jenkinsv1.PipelineActivityStep, stage *jenkinsv1.StageActivityStep) []slack.Attachment {
+	stage *jenkinsv1.StageActivityStep) []slack.Attachment {
 	name := stage.Name
 	if name == "" {
 		name = "Stage"
@@ -751,16 +751,20 @@ func (o *SlackBotOptions) createStageAttachments(activity *jenkinsv1.PipelineAct
 			name = "release " + link(version, activity.Spec.ReleaseNotesURL)
 		}
 	}
+
 	attachments := []slack.Attachment{
-		o.createStepAttachment(&stage.CoreActivityStep, name, "", ""),
+		o.createStepAttachment(stage.CoreActivityStep, name, "", ""),
 	}
-	for _, step := range stage.Steps {
-		attachments = append(attachments, o.createStepAttachment(&step, "", "", ""))
+	if stage.CoreActivityStep.Name != "meta pipeline" {
+		for _, step := range stage.Steps {
+			attachments = append(attachments, o.createStepAttachment(step, "", "", ""))
+		}
 	}
+
 	return attachments
 }
 
-func (o *SlackBotOptions) createStepAttachment(step *jenkinsv1.CoreActivityStep, name string, description string,
+func (o *SlackBotOptions) createStepAttachment(step jenkinsv1.CoreActivityStep, name string, description string,
 	iconUrl string) slack.Attachment {
 	text := step.Description
 	if description != "" {
@@ -774,6 +778,10 @@ func (o *SlackBotOptions) createStepAttachment(step *jenkinsv1.CoreActivityStep,
 	if textName == "" {
 		textName = step.Name
 	}
+	// wonder if we should have a map of stage text to slack friendly descriptions rather than this below?
+	if textName == "meta pipeline" {
+		textName = "Generating pipeline"
+	}
 	stepStatus := step.Status
 	textMessage := o.statusString(stepStatus) + " " + textName
 	if text != "" {
@@ -788,24 +796,24 @@ func (o *SlackBotOptions) createStepAttachment(step *jenkinsv1.CoreActivityStep,
 	}
 }
 
-func (o *SlackBotOptions) createPromoteAttachments(activity *jenkinsv1.PipelineActivity, step *jenkinsv1.PipelineActivityStep, parent *jenkinsv1.PromoteActivityStep) []slack.Attachment {
+func (o *SlackBotOptions) createPromoteAttachments(activity *jenkinsv1.PipelineActivity, parent *jenkinsv1.PromoteActivityStep) []slack.Attachment {
 	envName := strings.Title(parent.Environment)
 	attachments := []slack.Attachment{
-		o.createStepAttachment(&parent.CoreActivityStep, "promote to *"+envName+"*", "", ""),
+		o.createStepAttachment(parent.CoreActivityStep, "promote to *"+envName+"*", "", ""),
 	}
 
 	pullRequest := parent.PullRequest
 	update := parent.Update
 	if pullRequest != nil {
 		iconUrl := pullRequestIcon(pullRequest)
-		attachments = append(attachments, o.createStepAttachment(&pullRequest.CoreActivityStep, "PR", describePromotePullRequest(activity, pullRequest), iconUrl))
+		attachments = append(attachments, o.createStepAttachment(pullRequest.CoreActivityStep, "PR", describePromotePullRequest(activity, pullRequest), iconUrl))
 	}
 	if update != nil {
-		attachments = append(attachments, o.createStepAttachment(&update.CoreActivityStep, "update", describePromoteUpdate(update), ""))
+		attachments = append(attachments, o.createStepAttachment(update.CoreActivityStep, "update", describePromoteUpdate(update), ""))
 	}
 	appURL := parent.ApplicationURL
 	if appURL != "" {
-		attachments = append(attachments, o.createStepAttachment(&update.CoreActivityStep, ":star: application now in "+link(envName, appURL), "", ""))
+		attachments = append(attachments, o.createStepAttachment(update.CoreActivityStep, ":star: application now in "+link(envName, appURL), "", ""))
 	}
 	return attachments
 }

diff --git a/pkg/slackbot/bot_test.go b/pkg/slackbot/bot_test.go
@@ -29,7 +29,7 @@ func TestSlackBotOptions_createAttachments(t *testing.T) {
 		wantNumberOfSteps int
 		want              []slack.Attachment
 	}{
-		{name: "multi_step_stage", fields: struct{ filename string }{filename: "stage_multiple_steps.yaml"}, wantNumberOfSteps: 19, want: nil},
+		{name: "multi_step_stage", fields: struct{ filename string }{filename: "stage_multiple_steps.yaml"}, wantNumberOfSteps: 11, want: nil},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {