Restructure github_actions_secret state migration files

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/migrate_github_actions_secret_test.go

@@ -292,3 +292,15 @@ func encryptPlaintext(plaintext, publicKeyB64 string) ([]byte, error) {
 
 	return cipherText, nil
 }
+
+func resourceGithubActionsSecretInstanceStateUpgradeV0(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+	log.Printf("[DEBUG] GitHub Actions Secret State before migration: %#v", rawState)
+	// Add the destroy_on_drift field with default value true if it doesn't exist
+	if _, ok := rawState["destroy_on_drift"]; !ok {
+		rawState["destroy_on_drift"] = true
+	}
+
+	log.Printf("[DEBUG] GitHub Actions Secret State after migration: %#v", rawState)
+
+	return rawState, nil
+}

github/resource_github_actions_secret.go

@@ -1,9 +1,6 @@
 package github
 
 import (
-	"context"
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -52,15 +49,3 @@ func resourceGithubActionsSecretResourceV0() *schema.Resource {
 		},
 	}
 }
-
-func resourceGithubActionsSecretInstanceStateUpgradeV0(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
-	log.Printf("[DEBUG] GitHub Actions Secret State before migration: %#v", rawState)
-	// Add the destroy_on_drift field with default value true if it doesn't exist
-	if _, ok := rawState["destroy_on_drift"]; !ok {
-		rawState["destroy_on_drift"] = true
-	}
-
-	log.Printf("[DEBUG] GitHub Actions Secret State after migration: %#v", rawState)
-
-	return rawState, nil
-}

github/migrate_github_actions_secret.go …ource_github_actions_secret_schema_v0.gogithub/migrate_github_actions_secret.go renamed to github/resource_github_actions_secret_schema_v0.go github/migrate_github_actions_secret.go renamed to github/resource_github_actions_secret_schema_v0.go

@@ -3,6 +3,7 @@ package github
 import (
 	"encoding/base64"
 	"fmt"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -553,3 +554,52 @@ func TestGithubActionsSecretIssue964Solution(t *testing.T) {
 		t.Logf("SUCCESS: Issue #964 solved - secret with destroy_on_drift=false does not get recreated on external changes")
 	})
 }
+
+func testResourceGithubActionsSecretInstanceStateDataV0() map[string]any {
+	return map[string]any{
+		"id":              "test-secret",
+		"repository":      "test-repo",
+		"secret_name":     "test-secret",
+		"created_at":      "2023-01-01T00:00:00Z",
+		"updated_at":      "2023-01-01T00:00:00Z",
+		"plaintext_value": "secret-value",
+	}
+}
+
+func testResourceGithubActionsSecretInstanceStateDataV0_WithDrift() map[string]any {
+	v0 := testResourceGithubActionsSecretInstanceStateDataV0()
+	v0["destroy_on_drift"] = false
+	return v0
+}
+
+func testResourceGithubActionsSecretInstanceStateDataV1() map[string]any {
+	v0 := testResourceGithubActionsSecretInstanceStateDataV0()
+	v0["destroy_on_drift"] = true
+	return v0
+}
+
+func TestGithub_MigrateActionsSecretStateV0toV1(t *testing.T) {
+	t.Run("without destroy_on_drift", func(t *testing.T) {
+		expected := testResourceGithubActionsSecretInstanceStateDataV1()
+		actual, err := resourceGithubActionsSecretInstanceStateUpgradeV0(t.Context(), testResourceGithubActionsSecretInstanceStateDataV0(), nil)
+		if err != nil {
+			t.Fatalf("error migrating state: %s", err)
+		}
+
+		if !reflect.DeepEqual(expected, actual) {
+			t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", expected, actual)
+		}
+	})
+
+	t.Run("with destroy_on_drift", func(t *testing.T) {
+		expected := testResourceGithubActionsSecretInstanceStateDataV0_WithDrift()
+		actual, err := resourceGithubActionsSecretInstanceStateUpgradeV0(t.Context(), testResourceGithubActionsSecretInstanceStateDataV0_WithDrift(), nil)
+		if err != nil {
+			t.Fatalf("error migrating state: %s", err)
+		}
+
+		if !reflect.DeepEqual(expected, actual) {
+			t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", expected, actual)
+		}
+	})
+}