docker_hub_repository: handle missing state (#112)

fixes #111

also adds state upgrade tests to the acceptance tests

Signed-off-by: Nick Santos <[email protected]>

Author: nicks

internal/provider/data_source_repository.go

@@ -160,11 +160,9 @@ func (d *RepositoryDataSource) Read(ctx context.Context, req datasource.ReadRequ
 	data.FullDescription = types.StringValue(repository.FullDescription)
 	data.Private = types.BoolValue(repository.IsPrivate)
 	data.PullCount = types.Int64Value(repository.PullCount)
-
-	immutableTagsSettings := deserializeImmutableTagsSettings(
+	data.ImmutableTagsSettings = deserializeImmutableTagsSettings(
 		repository.ImmutableTagsSettings.Enabled,
 		repository.ImmutableTagsSettings.Rules)
-	data.ImmutableTagsSettings = &immutableTagsSettings
 
 	diags := resp.State.Set(ctx, &data)
 	resp.Diagnostics.Append(diags...)

internal/provider/resource_repository.go

@@ -58,14 +58,14 @@ type ImmutableTagsSettings struct {
 }
 
 type RepositoryResourceModel struct {
-	ID                    types.String          `tfsdk:"id"`
-	Namespace             types.String          `tfsdk:"namespace"`
-	Name                  types.String          `tfsdk:"name"`
-	Description           types.String          `tfsdk:"description"`
-	FullDescription       types.String          `tfsdk:"full_description"`
-	Private               types.Bool            `tfsdk:"private"`
-	PullCount             types.Int64           `tfsdk:"pull_count"`
-	ImmutableTagsSettings ImmutableTagsSettings `tfsdk:"immutable_tags_settings"`
+	ID                    types.String           `tfsdk:"id"`
+	Namespace             types.String           `tfsdk:"namespace"`
+	Name                  types.String           `tfsdk:"name"`
+	Description           types.String           `tfsdk:"description"`
+	FullDescription       types.String           `tfsdk:"full_description"`
+	Private               types.Bool             `tfsdk:"private"`
+	PullCount             types.Int64            `tfsdk:"pull_count"`
+	ImmutableTagsSettings *ImmutableTagsSettings `tfsdk:"immutable_tags_settings"`
 }
 
 func immutableTagsSettingsSchema() schema.SingleNestedAttribute {
@@ -435,14 +435,14 @@ func serializeImmutableTagsRules(plan RepositoryResourceModel) string {
 		hubclient.ImmutableTagRulesSeparator)
 }
 
-func deserializeImmutableTagsSettings(enabled bool, rules []string) ImmutableTagsSettings {
+func deserializeImmutableTagsSettings(enabled bool, rules []string) *ImmutableTagsSettings {
 	if !enabled {
-		return ImmutableTagsSettings{
+		return &ImmutableTagsSettings{
 			Enabled: types.BoolValue(false),
 			Rules:   types.ListValueMust(types.StringType, nil),
 		}
 	}
-	return ImmutableTagsSettings{
+	return &ImmutableTagsSettings{
 		Enabled: types.BoolValue(true),
 		Rules:   typesListFromStringSlice(rules),
 	}

internal/provider/resource_repository_test.go

@@ -64,6 +64,37 @@ func TestAccRepositoryResource(t *testing.T) {
 	})
 }
 
+func TestAccRepositoryResource_Upgrade(t *testing.T) {
+	namespace := os.Getenv("DOCKER_USERNAME")
+	name := "example-repo" + randString(10)
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"docker": {
+						VersionConstraint: "0.4.1",
+						Source:            "docker/docker",
+					},
+				},
+				Config: testRepositoryResourceConfig(namespace, name),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("docker_hub_repository.test", "id"),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+				Config:                   testRepositoryResourceConfigUpdated(namespace, name),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("docker_hub_repository.test", "id"),
+					resource.TestCheckResourceAttr("docker_hub_repository.test", "description", "Updated example repository"),
+					resource.TestCheckResourceAttr("docker_hub_repository.test", "immutable_tags_settings.enabled", "false"),
+				),
+			},
+		},
+	})
+}
+
 func testRepositoryResourceConfig(namespace, name string) string {
 	return fmt.Sprintf(`
 resource "docker_hub_repository" "test" {