Fix golangci-lint issues

selectel · Nov 25, 2022 · 7506006 · 7506006
1 parent c24cf36
commit 7506006
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 185 deletions.
diff --git a/selectel/dbaas.go b/selectel/dbaas.go
@@ -30,6 +30,13 @@ const (
 	nl1DBaaSV1Endpoint = "https://nl-1.dbaas.selcloud.ru/v1"
 )
 
+const (
+	postgreSQLDatastoreType  = "postgresql"
+	mySQLDatastoreType       = "mysql"
+	mySQLNativeDatastoreType = "mysql_native"
+	redisDatastoreType       = "redis"
+)
+
 func getDBaaSV1Endpoint(region string) (endpoint string) {
 	switch region {
 	case ru1Region:
@@ -425,6 +432,7 @@ func containeDatastoreType(expectedTypes []string, datastoreType string) bool {
 			return true
 		}
 	}
+
 	return false
 }
 
@@ -435,6 +443,7 @@ func buildDatastoreTypeErrorMEssage(expectedDatastoreTypeEngines []string, datas
 	} else {
 		baseMessage = "Provided datastore type must have an engine "
 	}
+
 	return baseMessage + strings.Join(expectedDatastoreTypeEngines, ", ") + " for this resource. But provided type is " + datastoreTypeEngine
 }
 

diff --git a/selectel/import_selectel_dbaas_mysql_datastore_v1_test.go b/selectel/import_selectel_dbaas_mysql_datastore_v1_test.go
@@ -12,7 +12,7 @@ func TestAccDBaaSMySQLDatastoreV1ImportBasic(t *testing.T) {
 	projectName := acctest.RandomWithPrefix("tf-acc")
 	datastoreName := acctest.RandomWithPrefix("tf-acc-ds")
 	nodeCount := 1
-	datastoreTypeEngine := "mysql"
+	datastoreTypeEngine := mySQLDatastoreType
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccSelectelPreCheck(t) },
@@ -37,7 +37,7 @@ func TestAccDBaaSMySQLNativeDatastoreV1ImportBasic(t *testing.T) {
 	projectName := acctest.RandomWithPrefix("tf-acc")
 	datastoreName := acctest.RandomWithPrefix("tf-acc-ds")
 	nodeCount := 1
-	datastoreTypeEngine := "mysql_native"
+	datastoreTypeEngine := mySQLNativeDatastoreType
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccSelectelPreCheck(t) },

diff --git a/selectel/resource_selectel_dbaas_mysql_database_v1_test.go b/selectel/resource_selectel_dbaas_mysql_database_v1_test.go
@@ -20,7 +20,7 @@ func TestAccDBaaSMySQLDatabaseV1Basic(t *testing.T) {
 	datastoreName := acctest.RandomWithPrefix("tf-acc-ds")
 	databaseName := RandomWithPrefix("tf_acc_db")
 	nodeCount := 1
-	datastoreTypeEngine := "mysql"
+	datastoreTypeEngine := mySQLDatastoreType
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccSelectelPreCheck(t) },
@@ -50,7 +50,7 @@ func TestAccDBaaSMySQLNativeDatabaseV1Basic(t *testing.T) {
 	datastoreName := acctest.RandomWithPrefix("tf-acc-ds")
 	databaseName := RandomWithPrefix("tf_acc_db")
 	nodeCount := 1
-	datastoreTypeEngine := "mysql_native"
+	datastoreTypeEngine := mySQLNativeDatastoreType
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccSelectelPreCheck(t) },

diff --git a/selectel/resource_selectel_dbaas_mysql_datastore_v1.go b/selectel/resource_selectel_dbaas_mysql_datastore_v1.go
@@ -181,7 +181,7 @@ func resourceDBaaSMySQLDatastoreV1Create(ctx context.Context, d *schema.Resource
 	}
 
 	typeID := d.Get("type_id").(string)
-	diagErr = validateDatastoreType(ctx, []string{"mysql", "mysql_native"}, typeID, dbaasClient)
+	diagErr = validateDatastoreType(ctx, []string{mySQLDatastoreType, mySQLNativeDatastoreType}, typeID, dbaasClient)
 	if diagErr != nil {
 		return diagErr
 	}

diff --git a/selectel/resource_selectel_dbaas_mysql_datastore_v1_test.go b/selectel/resource_selectel_dbaas_mysql_datastore_v1_test.go
diff --git a/selectel/resource_selectel_dbaas_postgresql_datastore_v1.go b/selectel/resource_selectel_dbaas_postgresql_datastore_v1.go
@@ -205,7 +205,7 @@ func resourceDBaaSPostgreSQLDatastoreV1Create(ctx context.Context, d *schema.Res
 	}
 
 	typeID := d.Get("type_id").(string)
-	diagErr = validateDatastoreType(ctx, []string{"postgresql"}, typeID, dbaasClient)
+	diagErr = validateDatastoreType(ctx, []string{postgreSQLDatastoreType}, typeID, dbaasClient)
 	if diagErr != nil {
 		return diagErr
 	}

diff --git a/selectel/resource_selectel_dbaas_redis_datastore_v1.go b/selectel/resource_selectel_dbaas_redis_datastore_v1.go
@@ -173,7 +173,7 @@ func resourceDBaaSRedisDatastoreV1Create(ctx context.Context, d *schema.Resource
 	flavorID, flavorIDOk := d.GetOk("flavor_id")
 
 	typeID := d.Get("type_id").(string)
-	diagErr = validateDatastoreType(ctx, []string{"redis"}, typeID, dbaasClient)
+	diagErr = validateDatastoreType(ctx, []string{redisDatastoreType}, typeID, dbaasClient)
 	if diagErr != nil {
 		return diagErr
 	}