stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: fix more lintings
Some checks failed
CI Workflow / Check GoReleaser config (pull_request) Successful in 5s
Details
CI Workflow / CI (pull_request) Failing after 11m17s
Details
CI Workflow / Code coverage report (pull_request) Has been skipped
Details
CI Workflow / Test readiness for publishing provider (pull_request) Successful in 23m54s
Details

Browse source
This commit is contained in:
Marcel_Henselin 2026-02-13 13:22:09 +01:00
parent 944b872db7
commit 20593da30b
12 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
golang-ci.yaml
View file

@ -77,13 +77,13 @@ linters:
linters: linters:
- gochecknoinits - gochecknoinits
paths: paths:
- third_party$ - third_party/
- builtin$ - builtin/
- examples$ - examples/
- tools/copy.go - tools/copy.go
- tools/main.go - tools/main.go
- pkg_gen$ - pkg_gen/
- cmd$ - cmd/
formatters: formatters:
enable: enable:
- gofmt - gofmt
@ -95,8 +95,8 @@ formatters:
exclusions: exclusions:
generated: lax generated: lax
paths: paths:
- third_party$ - third_party/
- builtin$ - builtin/
- examples$ - examples/
- pkg_gen$ - pkg_gen/
- cmd$ - cmd/

2
internal/testutils/functions.go
View file

@ -88,7 +88,7 @@ func CleanupTemporaryHome(tempHomePath string, t *testing.T) {
} }
func ucFirst(s string) string { func ucFirst(s string) string {
if len(s) == 0 { if s == "" {
return "" return ""
} }
return strings.ToUpper(s[:1]) + s[1:] return strings.ToUpper(s[:1]) + s[1:]

2
internal/testutils/testutils.go
View file

@ -125,7 +125,7 @@ func GetTestProjectServiceAccountJson(path string) string {
// return token // return token
//} //}
// //
//func readTestTokenFromCredentialsFile(path string) (string, error) { // func readTestTokenFromCredentialsFile(path string) (string, error) {
// if path == "" { // if path == "" {
// customPath, customPathSet := os.LookupEnv("STACKIT_CREDENTIALS_PATH") // customPath, customPathSet := os.LookupEnv("STACKIT_CREDENTIALS_PATH")
// if !customPathSet || customPath == "" { // if !customPathSet || customPath == "" {

4
stackit/internal/services/postgresflexalpha/database/resource.go
View file

@ -390,7 +390,7 @@ func (r *databaseResource) Update(
core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)") core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)")
return return
} }
databaseId := int32(databaseId64) databaseId := int32(databaseId64) // nolint:gosec // check is performed above
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "instance_id", instanceId)
@ -516,7 +516,7 @@ func (r *databaseResource) Delete(
core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)") core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)")
return return
} }
databaseId := int32(databaseId64) databaseId := int32(databaseId64) // nolint:gosec // check is performed above
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "instance_id", instanceId)
ctx = tflog.SetField(ctx, "region", region) ctx = tflog.SetField(ctx, "region", region)

4
stackit/internal/services/postgresflexalpha/instance/resource.go
View file

