fix(cd): add rust-ceramic sha to notifs

3box · Nov 6, 2023 · cab9483 · cab9483
1 parent 94b53aa
commit cab9483
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/cd/manager/jobs/deploy.go b/cd/manager/jobs/deploy.go
@@ -221,7 +221,7 @@ func (d deployJob) generateEnvLayout(component manager.DeployComponent) (*manage
 		log.Printf("generateEnvLayout: get layout error: %s, %v", component, err)
 		return nil, err
 	} else {
-		newLayout := &manager.Layout{Clusters: map[string]*manager.Cluster{}, Repo: ecrRepo}
+		newLayout := &manager.Layout{Clusters: map[string]*manager.Cluster{}, Repo: &ecrRepo}
 		for cluster, clusterLayout := range currentLayout.Clusters {
 			for service, task := range clusterLayout.ServiceTasks.Tasks {
 				if newTask := d.componentTask(component, cluster, service, strings.Split(task.Name, ",")); newTask != nil {
@@ -286,20 +286,20 @@ func (d deployJob) componentTask(component manager.DeployComponent, cluster, ser
 	return nil
 }
 
-func (d deployJob) componentEcrRepo(component manager.DeployComponent) (*manager.Repo, error) {
+func (d deployJob) componentEcrRepo(component manager.DeployComponent) (manager.Repo, error) {
 	switch component {
 	case manager.DeployComponent_Ceramic:
-		return &manager.Repo{Name: "ceramic-prod"}, nil
+		return manager.Repo{Name: "ceramic-prod"}, nil
 	case manager.DeployComponent_Ipfs:
-		return &manager.Repo{Name: "go-ipfs-prod"}, nil
+		return manager.Repo{Name: "go-ipfs-prod"}, nil
 	case manager.DeployComponent_Cas:
-		return &manager.Repo{Name: "ceramic-prod-cas"}, nil
+		return manager.Repo{Name: "ceramic-prod-cas"}, nil
 	case manager.DeployComponent_CasV5:
-		return &manager.Repo{Name: "app-cas-scheduler"}, nil
+		return manager.Repo{Name: "app-cas-scheduler"}, nil
 	case manager.DeployComponent_RustCeramic:
-		return &manager.Repo{Name: "ceramic-one", Public: true}, nil
+		return manager.Repo{Name: "ceramic-one", Public: true}, nil
 	default:
-		return nil, fmt.Errorf("componentEcrRepo: unknown component: %s", component)
+		return manager.Repo{}, fmt.Errorf("componentEcrRepo: unknown component: %s", component)
 	}
 }
 

diff --git a/cd/manager/notifs/discord.go b/cd/manager/notifs/discord.go
@@ -178,14 +178,16 @@ func (n JobNotifs) getDeployHashes(jobState job.JobState) string {
 		casMsg := n.getComponentMsg(manager.DeployComponent_Cas, commitHashes)
 		casV5Msg := n.getComponentMsg(manager.DeployComponent_CasV5, commitHashes)
 		ipfsMsg := n.getComponentMsg(manager.DeployComponent_Ipfs, commitHashes)
-		return n.combineComponentMsgs(ceramicMsg, casMsg, casV5Msg, ipfsMsg)
+		rustCeramicMsg := n.getComponentMsg(manager.DeployComponent_RustCeramic, commitHashes)
+		return n.combineComponentMsgs(ceramicMsg, casMsg, casV5Msg, ipfsMsg, rustCeramicMsg)
 	}
 }
 
 func (n JobNotifs) getComponentMsg(component manager.DeployComponent, commitHashes map[manager.DeployComponent]string) string {
 	if commitHash, found := commitHashes[component]; found && (len(commitHash) >= shaTagLength) {
-		repo, _ := manager.ComponentRepo(component)
-		return fmt.Sprintf("[%s (%s)](https://github.com/%s/%s/commit/%s)", repo.Name, commitHash[:shaTagLength], repo.Org, repo.Name, commitHash)
+		if repo, err := manager.ComponentRepo(component); err == nil {
+			return fmt.Sprintf("[%s (%s)](https://github.com/%s/%s/commit/%s)", repo.Name, commitHash[:shaTagLength], repo.Org, repo.Name, commitHash)
+		}
 	}
 	return ""
 }