Fixing up detector defintition

splunk-terraform · Oct 22, 2024 · 97f497a · 97f497a
1 parent d1178a4
commit 97f497a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/internal/definition/detector/resource.go b/internal/definition/detector/resource.go
@@ -32,7 +32,7 @@ func NewResource() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		StateUpgraders: []schema.StateUpgrader{
-			{Type: stateV0State().CoreConfigSchema().ImpliedType(), Upgrade: stateMigrationV0, Version: 0},
+			{Type: v0state().CoreConfigSchema().ImpliedType(), Upgrade: v0stateMigration, Version: 0},
 		},
 	}
 }
@@ -67,12 +67,13 @@ func resourceCreate(ctx context.Context, data *schema.ResourceData, meta any) (i
 		return tfext.AsErrorDiagnostics(err)
 	}
 
-	endpoint, err := pmeta.LoadApplicationURL(ctx, meta, AppPath, resp.Id, "edit")
-	if err != nil {
-		issues = tfext.AppendDiagnostics(issues, tfext.AsErrorDiagnostics(err)...)
-	}
-
-	issues = tfext.AppendDiagnostics(issues, tfext.AsErrorDiagnostics(data.Set("url", endpoint))...)
+	issues = tfext.AppendDiagnostics(issues,
+		tfext.AsErrorDiagnostics(
+			data.Set("url",
+				pmeta.LoadApplicationURL(ctx, meta, AppPath, resp.Id, "edit"),
+			),
+		)...,
+	)
 
 	return tfext.AppendDiagnostics(
 		issues,
@@ -136,12 +137,11 @@ func resourceUpdate(ctx context.Context, data *schema.ResourceData, meta any) (i
 		return tfext.AsErrorDiagnostics(err)
 	}
 
-	endpoint, err := pmeta.LoadApplicationURL(ctx, meta, AppPath, resp.Id, "edit")
-	if err != nil {
-		issues = tfext.AppendDiagnostics(issues, tfext.AsErrorDiagnostics(err)...)
-	}
-
-	issues = tfext.AppendDiagnostics(issues, tfext.AsErrorDiagnostics(data.Set("url", endpoint))...)
+	issues = tfext.AppendDiagnostics(issues,
+		tfext.AsErrorDiagnostics(
+			data.Set("url", pmeta.LoadApplicationURL(ctx, meta, AppPath, resp.Id, "edit")),
+		)...,
+	)
 
 	return tfext.AppendDiagnostics(
 		issues,

diff --git a/internal/definition/detector/state_v0.go → internal/definition/detector/v0_state.go b/internal/definition/detector/state_v0.go → internal/definition/detector/v0_state.go
@@ -13,15 +13,15 @@ import (
 	tfext "github.com/splunk-terraform/terraform-provider-signalfx/internal/tfextension"
 )
 
-func stateV0State() *schema.Resource {
+func v0state() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"time_range": {Type: schema.TypeString, Optional: true},
 		},
 	}
 }
 
-func stateMigrationV0(ctx context.Context, state map[string]any, _ any) (map[string]any, error) {
+func v0stateMigration(ctx context.Context, state map[string]any, _ any) (map[string]any, error) {
 	tflog.Debug(ctx, "Upgrading detector state", tfext.NewLogFields().JSON("state", state))
 
 	if tr, ok := state["time_range"].(string); ok {

diff --git a/...rnal/definition/detector/state_v0_test.go → ...rnal/definition/detector/v0_state_test.go b/...rnal/definition/detector/state_v0_test.go → ...rnal/definition/detector/v0_state_test.go
@@ -21,7 +21,7 @@ func TestStateV0(t *testing.T) {
 				Optional: true,
 			},
 		},
-		stateV0State().Schema,
+		v0state().Schema,
 		"Must match the expected value",
 	)
 }
@@ -63,7 +63,7 @@ func TestStateMigrationV0(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			actual, err := stateMigrationV0(context.Background(), tc.state, nil)
+			actual, err := v0stateMigration(context.Background(), tc.state, nil)
 
 			assert.Equal(t, tc.expect, actual, "Must match the expected state")
 			if tc.errVal != "" {