Remove default value from archive_git_path and only apply when set

Issue #9
DockStudios · Nov 6, 2024 · 7c71820 · 7c71820
1 parent df6e2ec
commit 7c71820
Showing 1 changed file with 30 additions and 24 deletions.
diff --git a/internal/provider/module_resource.go b/internal/provider/module_resource.go
@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -103,8 +102,6 @@ NOTE: Setting this field will override the repository provider configuration.`,
 			},
 			"archive_git_path": schema.BoolAttribute{
 				Optional: true,
-				Computed: true,
-				Default:  booldefault.StaticBool(false),
 				MarkdownDescription: `This determines whether the generated archives only contain the contents of the "Module path".
 									  This is only used for providing modules from archives rather than using Git repository redirects.
 									  This can be used if the source directory contains other content that you do no wish to distribute to users.
@@ -161,19 +158,24 @@ func (r *ModuleResource) Create(ctx context.Context, req resource.CreateRequest,
 		return
 	}
 
+	model := terrareg.ModuleModel{
+		GitProviderID:         data.GitProviderID.ValueInt64(),
+		RepoBaseUrlTemplate:   data.RepoBaseUrlTemplate.ValueString(),
+		RepoCloneUrlTemplate:  data.RepoCloneUrlTemplate.ValueString(),
+		RepoBrowseUrlTemplate: data.RepoBrowseUrlTemplate.ValueString(),
+		GitTagFormat:          data.GitTagFormat.ValueString(),
+		GitPath:               data.GitPath.ValueString(),
+		ArchiveGitPath:        data.ArchiveGitPath.ValueBool(),
+	}
+	if !data.ArchiveGitPath.IsNull() {
+		model.ArchiveGitPath = data.ArchiveGitPath.ValueBool()
+	}
+
 	id, err := r.client.CreateModule(
 		data.Namespace.ValueString(),
 		data.Name.ValueString(),
 		data.Provider.ValueString(),
-		terrareg.ModuleModel{
-			GitProviderID:         data.GitProviderID.ValueInt64(),
-			RepoBaseUrlTemplate:   data.RepoBaseUrlTemplate.ValueString(),
-			RepoCloneUrlTemplate:  data.RepoCloneUrlTemplate.ValueString(),
-			RepoBrowseUrlTemplate: data.RepoBrowseUrlTemplate.ValueString(),
-			GitTagFormat:          data.GitTagFormat.ValueString(),
-			GitPath:               data.GitPath.ValueString(),
-			ArchiveGitPath:        data.ArchiveGitPath.ValueBool(),
-		},
+		model,
 	)
 	if err != nil {
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create module, got error: %s", err))
@@ -292,23 +294,27 @@ func (r *ModuleResource) Update(ctx context.Context, req resource.UpdateRequest,
 		newProvider = plan.Provider.ValueString()
 	}
 
+	model := &terrareg.ModuleModel{
+		GitProviderID:         plan.GitProviderID.ValueInt64(),
+		RepoBaseUrlTemplate:   plan.RepoBaseUrlTemplate.ValueString(),
+		RepoCloneUrlTemplate:  plan.RepoCloneUrlTemplate.ValueString(),
+		RepoBrowseUrlTemplate: plan.RepoBrowseUrlTemplate.ValueString(),
+		GitTagFormat:          plan.GitTagFormat.ValueString(),
+		GitPath:               plan.GitPath.ValueString(),
+	}
+	if !plan.ArchiveGitPath.IsNull() {
+		model.ArchiveGitPath = plan.ArchiveGitPath.ValueBool()
+	}
+
 	_, err := r.client.UpdateModule(
 		state.Namespace.ValueString(),
 		state.Name.ValueString(),
 		state.Provider.ValueString(),
 		terrareg.ModuleUpdateModel{
-			Namespace: newNamespace,
-			Name:      newName,
-			Provider:  newProvider,
-			ModuleModel: &terrareg.ModuleModel{
-				GitProviderID:         plan.GitProviderID.ValueInt64(),
-				RepoBaseUrlTemplate:   plan.RepoBaseUrlTemplate.ValueString(),
-				RepoCloneUrlTemplate:  plan.RepoCloneUrlTemplate.ValueString(),
-				RepoBrowseUrlTemplate: plan.RepoBrowseUrlTemplate.ValueString(),
-				GitTagFormat:          plan.GitTagFormat.ValueString(),
-				GitPath:               plan.GitPath.ValueString(),
-				ArchiveGitPath:        plan.ArchiveGitPath.ValueBool(),
-			},
+			Namespace:   newNamespace,
+			Name:        newName,
+			Provider:    newProvider,
+			ModuleModel: model,
 		},
 	)
 	if err != nil {