@ -439,13 +439,13 @@ func (r *instanceResource) Update(
// return // return
//} //}
// //
//if model.ProjectId.IsNull() || model.ProjectId.IsUnknown() { // if model.ProjectId.IsNull() || model.ProjectId.IsUnknown() {
// core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance", "projectId is null or unknown") // core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance", "projectId is null or unknown")
// return // return
//} //}
// projectId := model.ProjectId.ValueString() // projectId := model.ProjectId.ValueString()
//instanceId := model.InstanceId.ValueString() // instanceId := model.InstanceId.ValueString()
projectId := identityData.ProjectID.ValueString() projectId := identityData.ProjectID.ValueString()
instanceId := identityData.InstanceID.ValueString() instanceId := identityData.InstanceID.ValueString()
region := model.Region.ValueString() region := model.Region.ValueString()

6
stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go
View file

@ -360,7 +360,7 @@ func TestAccInstanceWithDatabases(t *testing.T) {
// return httptest.NewServer(mux) // return httptest.NewServer(mux)
//} //}
// //
//func TestUnitResourceCreate(t *testing.T) { // func TestUnitResourceCreate(t *testing.T) {
// server := setupMockServer() // server := setupMockServer()
// defer server.Close() // defer server.Close()
// //
@ -449,14 +449,14 @@ func TestAccInstanceWithDatabases(t *testing.T) {
//} //}
// //
//// User resource data //// User resource data
//var userResource = map[string]string{ // var userResource = map[string]string{
// "username": fmt.Sprintf("tfaccuser%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlpha)), // "username": fmt.Sprintf("tfaccuser%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlpha)),
// "role": "createdb", // "role": "createdb",
// "project_id": testutils.ProjectId, // "project_id": testutils.ProjectId,
//} //}
// //
//// Database resource data //// Database resource data
//var databaseResource = map[string]string{ // var databaseResource = map[string]string{
// "name": fmt.Sprintf("tfaccdb%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlphaNum)), // "name": fmt.Sprintf("tfaccdb%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlphaNum)),
// "project_id": testutils.ProjectId, // "project_id": testutils.ProjectId,
//} //}

2
stackit/internal/services/postgresflexalpha/user/datasource.go
View file

@ -108,7 +108,7 @@ func (r *userDataSource) Read(
core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)") core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)")
return return
} }
userId := int32(userId64) userId := int32(userId64) // nolint:gosec // check is performed above
region := r.providerData.GetRegionWithOverride(model.Region) region := r.providerData.GetRegionWithOverride(model.Region)
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)

8
stackit/internal/services/postgresflexalpha/user/resource.go
View file

