diff --git a/golang-ci.yaml b/golang-ci.yaml index 43e1330a..42d943f2 100644 --- a/golang-ci.yaml +++ b/golang-ci.yaml @@ -77,13 +77,13 @@ linters: linters: - gochecknoinits paths: - - third_party$ - - builtin$ - - examples$ + - third_party/ + - builtin/ + - examples/ - tools/copy.go - tools/main.go - - pkg_gen$ - - cmd$ + - pkg_gen/ + - cmd/ formatters: enable: - gofmt @@ -95,8 +95,8 @@ formatters: exclusions: generated: lax paths: - - third_party$ - - builtin$ - - examples$ - - pkg_gen$ - - cmd$ + - third_party/ + - builtin/ + - examples/ + - pkg_gen/ + - cmd/ diff --git a/internal/testutils/functions.go b/internal/testutils/functions.go index 0006751a..3e748941 100644 --- a/internal/testutils/functions.go +++ b/internal/testutils/functions.go @@ -88,7 +88,7 @@ func CleanupTemporaryHome(tempHomePath string, t *testing.T) { } func ucFirst(s string) string { - if len(s) == 0 { + if s == "" { return "" } return strings.ToUpper(s[:1]) + s[1:] diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go index 1d51761b..933dab0e 100644 --- a/internal/testutils/testutils.go +++ b/internal/testutils/testutils.go @@ -125,7 +125,7 @@ func GetTestProjectServiceAccountJson(path string) string { // return token //} // -//func readTestTokenFromCredentialsFile(path string) (string, error) { +// func readTestTokenFromCredentialsFile(path string) (string, error) { // if path == "" { // customPath, customPathSet := os.LookupEnv("STACKIT_CREDENTIALS_PATH") // if !customPathSet || customPath == "" { diff --git a/stackit/internal/services/postgresflexalpha/database/resource.go b/stackit/internal/services/postgresflexalpha/database/resource.go index 8de8df92..c42744cd 100644 --- a/stackit/internal/services/postgresflexalpha/database/resource.go +++ b/stackit/internal/services/postgresflexalpha/database/resource.go @@ -390,7 +390,7 @@ func (r *databaseResource) Update( core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)") return } - databaseId := int32(databaseId64) + databaseId := int32(databaseId64) // nolint:gosec // check is performed above ctx = tflog.SetField(ctx, "project_id", projectId) 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)") return } - databaseId := int32(databaseId64) + databaseId := int32(databaseId64) // nolint:gosec // check is performed above ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "instance_id", instanceId) ctx = tflog.SetField(ctx, "region", region) diff --git a/stackit/internal/services/postgresflexalpha/instance/resource.go b/stackit/internal/services/postgresflexalpha/instance/resource.go index 2f9081c0..0b354c64 100644 --- a/stackit/internal/services/postgresflexalpha/instance/resource.go +++ b/stackit/internal/services/postgresflexalpha/instance/resource.go @@ -439,13 +439,13 @@ func (r *instanceResource) Update( // 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") // return //} // projectId := model.ProjectId.ValueString() - //instanceId := model.InstanceId.ValueString() + // instanceId := model.InstanceId.ValueString() projectId := identityData.ProjectID.ValueString() instanceId := identityData.InstanceID.ValueString() region := model.Region.ValueString() diff --git a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go index 001a27fe..7e71a32f 100644 --- a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go @@ -360,7 +360,7 @@ func TestAccInstanceWithDatabases(t *testing.T) { // return httptest.NewServer(mux) //} // -//func TestUnitResourceCreate(t *testing.T) { +// func TestUnitResourceCreate(t *testing.T) { // server := setupMockServer() // defer server.Close() // @@ -449,14 +449,14 @@ func TestAccInstanceWithDatabases(t *testing.T) { //} // //// User resource data -//var userResource = map[string]string{ +// var userResource = map[string]string{ // "username": fmt.Sprintf("tfaccuser%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlpha)), // "role": "createdb", // "project_id": testutils.ProjectId, //} // //// Database resource data -//var databaseResource = map[string]string{ +// var databaseResource = map[string]string{ // "name": fmt.Sprintf("tfaccdb%s", acctest.RandStringFromCharSet(4, acctest.CharSetAlphaNum)), // "project_id": testutils.ProjectId, //} diff --git a/stackit/internal/services/postgresflexalpha/user/datasource.go b/stackit/internal/services/postgresflexalpha/user/datasource.go index f02838a0..0bb991df 100644 --- a/stackit/internal/services/postgresflexalpha/user/datasource.go +++ b/stackit/internal/services/postgresflexalpha/user/datasource.go @@ -108,7 +108,7 @@ func (r *userDataSource) Read( core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)") return } - userId := int32(userId64) + userId := int32(userId64) // nolint:gosec // check is performed above region := r.providerData.GetRegionWithOverride(model.Region) ctx = tflog.SetField(ctx, "project_id", projectId) diff --git a/stackit/internal/services/postgresflexalpha/user/resource.go b/stackit/internal/services/postgresflexalpha/user/resource.go index a904ea7f..6c7e3979 100644 --- a/stackit/internal/services/postgresflexalpha/user/resource.go +++ b/stackit/internal/services/postgresflexalpha/user/resource.go @@ -406,7 +406,7 @@ func (r *userResource) Update( core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (userId)") return } - userId := int32(userId64) + userId := int32(userId64) // nolint:gosec // check is performed above // Update existing instance 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)") return } - userId := int32(userId64) + userId := int32(userId64) // nolint:gosec // check is performed above // Delete existing record set err := r.client.DeleteUserRequest(ctx, arg.projectId, arg.region, arg.instanceId, userId).Execute() @@ -530,11 +530,11 @@ func (r *userResource) Delete( // TODO: Verify deletion // 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)) // return //} - //if exists { + // if exists { // core.LogAndAddError( // ctx, &resp.Diagnostics, "Error deleting user", // fmt.Sprintf("User ID '%v' resource still exists after deletion", model.UserId.ValueInt64()), diff --git a/stackit/internal/services/sqlserverflexalpha/instance/datasource.go b/stackit/internal/services/sqlserverflexalpha/instance/datasource.go index ea9d9064..70c382df 100644 --- a/stackit/internal/services/sqlserverflexalpha/instance/datasource.go +++ b/stackit/internal/services/sqlserverflexalpha/instance/datasource.go @@ -126,7 +126,7 @@ func (r *instanceDataSource) Read( ctx = core.LogResponse(ctx) // 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{}) // resp.Diagnostics.Append(diags...) // 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() { // diags = model.Encryption.As(ctx, encryption, basetypes.ObjectAsOptions{}) // resp.Diagnostics.Append(diags...) diff --git a/stackit/internal/services/sqlserverflexalpha/instance/functions.go b/stackit/internal/services/sqlserverflexalpha/instance/functions.go index 629c43ea..4c091eff 100644 --- a/stackit/internal/services/sqlserverflexalpha/instance/functions.go +++ b/stackit/internal/services/sqlserverflexalpha/instance/functions.go @@ -191,7 +191,7 @@ func toUpdatePayload( if m.Replicas.ValueInt64() > math.MaxUint32 { 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 diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false) diff --git a/stackit/internal/services/sqlserverflexbeta/instance/functions.go b/stackit/internal/services/sqlserverflexbeta/instance/functions.go index 6dc96ede..de2dd9d6 100644 --- a/stackit/internal/services/sqlserverflexbeta/instance/functions.go +++ b/stackit/internal/services/sqlserverflexbeta/instance/functions.go @@ -263,7 +263,7 @@ func toUpdatePayload( if m.Replicas.ValueInt64() > math.MaxUint32 { 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 diags := m.Network.Acl.ElementsAs(ctx, &netAcl, false) diff --git a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go index 84083882..e3fd5473 100644 --- a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go +++ b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go @@ -286,19 +286,19 @@ func TestAccInstanceNoEncryption(t *testing.T) { resource.TestCheckNoResourceAttr(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_version"), + // 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_ring_id"), //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.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.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.size"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), // check instance values are correct 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), "roles"), - //func(s *terraform.State) error { + // func(s *terraform.State) error { // return nil - //}, + // }, // check user values are correct 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), "encryption"), - //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_id"), + // 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.service_account"), // 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.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.size"), + // resource.TestCheckResourceAttrSet(resName("instance", data.TfName), "storage.size"), // check instance values are correct 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), "username"), - //func(s *terraform.State) error { + // func(s *terraform.State) error { // return nil - //}, + // }, // check user values are correct resource.TestCheckResourceAttr(resName("user", userName), "username", userName),