From 55427f7a48a29eca30a7ed245f08f058f5cefeae Mon Sep 17 00:00:00 2001 From: "Marcel S. Henselin" Date: Mon, 2 Mar 2026 09:45:31 +0100 Subject: [PATCH] fix: fix linting errors and test --- .golang-ci.yaml | 1 - .../postgresflex_acc_test.go | 52 +++++++++++-------- .../testdata/instance_template.gompl | 14 ++--- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/.golang-ci.yaml b/.golang-ci.yaml index 11f74066..cf1de567 100644 --- a/.golang-ci.yaml +++ b/.golang-ci.yaml @@ -1,4 +1,3 @@ - version: "2" run: concurrency: 4 diff --git a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go index bd63defd..fc22c9da 100644 --- a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go @@ -76,21 +76,21 @@ func testAccPreCheck(t *testing.T) { type resData struct { ServiceAccountFilePath string - ProjectId string + ProjectID string Region string Name string TfName string - FlavorId string + FlavorID string BackupSchedule string UseEncryption bool - KekKeyId string - KekKeyRingId string + KekKeyID string + KekKeyRingID string KekKeyVersion uint8 KekServiceAccount string PerformanceClass string Replicas uint32 Size uint32 - AclString string + ACLString string AccessScope string RetentionDays uint32 Version string @@ -100,13 +100,13 @@ type resData struct { type User struct { Name string - ProjectId string + ProjectID string Roles []string } type Database struct { Name string - ProjectId string + ProjectID string Owner string } @@ -115,17 +115,17 @@ func getExample() resData { return resData{ Region: os.Getenv("TF_ACC_REGION"), ServiceAccountFilePath: os.Getenv("TF_ACC_SERVICE_ACCOUNT_FILE"), - ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), Name: name, TfName: name, - FlavorId: "2.4", + FlavorID: "2.4", BackupSchedule: "0 0 * * *", UseEncryption: false, RetentionDays: 33, Replicas: 1, PerformanceClass: "premium-perf2-stackit", Size: 10, - AclString: "0.0.0.0/0", + ACLString: "0.0.0.0/0", AccessScope: "PUBLIC", Version: "17", } @@ -162,7 +162,8 @@ func TestAccInstance(t *testing.T) { } */ - var testItemID string + testItemID := testutils.ResStr(pfx, "instance", exData.TfName) + resource.ParallelTest( t, resource.TestCase{ PreCheck: func() { @@ -174,9 +175,9 @@ func TestAccInstance(t *testing.T) { Steps: []resource.TestStep{ // Create and verify { - PreConfig: func() { - testItemID = testutils.ResStr(pfx, "instance", exData.TfName) - }, + //PreConfig: func() { + // // + //}, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", exData, @@ -249,7 +250,7 @@ func TestAccInstanceWithUsers(t *testing.T) { data.Users = []User{ { Name: userName, - ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), Roles: []string{"login"}, }, } @@ -293,7 +294,7 @@ func TestAccInstanceWithDatabases(t *testing.T) { data.Users = []User{ { Name: userName, - ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), Roles: []string{"login"}, }, } @@ -301,7 +302,7 @@ func TestAccInstanceWithDatabases(t *testing.T) { data.Databases = []Database{ { Name: dbName, - ProjectId: os.Getenv("TF_ACC_PROJECT_ID"), + ProjectID: os.Getenv("TF_ACC_PROJECT_ID"), Owner: userName, }, } @@ -996,18 +997,23 @@ func TestAccInstanceWithDatabases(t *testing.T) { func testAccCheckPostgresFlexDestroy(s *terraform.State) error { testutils.Setup() + pID, ok := os.LookupEnv("TF_ACC_PROJECT_ID") + if !ok { + log.Fatalln("unable to read TF_ACC_PROJECT_ID") + } + ctx := context.Background() var client *postgresflexalphaPkgGen.APIClient var err error - var region, projectId string + var region, projectID string region = testutils.Region if region == "" { region = "eu01" } - projectId = testutils.ProjectId - if projectId == "" { + projectID = pID + if projectID == "" { return fmt.Errorf("projectID could not be determined in destroy function") } @@ -1034,11 +1040,11 @@ func testAccCheckPostgresFlexDestroy(s *terraform.State) error { } // instance terraform ID: = "[project_id],[region],[instance_id]" - instanceId := strings.Split(rs.Primary.ID, core.Separator)[2] - instancesToDestroy = append(instancesToDestroy, instanceId) + instanceID := strings.Split(rs.Primary.ID, core.Separator)[2] + instancesToDestroy = append(instancesToDestroy, instanceID) } - instancesResp, err := client.ListInstancesRequest(ctx, projectId, region). + instancesResp, err := client.ListInstancesRequest(ctx, projectID, region). Size(100). Execute() if err != nil { diff --git a/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl b/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl index 260f0b57..d7335cf7 100644 --- a/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl +++ b/stackit/internal/services/postgresflexalpha/testdata/instance_template.gompl @@ -4,11 +4,11 @@ provider "stackitprivatepreview" { } resource "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { - project_id = "{{ .ProjectId }}" + project_id = "{{ .ProjectID }}" name = "{{ .Name }}" backup_schedule = "{{ .BackupSchedule }}" retention_days = {{ .RetentionDays }} - flavor_id = "{{ .FlavorId }}" + flavor_id = "{{ .FlavorID }}" replicas = {{ .Replicas }} storage = { performance_class = "{{ .PerformanceClass }}" @@ -16,14 +16,14 @@ resource "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { } {{ if .UseEncryption }} encryption = { - kek_key_id = {{ .KekKeyId }} - kek_key_ring_id = {{ .KekKeyRingId }} + kek_key_id = {{ .KekKeyID }} + kek_key_ring_id = {{ .KekKeyRingID }} kek_key_version = {{ .KekKeyVersion }} service_account = "{{ .KekServiceAccount }}" } {{ end }} network = { - acl = ["{{ .AclString }}"] + acl = ["{{ .ACLString }}"] access_scope = "{{ .AccessScope }}" } version = {{ .Version }} @@ -33,7 +33,7 @@ resource "stackitprivatepreview_postgresflexalpha_instance" "{{ .TfName }}" { {{ $tfName := .TfName }} {{ range $user := .Users }} resource "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { - project_id = "{{ $user.ProjectId }}" + project_id = "{{ $user.ProjectID }}" instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id name = "{{ $user.Name }}" roles = [{{ range $i, $v := $user.Roles }}{{if $i}},{{end}}"{{$v}}"{{end}}] @@ -45,7 +45,7 @@ resource "stackitprivatepreview_postgresflexalpha_user" "{{ $user.Name }}" { {{ $tfName := .TfName }} {{ range $db := .Databases }} resource "stackitprivatepreview_postgresflexalpha_database" "{{ $db.Name }}" { - project_id = "{{ $db.ProjectId }}" + project_id = "{{ $db.ProjectID }}" instance_id = stackitprivatepreview_postgresflexalpha_instance.{{ $tfName }}.instance_id name = "{{ $db.Name }}" owner = stackitprivatepreview_postgresflexalpha_user.{{ $db.Owner }}.name