use sdp-go v0.103.0

overmindtech · Dec 17, 2024 · fa9a718 · fa9a718
1 parent 93ebabe
commit fa9a718
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/cmd/changes_get_change.go b/cmd/changes_get_change.go
@@ -102,9 +102,9 @@ fetch:
 			}
 		}
 
-		if riskRes.Msg.GetChangeRiskMetadata().GetChangeAnalysisStatus().GetStatus() == sdp.ChangeAnalysisStatus_STATUS_INPROGRESS {
+		if riskRes.Msg.GetGetChangeAnalysisStatus().GetChangeAnalysisStatus().GetStatus() == sdp.ChangeAnalysisStatus_STATUS_INPROGRESS {
 			// Extract the currently running milestone if you can
-			milestones := riskRes.Msg.GetChangeRiskMetadata().GetChangeAnalysisStatus().GetProgressMilestones()
+			milestones := riskRes.Msg.GetGetChangeAnalysisStatus().GetChangeAnalysisStatus().GetProgressMilestones()
 			var currentMilestone string
 			for _, milestone := range milestones {
 				if milestone == nil {
@@ -117,7 +117,7 @@ fetch:
 			}
 
 			log.WithContext(ctx).WithFields(log.Fields{
-				"status":    riskRes.Msg.GetChangeRiskMetadata().GetChangeAnalysisStatus().GetStatus().String(),
+				"status":    riskRes.Msg.GetGetChangeAnalysisStatus().GetChangeAnalysisStatus().GetStatus().String(),
 				"milestone": currentMilestone,
 			}).Info("Waiting for risk calculation")
 
@@ -163,7 +163,7 @@ fetch:
 			"risk-levels": renderRiskFilter(riskLevels),
 		}).Info("filtering risks")
 
-		md := riskRes.Msg.GetChangeRiskMetadata()
+		md := riskRes.Msg.GetGetChangeAnalysisStatus()
 		if md != nil {
 			md.Risks = filterRisks(md.GetRisks(), riskLevels)
 		}
@@ -172,11 +172,11 @@ fetch:
 	switch viper.GetString("format") {
 	case "json":
 		jsonStruct := struct {
-			Change       *sdp.Change             `json:"change"`
-			RiskMetadata *sdp.ChangeRiskMetadata `json:"risk_metadata"`
+			Change       *sdp.Change                  `json:"change"`
+			RiskMetadata *sdp.GetChangeAnalysisStatus `json:"risk_metadata"`
 		}{
 			Change:       changeRes.Msg.GetChange(),
-			RiskMetadata: riskRes.Msg.GetChangeRiskMetadata(),
+			RiskMetadata: riskRes.Msg.GetGetChangeAnalysisStatus(),
 		}
 
 		b, err := json.MarshalIndent(jsonStruct, "", "  ")
@@ -325,7 +325,7 @@ fetch:
 			}
 		}
 
-		for _, risk := range riskRes.Msg.GetChangeRiskMetadata().GetRisks() {
+		for _, risk := range riskRes.Msg.GetGetChangeAnalysisStatus().GetRisks() {
 			data.Risks = append(data.Risks, TemplateRisk{
 				SeverityAlt:  severity[risk.GetSeverity()].SeverityAlt,
 				SeverityIcon: severity[risk.GetSeverity()].SeverityIcon,

diff --git a/cmd/terraform_plan.go b/cmd/terraform_plan.go
@@ -396,7 +396,7 @@ func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindI
 			return nil
 		}
 
-		for i, ms := range riskRes.Msg.GetChangeRiskMetadata().GetChangeAnalysisStatus().GetProgressMilestones() {
+		for i, ms := range riskRes.Msg.GetGetChangeAnalysisStatus().GetChangeAnalysisStatus().GetProgressMilestones() {
 			if i <= len(milestoneSpinners) {
 				new := pterm.DefaultSpinner.
 					WithWriter(multi.NewWriter()).
@@ -421,7 +421,7 @@ func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindI
 			}
 		}
 
-		status := riskRes.Msg.GetChangeRiskMetadata().GetChangeAnalysisStatus().GetStatus()
+		status := riskRes.Msg.GetGetChangeAnalysisStatus().GetChangeAnalysisStatus().GetStatus()
 		if status == sdp.ChangeAnalysisStatus_STATUS_UNSPECIFIED || status == sdp.ChangeAnalysisStatus_STATUS_INPROGRESS {
 			if !riskSpinner.IsActive {
 				// restart after a Fail()
@@ -443,7 +443,7 @@ func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindI
 	// Submit milestone for tracing
 	if cmdSpan != nil {
 		cmdSpan.AddEvent("Risk calculation finished", trace.WithAttributes(
-			attribute.Int("ovm.risks.count", len(riskRes.Msg.GetChangeRiskMetadata().GetRisks())),
+			attribute.Int("ovm.risks.count", len(riskRes.Msg.GetGetChangeAnalysisStatus().GetRisks())),
 			attribute.String("ovm.change.uuid", changeUuid.String()),
 		))
 	}
@@ -454,7 +454,7 @@ func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindI
 		bits = append(bits, fmt.Sprintf("\nItems: %v\nEdges: %v\n", blastRadiusItems, blastRadiusEdges))
 	}
 
-	risks := riskRes.Msg.GetChangeRiskMetadata().GetRisks()
+	risks := riskRes.Msg.GetGetChangeAnalysisStatus().GetRisks()
 	bits = append(bits, "")
 	bits = append(bits, "")
 	if len(risks) == 0 {

diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/overmindtech/discovery v0.33.4
 	github.com/overmindtech/k8s-source v0.9.1
 	github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297
-	github.com/overmindtech/sdp-go v0.102.5-0.20241216105318-a0af4432d4b2
+	github.com/overmindtech/sdp-go v0.103.0
 	github.com/overmindtech/stdlib-source v0.0.0-20241211162909-1bb8eb048964
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -330,6 +330,8 @@ github.com/overmindtech/sdp-go v0.102.5-0.20241216101827-31ab7b07f9d8 h1:7V7SYUv
 github.com/overmindtech/sdp-go v0.102.5-0.20241216101827-31ab7b07f9d8/go.mod h1:Lx2DtTLaroGuVTq5CL1SBT19zzudhLF6jdRkwXDJXRk=
 github.com/overmindtech/sdp-go v0.102.5-0.20241216105318-a0af4432d4b2 h1:dyCFaDLLf+wOCYgirtOepWHspDDzQyWBCddEUyhAEjg=
 github.com/overmindtech/sdp-go v0.102.5-0.20241216105318-a0af4432d4b2/go.mod h1:Lx2DtTLaroGuVTq5CL1SBT19zzudhLF6jdRkwXDJXRk=
+github.com/overmindtech/sdp-go v0.103.0 h1:MVOYYrP7kdma8Zd6Ol1jX9KHnpe8ZJGlLqm224+Nt/4=
+github.com/overmindtech/sdp-go v0.103.0/go.mod h1:Lx2DtTLaroGuVTq5CL1SBT19zzudhLF6jdRkwXDJXRk=
 github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k=
 github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE=
 github.com/overmindtech/stdlib-source v0.0.0-20241211162909-1bb8eb048964 h1:StLQfDPOlAHecZtIItkHiYO3ZArKrP1dv3t2Z/n4N1U=