Ensure migrations actually run for users

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

github/resource_github_repository_autolink_reference.go

@@ -29,12 +29,12 @@ func resourceGithubRepositoryAutolinkReference() *schema.Resource {
 
 		CustomizeDiff: diffRepository,
 
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 		StateUpgraders: []schema.StateUpgrader{
 			{
-				Type:    resourceGithubRepositoryAutolinkReferenceV0().CoreConfigSchema().ImpliedType(),
-				Upgrade: resourceGithubRepositoryAutolinkReferenceStateUpgradeV0,
-				Version: 0,
+				Type:    resourceGithubRepositoryAutolinkReferenceV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceGithubRepositoryAutolinkReferenceStateUpgradeV1,
+				Version: 1,
 			},
 		},
 		Schema: map[string]*schema.Schema{

github/resource_github_repository_autolink_reference_migration.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func resourceGithubRepositoryAutolinkReferenceV0() *schema.Resource {
+func resourceGithubRepositoryAutolinkReferenceV1() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"repository": {
@@ -40,8 +40,8 @@ func resourceGithubRepositoryAutolinkReferenceV0() *schema.Resource {
 	}
 }
 
-func resourceGithubRepositoryAutolinkReferenceStateUpgradeV0(ctx context.Context, rawState map[string]any, m any) (map[string]any, error) {
-	tflog.Debug(ctx, "GitHub Repository Autolink Reference state before v0 migration", rawState)
+func resourceGithubRepositoryAutolinkReferenceStateUpgradeV1(ctx context.Context, rawState map[string]any, m any) (map[string]any, error) {
+	tflog.Debug(ctx, "GitHub Repository Autolink Reference state before v1 migration", rawState)
 
 	meta, _ := m.(*Owner)
 	client := meta.v3client
@@ -54,17 +54,17 @@ func resourceGithubRepositoryAutolinkReferenceStateUpgradeV0(ctx context.Context
 		}
 	}
 	if repoName == "" {
-		return nil, fmt.Errorf("state upgrade v0: repository is not a string or not set")
+		return nil, fmt.Errorf("state upgrade v1: repository is not a string or not set")
 	}
 
 	repo, _, err := client.Repositories.Get(ctx, owner, repoName)
 	if err != nil {
-		return nil, fmt.Errorf("state upgrade v0: failed to retrieve repository '%s': %w", repoName, err)
+		return nil, fmt.Errorf("state upgrade v1: failed to retrieve repository '%s/%s': %w", owner, repoName, err)
 	}
 
 	rawState["repository_id"] = int(repo.GetID())
 
-	tflog.Debug(ctx, "GitHub Repository Autolink Reference state after v0 migration", rawState)
+	tflog.Debug(ctx, "GitHub Repository Autolink Reference state after v1 migration", rawState)
 
 	return rawState, nil
 }

github/resource_github_repository_autolink_reference_migration_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/google/go-github/v88/github"
 )
 
-func buildMockResponsesForRepositoryAutolinkReferenceMigrationV0toV1(mockOwner, mockRepo string, wantRepoID int) []*mockResponse {
+func buildMockResponsesForRepositoryAutolinkReferenceMigrationV1toV2(mockOwner, mockRepo string, wantRepoID int) []*mockResponse {
 	responseBodyJSON, err := json.Marshal(github.Repository{
 		ID:   new(int64(wantRepoID)),
 		Name: new(mockRepo),
@@ -29,7 +29,7 @@ func buildMockResponsesForRepositoryAutolinkReferenceMigrationV0toV1(mockOwner,
 	}}
 }
 
-func Test_resourceGithubRepositoryAutolinkReferenceStateUpgradeV0toV1(t *testing.T) {
+func Test_resourceGithubRepositoryAutolinkReferenceStateUpgradeV1toV2(t *testing.T) {
 	t.Parallel()
 
 	for _, d := range []struct {
@@ -62,12 +62,12 @@ func Test_resourceGithubRepositoryAutolinkReferenceStateUpgradeV0toV1(t *testing
 			t.Parallel()
 
 			meta := &Owner{name: "test-org"}
-			ts := githubApiMock(buildMockResponsesForRepositoryAutolinkReferenceMigrationV0toV1(meta.name, "test-repo", 1234567890))
+			ts := githubApiMock(buildMockResponsesForRepositoryAutolinkReferenceMigrationV1toV2(meta.name, "test-repo", 1234567890))
 			defer ts.Close()
 
 			meta.v3client = mustCreateTestGitHubClient(t, ts.URL)
 
-			got, err := resourceGithubRepositoryAutolinkReferenceStateUpgradeV0(t.Context(), d.rawState, meta)
+			got, err := resourceGithubRepositoryAutolinkReferenceStateUpgradeV1(t.Context(), d.rawState, meta)
 			if (err != nil) != d.shouldError {
 				t.Fatalf("unexpected error state: got error %v, shouldError %v", err, d.shouldError)
 			}