Merge pull request #1855 from hashicorp/go-tfe-stacks-ga-update

Stacks GA update

Author: Maed223

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
 	github.com/hashicorp/go-slug v0.16.7
-	github.com/hashicorp/go-tfe v1.92.0
+	github.com/hashicorp/go-tfe v1.93.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/hcl/v2 v2.24.0 // indirect

go.sum

@@ -73,8 +73,8 @@ github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVU
 github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
 github.com/hashicorp/go-slug v0.16.7 h1:sBW8y1sX+JKOZKu9a+DQZuWDVaX+U9KFnk6+VDQvKcw=
 github.com/hashicorp/go-slug v0.16.7/go.mod h1:X5fm++dL59cDOX8j48CqHr4KARTQau7isGh0ZVxJB5I=
-github.com/hashicorp/go-tfe v1.92.0 h1:DxJ/ONlNgp4kP5xdglJBLYBeunDeii3CelpgA6PjebM=
-github.com/hashicorp/go-tfe v1.92.0/go.mod h1:QwqgCD5seztgp76CP7F0POJPflQNSqjIvBpVohg9X50=
+github.com/hashicorp/go-tfe v1.93.0 h1:hJubwn1xNCo1iBO66iQkjyC+skR61cK1AQUj4O9vvuI=
+github.com/hashicorp/go-tfe v1.93.0/go.mod h1:QwqgCD5seztgp76CP7F0POJPflQNSqjIvBpVohg9X50=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=

internal/provider/resource_tfe_stack.go

@@ -13,7 +13,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"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"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 )
 
@@ -92,11 +91,6 @@ func (r *resourceTFEStack) Schema(ctx context.Context, req resource.SchemaReques
 				Description: "Description of the Stack",
 				Optional:    true,
 			},
-			"deployment_names": schema.SetAttribute{
-				Description: "The time when the Stack was created.",
-				Computed:    true,
-				ElementType: types.StringType,
-			},
 			"created_at": schema.StringAttribute{
 				Description: "The time when the stack was created.",
 				Computed:    true,
@@ -194,7 +188,7 @@ func (r *resourceTFEStack) Read(ctx context.Context, req resource.ReadRequest, r
 	}
 
 	tflog.Debug(ctx, fmt.Sprintf("Reading stack %q", state.ID.ValueString()))
-	stack, err := r.config.Client.Stacks.Read(ctx, state.ID.ValueString(), nil)
+	stack, err := r.config.Client.Stacks.Read(ctx, state.ID.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to read stack", err.Error())
 		return
@@ -222,27 +216,6 @@ func (r *resourceTFEStack) Update(ctx context.Context, req resource.UpdateReques
 		return
 	}
 
-	// NOTE: if there are existing deployments, and you plan to move a stack from vcs to non-vcs or vice versa,
-	//       we should prevent the update and return an error because the API does not allow this.
-	// TODO: When the go-tfe package would allow such operation we should revisit this logic.
-	//       This is also inspired by similar behavior of the destroy / delete operation for this resource.
-	var deploymentNames []string
-	if !state.DeploymentNames.IsNull() {
-		if diags := state.DeploymentNames.ElementsAs(ctx, &deploymentNames, false); diags.HasError() {
-			resp.Diagnostics.AddError("Invalid deployment names", "Expected a set of strings for deployment names.")
-			return
-		}
-	}
-	tflog.Debug(ctx, fmt.Sprintf("Current deployments: %v", deploymentNames))
-
-	if (len(deploymentNames) > 0) && ((state.VCSRepo != nil && plan.VCSRepo == nil) || (state.VCSRepo == nil && plan.VCSRepo != nil)) {
-		resp.Diagnostics.AddError(
-			"Cannot update Stack VCS configuration with existing deployments",
-			"Please remove all deployments associated with this Stack before updating the VCS configuration.",
-		)
-		return
-	}
-
 	options := tfe.StackUpdateOptions{
 		Name:        tfe.String(plan.Name.ValueString()),
 		Description: tfe.String(plan.Description.ValueString()),

internal/provider/stack.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-tfe"
-	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -21,34 +20,27 @@ type modelTFEStackVCSRepo struct {
 // modelTFEStack maps the resource or data source schema data to a
 // struct.
 type modelTFEStack struct {
-	ID              types.String          `tfsdk:"id"`
-	ProjectID       types.String          `tfsdk:"project_id"`
-	AgentPoolID     types.String          `tfsdk:"agent_pool_id"`
-	Name            types.String          `tfsdk:"name"`
-	Description     types.String          `tfsdk:"description"`
-	DeploymentNames types.Set             `tfsdk:"deployment_names"`
-	VCSRepo         *modelTFEStackVCSRepo `tfsdk:"vcs_repo"`
-	CreatedAt       types.String          `tfsdk:"created_at"`
-	UpdatedAt       types.String          `tfsdk:"updated_at"`
+	ID          types.String          `tfsdk:"id"`
+	ProjectID   types.String          `tfsdk:"project_id"`
+	AgentPoolID types.String          `tfsdk:"agent_pool_id"`
+	Name        types.String          `tfsdk:"name"`
+	Description types.String          `tfsdk:"description"`
+	VCSRepo     *modelTFEStackVCSRepo `tfsdk:"vcs_repo"`
+	CreatedAt   types.String          `tfsdk:"created_at"`
+	UpdatedAt   types.String          `tfsdk:"updated_at"`
 }
 
 // modelFromTFEStack builds a modelTFEStack struct from a
 // tfe.Stack value.“
 func modelFromTFEStack(v *tfe.Stack) modelTFEStack {
-	names := make([]attr.Value, len(v.DeploymentNames))
-	for i, name := range v.DeploymentNames {
-		names[i] = types.StringValue(name)
-	}
-
 	result := modelTFEStack{
-		ID:              types.StringValue(v.ID),
-		ProjectID:       types.StringValue(v.Project.ID),
-		AgentPoolID:     types.StringNull(),
-		Name:            types.StringValue(v.Name),
-		Description:     types.StringNull(),
-		DeploymentNames: types.SetValueMust(types.StringType, names),
-		CreatedAt:       types.StringValue(v.CreatedAt.Format(time.RFC3339)),
-		UpdatedAt:       types.StringValue(v.UpdatedAt.Format(time.RFC3339)),
+		ID:          types.StringValue(v.ID),
+		ProjectID:   types.StringValue(v.Project.ID),
+		AgentPoolID: types.StringNull(),
+		Name:        types.StringValue(v.Name),
+		Description: types.StringNull(),
+		CreatedAt:   types.StringValue(v.CreatedAt.Format(time.RFC3339)),
+		UpdatedAt:   types.StringValue(v.UpdatedAt.Format(time.RFC3339)),
 	}
 
 	if v.VCSRepo != nil {