acc tests

Author: rubenhoenle

stackit/internal/services/postgresflex/postgresflex_acc_test.go

@@ -9,21 +9,22 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	"github.com/stackitcloud/stackit-sdk-go/core/utils"
+	sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
 
 	"github.com/stackitcloud/stackit-sdk-go/core/config"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/wait"
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"
+	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
 )
 
 // Instance resource data
 var instanceResource = map[string]string{
 	"project_id":              testutil.ProjectId,
 	"name":                    fmt.Sprintf("tf-acc-%s", acctest.RandStringFromCharSet(7, acctest.CharSetAlphaNum)),
 	"acl":                     "192.168.0.0/16",
-	"backup_schedule":         "00 16 * * *",
+	"backup_schedule":         "00 16 * * *", // ensure it works properly with leading zeros
 	"backup_schedule_updated": "00 12 * * *",
 	"flavor_cpu":              "2",
 	"flavor_ram":              "4",
@@ -248,7 +249,18 @@ func TestAccPostgresFlexFlexResource(t *testing.T) {
 				},
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password"},
+				ImportStateVerifyIgnore: []string{"password", "backup_schedule"},
+				ImportStateCheck: func(s []*terraform.InstanceState) error {
+					if len(s) != 1 {
+						return fmt.Errorf("expected 1 state, got %d", len(s))
+					}
+
+					if utils.SimplifyCronString(s[0].Attributes["backup_schedule"]) != utils.SimplifyCronString(instanceResource["backup_schedule"]) {
+						return fmt.Errorf("expected backup_schedule %s, got %s", instanceResource["backup_schedule"], s[0].Attributes["backup_schedule"])
+					}
+
+					return nil
+				},
 			},
 			{
 				ResourceName: "stackit_postgresflex_user.user",
@@ -354,7 +366,7 @@ func testAccCheckPostgresFlexDestroy(s *terraform.State) error {
 		if items[i].Id == nil {
 			continue
 		}
-		if utils.Contains(instancesToDestroy, *items[i].Id) {
+		if sdkUtils.Contains(instancesToDestroy, *items[i].Id) {
 			err := client.ForceDeleteInstanceExecute(ctx, testutil.ProjectId, testutil.Region, *items[i].Id)
 			if err != nil {
 				return fmt.Errorf("deleting instance %s during CheckDestroy: %w", *items[i].Id, err)

stackit/internal/services/sqlserverflex/instance/resource.go

@@ -230,8 +230,10 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
 			"backup_schedule": schema.StringAttribute{
 				Description: descriptions["backup_schedule"],
 				Optional:    true,
+				Computed:    true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifierCustom.CronNormalizationModifier{},
+					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
 			"flavor": schema.SingleNestedAttribute{

stackit/internal/services/sqlserverflex/sqlserverflex_acc_test.go

@@ -31,7 +31,7 @@ var testConfigVarsMin = config.Variables{
 	"name":               config.StringVariable(fmt.Sprintf("tf-acc-%s", acctest.RandStringFromCharSet(7, acctest.CharSetAlphaNum))),
 	"flavor_cpu":         config.IntegerVariable(4),
 	"flavor_ram":         config.IntegerVariable(16),
-	"flavor_description": config.StringVariable("SQLServer-Flex-4.16-Standard-EU01"),
+	"flavor_description": config.StringVariable("SQLServer-Flex-4.16-Single-Standard-EU01"),
 	"replicas":           config.IntegerVariable(1),
 	"flavor_id":          config.StringVariable("4.16-Single"),
 	"username":           config.StringVariable(fmt.Sprintf("tf-acc-user-%s", acctest.RandStringFromCharSet(7, acctest.CharSetAlpha))),