Fix issue where updates to vercel_environment_variables was broke (#276)

Turns out it missed setting state at the end for the env vars that were
not being updated.

Author: dglsparsons

vercel/resource_project.go

@@ -806,6 +806,19 @@ func (e *EnvironmentItem) equal(other *EnvironmentItem) bool {
 		e.Comment.ValueString() == other.Comment.ValueString()
 }
 
+func (e *EnvironmentItem) toAttrValue() attr.Value {
+	return types.ObjectValueMust(envVariableElemType.AttrTypes, map[string]attr.Value{
+		"id":                     e.ID,
+		"key":                    e.Key,
+		"value":                  e.Value,
+		"target":                 e.Target,
+		"custom_environment_ids": e.CustomEnvironmentIDs,
+		"git_branch":             e.GitBranch,
+		"sensitive":              e.Sensitive,
+		"comment":                e.Comment,
+	})
+}
+
 func (e *EnvironmentItem) toEnvironmentVariableRequest(ctx context.Context) (req client.EnvironmentVariableRequest, diags diag.Diagnostics) {
 	var target []string
 	diags = e.Target.ElementsAs(ctx, &target, true)

vercel/resource_project_environment_variables.go

@@ -284,7 +284,12 @@ func (e *ProjectEnvironmentVariables) toCreateEnvironmentVariablesRequest(ctx co
 // convertResponseToProjectEnvironmentVariables is used to populate terraform state based on an API response.
 // Where possible, values from the API response are used to populate state. If not possible,
 // values from plan are used.
-func convertResponseToProjectEnvironmentVariables(ctx context.Context, response []client.EnvironmentVariable, plan ProjectEnvironmentVariables) (ProjectEnvironmentVariables, diag.Diagnostics) {
+func convertResponseToProjectEnvironmentVariables(
+	ctx context.Context,
+	response []client.EnvironmentVariable,
+	plan ProjectEnvironmentVariables,
+	unchanged []EnvironmentItem,
+) (ProjectEnvironmentVariables, diag.Diagnostics) {
 	environment, diags := plan.environment(ctx)
 	if diags.HasError() {
 		return ProjectEnvironmentVariables{}, diags
@@ -344,20 +349,7 @@ func convertResponseToProjectEnvironmentVariables(ctx context.Context, response
 		alreadyPresent[e.ID] = struct{}{}
 
 		env = append(env, types.ObjectValueMust(
-			map[string]attr.Type{
-				"key":   types.StringType,
-				"value": types.StringType,
-				"target": types.SetType{
-					ElemType: types.StringType,
-				},
-				"custom_environment_ids": types.SetType{
-					ElemType: types.StringType,
-				},
-				"git_branch": types.StringType,
-				"id":         types.StringType,
-				"sensitive":  types.BoolType,
-				"comment":    types.StringType,
-			},
+			envVariableElemType.AttrTypes,
 			map[string]attr.Value{
 				"key":                    types.StringValue(e.Key),
 				"value":                  value,
@@ -371,6 +363,10 @@ func convertResponseToProjectEnvironmentVariables(ctx context.Context, response
 		))
 	}
 
+	for _, e := range unchanged {
+		env = append(env, e.toAttrValue())
+	}
+
 	return ProjectEnvironmentVariables{
 		TeamID:    toTeamID(plan.TeamID.ValueString()),
 		ProjectID: plan.ProjectID,
@@ -410,7 +406,7 @@ func (r *projectEnvironmentVariablesResource) Create(ctx context.Context, req re
 		)
 	}
 
-	result, diags := convertResponseToProjectEnvironmentVariables(ctx, created, plan)
+	result, diags := convertResponseToProjectEnvironmentVariables(ctx, created, plan, nil)
 	if diags.HasError() {
 		resp.Diagnostics.Append(diags...)
 		return
@@ -475,7 +471,7 @@ func (r *projectEnvironmentVariablesResource) Read(ctx context.Context, req reso
 		}
 	}
 
-	result, diags := convertResponseToProjectEnvironmentVariables(ctx, toUse, state)
+	result, diags := convertResponseToProjectEnvironmentVariables(ctx, toUse, state, nil)
 	if diags.HasError() {
 		resp.Diagnostics.Append(diags...)
 		return
@@ -530,6 +526,7 @@ func (r *projectEnvironmentVariablesResource) Update(ctx context.Context, req re
 	}
 
 	var toRemove []EnvironmentItem
+	var unchanged []EnvironmentItem
 	for _, e := range stateEnvs {
 		plannedEnv, ok := plannedEnvsByID[e.ID.ValueString()]
 		if !ok {
@@ -539,11 +536,13 @@ func (r *projectEnvironmentVariablesResource) Update(ctx context.Context, req re
 		if !plannedEnv.equal(&e) {
 			toRemove = append(toRemove, e)
 			toAdd = append(toAdd, plannedEnv)
+			continue
 		}
+		unchanged = append(unchanged, e)
 	}
 
-	tflog.Debug(ctx, "Removing environment variables", map[string]interface{}{"to_remove": toRemove})
-	tflog.Debug(ctx, "Adding environment variables", map[string]interface{}{"to_add": toAdd})
+	tflog.Info(ctx, "Removing environment variables", map[string]interface{}{"to_remove": toRemove})
+	tflog.Info(ctx, "Adding environment variables", map[string]interface{}{"to_add": toAdd})
 
 	for _, v := range toRemove {
 		err := r.client.DeleteEnvironmentVariable(ctx, state.ProjectID.ValueString(), state.TeamID.ValueString(), v.ID.ValueString())
@@ -574,7 +573,7 @@ func (r *projectEnvironmentVariablesResource) Update(ctx context.Context, req re
 			resp.Diagnostics.Append(diags...)
 			return
 		}
-		tflog.Debug(ctx, "create request", map[string]any{
+		tflog.Info(ctx, "create request", map[string]any{
 			"request": request,
 		})
 		response, err = r.client.CreateEnvironmentVariables(ctx, request)
@@ -585,10 +584,13 @@ func (r *projectEnvironmentVariablesResource) Update(ctx context.Context, req re
 			)
 			return
 		}
-	} else {
 	}
 
-	result, diags := convertResponseToProjectEnvironmentVariables(ctx, response, plan)
+	tflog.Info(ctx, "project env var response", map[string]any{
+		"response": response,
+	})
+
+	result, diags := convertResponseToProjectEnvironmentVariables(ctx, response, plan, unchanged)
 	if diags.HasError() {
 		resp.Diagnostics.Append(diags...)
 		return

vercel/resource_project_environment_variables_test.go

@@ -39,7 +39,11 @@ func TestAcc_ProjectEnvironmentVariables(t *testing.T) {
 			{
 				Config: testAccProjectEnvironmentVariablesConfigUpdated(projectName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "variables.#", "3"),
+					resource.TestCheckResourceAttr(resourceName, "variables.#", "4"),
+					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "variables.*", map[string]string{
+						"key":   "TEST_VAR_1",
+						"value": "test_value_1",
+					}),
 					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "variables.*", map[string]string{
 						"key":   "TEST_VAR_2",
 						"value": "test_value_2_updated",
@@ -77,7 +81,8 @@ resource "vercel_project" "test" {
 resource "vercel_project_environment_variables" "test" {
   project_id = vercel_project.test.id
   %[2]s
-  variables = [{
+  variables = [
+    {
       key   = "TEST_VAR_1"
       value = "test_value_1"
       target = ["production", "preview"]
@@ -109,6 +114,11 @@ resource "vercel_project_environment_variables" "test" {
   project_id = vercel_project.test.id
   %[2]s
   variables = [
+    {
+      key   = "TEST_VAR_1" // unchanged
+      value = "test_value_1"
+      target = ["production", "preview"]
+    },
     {
       key    = "TEST_VAR_2"
       value  = "test_value_2_updated"