Preserve configured admin_features_package and product_types when API doesn't return them

Author: norrietaylor

ec/ecresource/projectresource/security.go

@@ -288,13 +288,17 @@ func (sec securityApi) Read(ctx context.Context, id string, model resource_secur
 	model.RegionId = basetypes.NewStringValue(resp.JSON200.RegionId)
 	model.Type = basetypes.NewStringValue(string(resp.JSON200.Type))
 
-	// Populate admin_features_package from API response (matching pattern used for suspended_reason)
-	var adminFeaturesPkg *string
+	// Populate admin_features_package from API response
 	if resp.JSON200.AdminFeaturesPackage != nil {
 		pkgStr := string(*resp.JSON200.AdminFeaturesPackage)
-		adminFeaturesPkg = &pkgStr
+		model.AdminFeaturesPackage = basetypes.NewStringValue(pkgStr)
+	} else if !model.AdminFeaturesPackage.IsNull() && !model.AdminFeaturesPackage.IsUnknown() {
+		// Preserve the configured value if API doesn't return it (Optional+Computed field behavior)
+		// The value is already in model.AdminFeaturesPackage from the state/plan, so no assignment needed.
+		// This handles cases where the API accepts the field on create but doesn't return it on read.
+	} else {
+		model.AdminFeaturesPackage = basetypes.NewStringNull()
 	}
-	model.AdminFeaturesPackage = basetypes.NewStringPointerValue(adminFeaturesPkg)
 
 	// Populate product_types from API response
 	if resp.JSON200.ProductTypes != nil {
@@ -321,6 +325,10 @@ func (sec securityApi) Read(ctx context.Context, id string, model resource_secur
 			return false, model, diags
 		}
 		model.ProductTypes = productTypesList
+	} else if !model.ProductTypes.IsNull() && !model.ProductTypes.IsUnknown() {
+		// Preserve the configured value if API doesn't return it (Optional+Computed field behavior)
+		// The value is already in model.ProductTypes from the state/plan, so no assignment needed.
+		// This handles cases where the API accepts the field on create but doesn't return it on read.
 	} else {
 		model.ProductTypes = types.ListNull(resource_security_project.ProductTypesValue{}.Type(ctx))
 	}

ec/ecresource/projectresource/security_test.go

@@ -1089,6 +1089,103 @@ func TestSecurityApi_Read(t *testing.T) {
 					ProductTypes:         types.ListValueMust(resource_security_project.ProductTypesValue{}.Type(ctx), expectedProductTypes),
 				}
 
+				mockApiClient := mocks.NewMockClientWithResponsesInterface(ctrl)
+				mockApiClient.EXPECT().
+					GetSecurityProjectWithResponse(ctx, id).
+					Return(&serverless.GetSecurityProjectResponse{
+						JSON200: readModel,
+					}, nil)
+
+				return testData{
+					client:        mockApiClient,
+					id:            id,
+					initialModel:  initialModel,
+					expectedModel: expectedModel,
+					expectedFound: true,
+				}
+			},
+		},
+		{
+			name: "should preserve configured admin_features_package and product_types when API doesn't return them",
+			testData: func(ctx context.Context) testData {
+				id := "project id"
+
+				// Initial model has configured values (simulating what comes from the plan/config)
+				configuredProductTypes := []attr.Value{
+					resource_security_project.NewProductTypesValueMust(
+						resource_security_project.ProductTypesValue{}.AttributeTypes(ctx),
+						map[string]attr.Value{
+							"product_line": basetypes.NewStringValue("security"),
+							"product_tier": basetypes.NewStringValue("essentials"),
+						},
+					),
+					resource_security_project.NewProductTypesValueMust(
+						resource_security_project.ProductTypesValue{}.AttributeTypes(ctx),
+						map[string]attr.Value{
+							"product_line": basetypes.NewStringValue("cloud"),
+							"product_tier": basetypes.NewStringValue("essentials"),
+						},
+					),
+				}
+
+				initialModel := resource_security_project.SecurityProjectModel{
+					Id:                   types.StringValue(id),
+					AdminFeaturesPackage: basetypes.NewStringValue("standard"),
+					ProductTypes:         types.ListValueMust(resource_security_project.ProductTypesValue{}.Type(ctx), configuredProductTypes),
+				}
+
+				// API response doesn't include admin_features_package or product_types
+				readModel := &serverless.SecurityProject{
+					Id:      id,
+					Alias:   "expected-alias-" + id[0:6],
+					CloudId: "cloud-id",
+					Endpoints: serverless.SecurityProjectEndpoints{
+						Elasticsearch: "es-endpoint",
+						Kibana:        "kib-endpoint",
+						Ingest:        "ingest-endpoint",
+					},
+					Metadata: serverless.ProjectMetadata{
+						CreatedAt:      time.Now(),
+						CreatedBy:      "me",
+						OrganizationId: "1",
+					},
+					Name:                 "project-name",
+					RegionId:             "nether",
+					Type:                 "security",
+					AdminFeaturesPackage: nil, // API doesn't return this
+					ProductTypes:         nil, // API doesn't return this
+				}
+
+				// Expected model should preserve the configured values
+				expectedModel := resource_security_project.SecurityProjectModel{
+					Id:      types.StringValue(id),
+					Alias:   types.StringValue("expected-alias"),
+					CloudId: types.StringValue(readModel.CloudId),
+					Endpoints: resource_security_project.NewEndpointsValueMust(
+						initialModel.Endpoints.AttributeTypes(ctx),
+						map[string]attr.Value{
+							"elasticsearch": basetypes.NewStringValue(readModel.Endpoints.Elasticsearch),
+							"kibana":        basetypes.NewStringValue(readModel.Endpoints.Kibana),
+							"ingest":        basetypes.NewStringValue(readModel.Endpoints.Ingest),
+						},
+					),
+					Metadata: resource_security_project.NewMetadataValueMust(
+						initialModel.Metadata.AttributeTypes(ctx),
+						map[string]attr.Value{
+							"created_at":       basetypes.NewStringValue(readModel.Metadata.CreatedAt.String()),
+							"created_by":       basetypes.NewStringValue(readModel.Metadata.CreatedBy),
+							"organization_id":  basetypes.NewStringValue(readModel.Metadata.OrganizationId),
+							"suspended_at":     basetypes.NewStringNull(),
+							"suspended_reason": basetypes.NewStringNull(),
+						},
+					),
+					Name:                 types.StringValue(readModel.Name),
+					RegionId:             types.StringValue(readModel.RegionId),
+					Type:                 types.StringValue(string(readModel.Type)),
+					AdminFeaturesPackage: basetypes.NewStringValue("standard"),
+					ProductTypes:         types.ListValueMust(resource_security_project.ProductTypesValue{}.Type(ctx), configuredProductTypes),
+				}
+
 				mockApiClient := mocks.NewMockClientWithResponsesInterface(ctrl)
 				mockApiClient.EXPECT().
 					GetSecurityProjectWithResponse(ctx, id).