Merge pull request #139 from overmindtech/fix-formatting

Fix formatting of get-change headers; upgrade sdp-go and otel; remove duplicate slashes
overmindtech · Dec 11, 2023 · 9be7d1b · 9be7d1b
2 parents d7753c1 + 95583a4
commit 9be7d1b
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 471 deletions.
diff --git a/cmd/comment.md b/cmd/comment.md
@@ -17,10 +17,10 @@
 </details>
 {{ else -}}
 No expected changes found.
-{{ end -}}
+{{ end }}
 
 {{ if .UnmappedChanges -}}
-## <img width="20" alt="unmapped" src="{{ .AssetPath }}//unmapped.svg"> Unmapped Changes
+## <img width="20" alt="unmapped" src="{{ .AssetPath }}/unmapped.svg"> Unmapped Changes
 
 > [!NOTE]
 > These changes couldn't be mapped to a real cloud resource and therefore won't be included in the blast radius calculation.
@@ -53,7 +53,6 @@ No expected changes found.
 [Open in Overmind]({{ .ChangeUrl }})
 
 {{ if .Risks }}
-
 # <img width="24" alt="warning" src="{{ .AssetPath }}/risks.svg"> Risks
 
 {{ range .Risks }}

diff --git a/cmd/createbookmark.go b/cmd/createbookmark.go
@@ -73,7 +73,7 @@ func CreateBookmark(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI CreateBookmark", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/endchange.go b/cmd/endchange.go
@@ -59,7 +59,7 @@ func EndChange(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI EndChange", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/getaffectedbookmarks.go b/cmd/getaffectedbookmarks.go
@@ -77,7 +77,7 @@ func GetAffectedBookmarks(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI GetAffectedBookmarks", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/getbookmark.go b/cmd/getbookmark.go
@@ -67,7 +67,7 @@ func GetBookmark(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI GetBookmark", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/getchange.go b/cmd/getchange.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"text/template"
 	"time"
@@ -77,7 +78,7 @@ func GetChange(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI GetChange", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 
@@ -220,8 +221,9 @@ func GetChange(ctx context.Context, ready chan bool) int {
 				SeverityText: "High",
 			},
 		}
+		frontend, _ := strings.CutSuffix(viper.GetString("frontend"), "/")
 		data := TemplateData{
-			ChangeUrl:       fmt.Sprintf("%v/changes/%v", viper.GetString("frontend"), changeUuid.String()),
+			ChangeUrl:       fmt.Sprintf("%v/changes/%v", frontend, changeUuid.String()),
 			ExpectedChanges: []TemplateItem{},
 			UnmappedChanges: []TemplateItem{},
 			BlastItems:      int(changeRes.Msg.Change.Metadata.NumAffectedItems),

diff --git a/cmd/getsnapshot.go b/cmd/getsnapshot.go
@@ -67,7 +67,7 @@ func GetSnapshot(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI GetSnapshot", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/invite.go b/cmd/invite.go
@@ -130,7 +130,7 @@ func InvitesRevoke(ctx context.Context) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI Revoke Invite", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 
@@ -169,7 +169,7 @@ func InvitesCreate(ctx context.Context) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI Create Invite", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 
@@ -202,7 +202,7 @@ func InvitesList(ctx context.Context) int {
 	var err error
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI List Invites", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/listchanges.go b/cmd/listchanges.go
@@ -62,7 +62,7 @@ func ListChanges(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI ListChanges", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/manualchange.go b/cmd/manualchange.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 
@@ -62,7 +63,7 @@ func ManualChange(ctx context.Context, ready chan bool) int {
 		return 1
 	}
 	ctx, span := tracing.Tracer().Start(ctx, "CLI ManualChange", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 
@@ -204,7 +205,8 @@ func ManualChange(ctx context.Context, ready chan bool) int {
 		return 1
 	}
 
-	changeUrl := fmt.Sprintf("%v/changes/%v/blast-radius", viper.GetString("frontend"), changeUuid)
+	frontend, _ := strings.CutSuffix(viper.GetString("frontend"), "/")
+	changeUrl := fmt.Sprintf("%v/changes/%v/blast-radius", frontend, changeUuid)
 	log.WithContext(ctx).WithFields(lf).WithField("change-url", changeUrl).Info("change ready")
 	fmt.Println(changeUrl)
 
@@ -227,7 +229,7 @@ func ManualChange(ctx context.Context, ready chan bool) int {
 		log.WithContext(ctx).WithFields(lf).WithFields(log.Fields{
 			"change-url": changeUrl,
 			"app":        appUuid,
-			"app-url":    fmt.Sprintf("%v/apps/%v", viper.GetString("frontend"), appUuid),
+			"app-url":    fmt.Sprintf("%v/apps/%v", frontend, appUuid),
 		}).Info("affected app")
 	}
 

diff --git a/cmd/request.go b/cmd/request.go
@@ -126,7 +126,7 @@ func Request(ctx context.Context, ready chan bool) int {
 		return 1
 	}
 	ctx, span := tracing.Tracer().Start(ctx, "CLI Request", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/startchange.go b/cmd/startchange.go
@@ -59,7 +59,7 @@ func StartChange(ctx context.Context, ready chan bool) int {
 	}
 
 	ctx, span := tracing.Tracer().Start(ctx, "CLI StartChange", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 

diff --git a/cmd/submitplan.go b/cmd/submitplan.go
@@ -536,7 +536,7 @@ func SubmitPlan(ctx context.Context, files []string, ready chan bool) int {
 		return 1
 	}
 	ctx, span := tracing.Tracer().Start(ctx, "CLI SubmitPlan", trace.WithAttributes(
-		attribute.String("om.config", fmt.Sprintf("%v", viper.AllSettings())),
+		attribute.String("ovm.config", fmt.Sprintf("%v", viper.AllSettings())),
 	))
 	defer span.End()
 
@@ -674,7 +674,8 @@ func SubmitPlan(ctx context.Context, files []string, ready chan bool) int {
 		return 1
 	}
 
-	changeUrl := fmt.Sprintf("%v/changes/%v/blast-radius", viper.GetString("frontend"), changeUuid)
+	frontend, _ := strings.CutSuffix(viper.GetString("frontend"), "/")
+	changeUrl := fmt.Sprintf("%v/changes/%v/blast-radius", frontend, changeUuid)
 	log.WithContext(ctx).WithFields(lf).WithField("change-url", changeUrl).Info("Change ready")
 	fmt.Println(changeUrl)
 
@@ -697,7 +698,7 @@ func SubmitPlan(ctx context.Context, files []string, ready chan bool) int {
 		log.WithContext(ctx).WithFields(lf).WithFields(log.Fields{
 			"change-url": changeUrl,
 			"app":        appUuid,
-			"app-url":    fmt.Sprintf("%v/apps/%v", viper.GetString("frontend"), appUuid),
+			"app-url":    fmt.Sprintf("%v/apps/%v", frontend, appUuid),
 		}).Info("Affected app")
 	}