@ -406,7 +406,7 @@ func (r *userResource) Update(
core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)") core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)")
return return
} }
userId := int32(userId64) userId := int32(userId64) // nolint:gosec // check is performed above
// Update existing instance // Update existing instance
err = r.client.UpdateUserRequest( err = r.client.UpdateUserRequest(
@ -518,7 +518,7 @@ func (r *userResource) Delete(
core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)") core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)")
return return
} }
userId := int32(userId64) userId := int32(userId64) // nolint:gosec // check is performed above
// Delete existing record set // Delete existing record set
err := r.client.DeleteUserRequest(ctx, arg.projectId, arg.region, arg.instanceId, userId).Execute() err := r.client.DeleteUserRequest(ctx, arg.projectId, arg.region, arg.instanceId, userId).Execute()
@ -530,11 +530,11 @@ func (r *userResource) Delete(
// TODO: Verify deletion // TODO: Verify deletion
// exists, err := r.getUserResource(ctx, &model, arg) // exists, err := r.getUserResource(ctx, &model, arg)
//if err != nil { // if err != nil {
// core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting user", fmt.Sprintf("Calling API: %v", err)) // core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting user", fmt.Sprintf("Calling API: %v", err))
// return // return
//} //}
//if exists { // if exists {
// core.LogAndAddError( // core.LogAndAddError(
// ctx, &resp.Diagnostics, "Error deleting user", // ctx, &resp.Diagnostics, "Error deleting user",
// fmt.Sprintf("User ID '%v' resource still exists after deletion", model.UserId.ValueInt64()), // fmt.Sprintf("User ID '%v' resource still exists after deletion", model.UserId.ValueInt64()),

4
stackit/internal/services/sqlserverflexalpha/instance/datasource.go
View file

@ -126,7 +126,7 @@ func (r *instanceDataSource) Read(
ctx = core.LogResponse(ctx) ctx = core.LogResponse(ctx)
// var storage = &storageModel{} // var storage = &storageModel{}
//if !model.Storage.IsNull() && !model.Storage.IsUnknown() { // if !model.Storage.IsNull() && !model.Storage.IsUnknown() {
// diags = model.Storage.As(ctx, storage, basetypes.ObjectAsOptions{}) // diags = model.Storage.As(ctx, storage, basetypes.ObjectAsOptions{})
// resp.Diagnostics.Append(diags...) // resp.Diagnostics.Append(diags...)
// if resp.Diagnostics.HasError() { // if resp.Diagnostics.HasError() {
@ -134,7 +134,7 @@ func (r *instanceDataSource) Read(
// } // }
//} //}
// //
//var encryption = &encryptionModel{} // var encryption = &encryptionModel{}
//if !model.Encryption.IsNull() && !model.Encryption.IsUnknown() { //if !model.Encryption.IsNull() && !model.Encryption.IsUnknown() {
// diags = model.Encryption.As(ctx, encryption, basetypes.ObjectAsOptions{}) // diags = model.Encryption.As(ctx, encryption, basetypes.ObjectAsOptions{})
// resp.Diagnostics.Append(diags...) // resp.Diagnostics.Append(diags...)

2
stackit/internal/services/sqlserverflexalpha/instance/functions.go
View file

@ -191,7 +191,7 @@ func toUpdatePayload(
if m.Replicas.ValueInt64() > math.MaxUint32 { if m.Replicas.ValueInt64() > math.MaxUint32 {
return nil, fmt.Errorf("replicas value is too big for uint32") return nil, fmt.Errorf("replicas value is too big for uint32")
} }
replVal := sqlserverflex.Replicas(uint32(m.Replicas.ValueInt64())) replVal := sqlserverflex.Replicas(uint32(m.Replicas.ValueInt64())) // nolint:gosec // check is performed above
var netAcl []string var netAcl []string
diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false) diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false)

2
stackit/internal/services/sqlserverflexbeta/instance/functions.go
View file

@ -263,7 +263,7 @@ func toUpdatePayload(
if m.Replicas.ValueInt64() > math.MaxUint32 { if m.Replicas.ValueInt64() > math.MaxUint32 {
return nil, fmt.Errorf("replicas value is too big for uint32") return nil, fmt.Errorf("replicas value is too big for uint32")
} }
replVal := sqlserverflexbeta.Replicas(uint32(m.Replicas.ValueInt64())) replVal := sqlserverflexbeta.Replicas(uint32(m.Replicas.ValueInt64())) // nolint:gosec // check is performed above
var netAcl []string var netAcl []string
diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false) diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false)

28
stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go
View file

@ -286,19 +286,19 @@ func TestAccInstanceNoEncryption(t *testing.T) {
resource.TestCheckNoResourceAttr(resName("instance", data.TfName), "encryption"), resource.TestCheckNoResourceAttr(resName("instance", data.TfName), "encryption"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"), //resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"), //resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"),
// check instance values are correct // check instance values are correct
resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name), resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name),
@ -308,9 +308,9 @@ func TestAccInstanceNoEncryption(t *testing.T) {
resource.TestCheckResourceAttrSet(resName("user", userName), "username"), resource.TestCheckResourceAttrSet(resName("user", userName), "username"),
// resource.TestCheckResourceAttrSet(resName("user", userName), "roles"), // resource.TestCheckResourceAttrSet(resName("user", userName), "roles"),
//func(s *terraform.State) error { // func(s *terraform.State) error {
// return nil // return nil
//}, // },
// check user values are correct // check user values are correct
resource.TestCheckResourceAttr(resName("user", userName), "username", userName), resource.TestCheckResourceAttr(resName("user", userName), "username", userName),
@ -387,19 +387,19 @@ func TestAccInstanceEncryption(t *testing.T) {
resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "version"), resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "version"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_id"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_version"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"), //resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.kek_key_ring_id"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"), //resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "encryption.service_account"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.access_scope"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.acl"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.instance_address"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "network.router_address"),
// resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.class"),
//resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"),
// check instance values are correct // check instance values are correct
resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name), resource.TestCheckResourceAttr(resName("instance", data.TfName), "name", data.Name),
@ -408,9 +408,9 @@ func TestAccInstanceEncryption(t *testing.T) {
resource.TestCheckResourceAttrSet(resName("user", userName), "id"), resource.TestCheckResourceAttrSet(resName("user", userName), "id"),
resource.TestCheckResourceAttrSet(resName("user", userName), "username"), resource.TestCheckResourceAttrSet(resName("user", userName), "username"),
//func(s *terraform.State) error { // func(s *terraform.State) error {
// return nil // return nil
//}, // },
// check user values are correct // check user values are correct
resource.TestCheckResourceAttr(resName("user", userName), "username", userName), resource.TestCheckResourceAttr(resName("user", userName), "username", userName),