Clean up: fix linter/style issues

gridscale/config.go

@@ -21,7 +21,6 @@ var marketplaceAppCategories = []string{"CMS", "project management", "Adminpanel
 var postgreSQLPerformanceClasses = []string{"standard", "high", "insane", "ultra"}
 var filesystemPerformanceClasses = []string{"standard", "high", "insane", "ultra"}
 var msSQLServerPerformanceClasses = []string{"standard", "high", "insane", "ultra"}
-var mariaDBPerformanceClasses = []string{"standard", "high", "insane", "ultra"}
 var machineTypes = []string{"i440fx", "q35_bios", "q35_uefi"}
 var storageDevices = []string{"ide", "sata", "virtio_scsi", "virtio_block"}
 var usbControllers = []string{"nec_xhci", "piix3_uhci"}

gridscale/datasource_gridscale_backup_test.go

@@ -1,7 +1,6 @@
 package gridscale
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -24,12 +23,12 @@ func TestAccdataSourceGridscaleBackup_basic(t *testing.T) {
 }
 
 func testAccCheckDataSourceBackupConfig_basic() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_storage" "foo" {
 	name   = "storage"
 	capacity = 1
 }
 data "gridscale_backup_list" "foo" {
   	storage_uuid = gridscale_storage.foo.id
-}`)
+}`
 }

gridscale/datasource_gridscale_objectstorage_test.go

@@ -1,7 +1,6 @@
 package gridscale
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -29,12 +28,12 @@ func TestAccdataSourceGridscaleObjectStorage_basic(t *testing.T) {
 }
 
 func testAccCheckDataSourceObjectStorageConfig_basic() string {
-	return fmt.Sprint(`
+	return `
 resource "gridscale_object_storage_accesskey" "foo" {
 }
 
 data "gridscale_object_storage_accesskey" "foo" {
 	resource_id   = "${gridscale_object_storage_accesskey.foo.id}"
 }
-`)
+`
 }

gridscale/datasource_gridscale_paas.go

@@ -163,7 +163,7 @@ func dataSourceGridscalePaaSRead(d *schema.ResourceData, meta interface{}) error
 	if err = d.Set("name", props.Name); err != nil {
 		return fmt.Errorf("%s error setting name: %v", errorPrefix, err)
 	}
-	if creds != nil && len(creds) > 0 {
+	if len(creds) > 0 {
 		if err = d.Set("username", creds[0].Username); err != nil {
 			return fmt.Errorf("%s error setting username: %v", errorPrefix, err)
 		}
@@ -222,6 +222,10 @@ func dataSourceGridscalePaaSRead(d *schema.ResourceData, meta interface{}) error
 			return fmt.Errorf("%s error: %v", errorPrefix, err)
 		}
 		valueInString, err := convInterfaceToString(paramValType, value)
+
+		if err != nil {
+			return err
+		}
 		param := map[string]interface{}{
 			"param": k,
 			"value": valueInString,

gridscale/datasource_gridscale_publicnetwork_test.go

@@ -1,7 +1,6 @@
 package gridscale
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -26,7 +25,7 @@ func TestAccdataSourceGridscalePublicNetwork_basic(t *testing.T) {
 }
 
 func testAccCheckDataSourcePublicNetworkConfig_basic() string {
-	return fmt.Sprint(`
+	return `
 data "gridscale_public_network" "foo" {
-}`)
+}`
 }

gridscale/datasource_gridscale_server.go

@@ -372,7 +372,7 @@ func dataSourceGridscaleServerRead(d *schema.ResourceData, meta interface{}) err
 	}
 
 	//Get storages
-	storages := make([]interface{}, 0)
+	/*storages := make([]interface{}, 0)
 	for _, value := range server.Properties.Relations.Storages {
 		storage := map[string]interface{}{
 			"object_uuid":        value.ObjectUUID,
@@ -389,7 +389,7 @@ func dataSourceGridscaleServerRead(d *schema.ResourceData, meta interface{}) err
 			"capacity":           value.Capacity,
 		}
 		storages = append(storages, storage)
-	}
+	}*/
 
 	// Get hardware_profile_config
 	hardwareProfileConfigList := make([]interface{}, 0)

gridscale/resource_gridscale_backup_schedule_test.go

@@ -114,7 +114,7 @@ resource "gridscale_backupschedule" "foo" {
 }
 
 func testAccCheckDataSourceGridscaleBackupScheduleConfig_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_storage" "foo" {
   name   = "storage"
   capacity = 1
@@ -127,11 +127,11 @@ resource "gridscale_backupschedule" "foo" {
   next_runtime = "2030-12-30 15:04:05"
   active = true
 }
-`)
+`
 }
 
 func testAccCheckDataSourceGridscaleBackupScheduleConfig_forcenew_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_storage" "new" {
   name   = "storage"
   capacity = 1
@@ -144,5 +144,5 @@ resource "gridscale_backupschedule" "foo" {
   next_runtime = "2030-12-30 15:04:05"
   active = true
 }
-`)
+`
 }

gridscale/resource_gridscale_bucket_test.go

@@ -1,7 +1,6 @@
 package gridscale
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -32,7 +31,7 @@ func TestAccResourceGridscaleBucket_Basic(t *testing.T) {
 }
 
 func testAccCheckResourceGridscaleBucketConfig_basic() string {
-	return fmt.Sprint(`
+	return `
 resource "gridscale_object_storage_accesskey" "test" {
    timeouts {
       create="10m"
@@ -44,5 +43,5 @@ resource "gridscale_object_storage_bucket" "foo" {
    secret_key = gridscale_object_storage_accesskey.test.secret_key
    bucket_name = "myterraformbucket"
 }
-`)
+`
 }

gridscale/resource_gridscale_filesystem.go

@@ -54,7 +54,7 @@ func resourceGridscaleFilesystem() *schema.Resource {
 					}
 				}
 				if !isReleaseValid {
-					return fmt.Errorf("%v is not a valid Filesystem service release. Valid releases are: %v\n", newReleaseVal, strings.Join(releaseList, ", "))
+					return fmt.Errorf("%v is not a valid Filesystem service release. Valid releases are: %v", newReleaseVal, strings.Join(releaseList, ", "))
 				}
 				return nil
 			}),
@@ -427,7 +427,7 @@ func getFilesystemTemplateUUID(client *gsclient.Client, release, performanceClas
 		}
 	}
 	if !isReleaseValid {
-		return "", fmt.Errorf("%v is not a valid Filesystem service release. Valid releases are: %v\n", release, strings.Join(releases, ", "))
+		return "", fmt.Errorf("%v is not a valid Filesystem service release. Valid releases are: %v", release, strings.Join(releases, ", "))
 	}
 
 	return uTemplate.Properties.ObjectUUID, nil

gridscale/resource_gridscale_filesystem_test.go

@@ -59,7 +59,7 @@ resource "gridscale_filesystem" "test" {
 }
 
 func testAccCheckResourceGridscaleFilesystemConfig_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_filesystem" "test" {
 	name = "newname"
 	root_squash = false
@@ -68,5 +68,5 @@ resource "gridscale_filesystem" "test" {
 	allowed_ip_ranges = ["192.14.15.15"]
 	labels = ["test"]
 }
-`)
+`
 }

gridscale/resource_gridscale_firewall_test.go

@@ -121,7 +121,7 @@ resource "gridscale_firewall" "foo" {
 }
 
 func testAccCheckResourceGridscaleFirewallConfig_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_firewall" "foo" {
   name   = "newname"
   rules_v4_out {
@@ -139,5 +139,5 @@ resource "gridscale_firewall" "foo" {
 	comment = "testv6"
   }
 }
-`)
+`
 }

gridscale/resource_gridscale_ipv4_test.go

@@ -110,11 +110,11 @@ resource "gridscale_ipv4" "foo" {
 }
 
 func testAccCheckResourceGridscaleIpv4Config_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_ipv4" "foo" {
   name   = "newname"
   failover = true
   reverse_dns = "test.test"
 }
-`)
+`
 }

gridscale/resource_gridscale_ipv6_test.go

@@ -110,11 +110,11 @@ resource "gridscale_ipv6" "foo" {
 }
 
 func testAccCheckResourceGridscaleIpv6Config_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_ipv6" "foo" {
   name   = "newname"
   failover = true
   reverse_dns = "test.test"
 }
-`)
+`
 }

gridscale/resource_gridscale_isoimage_test.go

@@ -114,10 +114,10 @@ resource "gridscale_server" "foo" {
 }
 
 func testAccCheckResourceGridscaleISOImageConfig_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_isoimage" "foo" {
   name   = "newname"
   source_url = "http://tinycorelinux.net/10.x/x86/release/TinyCore-current.iso"
 }
-`)
+`
 }

gridscale/resource_gridscale_k8s.go

@@ -39,10 +39,10 @@ func resourceGridscaleK8s() *schema.Resource {
 			newVersionValInf, isVersionSet := d.GetOk("gsk_version")
 			newVersionVal := newVersionValInf.(string)
 			if !isReleaseSet && !isVersionSet {
-				return errors.New("either \"release\" or \"gsk_version\" has to be defined.")
+				return errors.New("either \"release\" or \"gsk_version\" has to be defined")
 			}
 			if isReleaseSet && isVersionSet {
-				return errors.New("\"release\" and \"gsk_version\" cannot be set at the same time. Only one of them is set at a time.")
+				return errors.New("\"release\" and \"gsk_version\" cannot be set at the same time. Only one of them is set at a time")
 			}
 
 			paasTemplates, err := client.GetPaaSTemplateList(ctx)
@@ -78,10 +78,10 @@ func resourceGridscaleK8s() *schema.Resource {
 				}
 			}
 			if !isReleaseValid && isReleaseSet {
-				return fmt.Errorf("%v is an INVALID Kubernetes minor release. Valid releases are: %v\n", newReleaseVal, strings.Join(releaseList, ", "))
+				return fmt.Errorf("%v is an INVALID Kubernetes minor release. Valid releases are: %v", newReleaseVal, strings.Join(releaseList, ", "))
 			}
 			if !isVersionValid && isVersionSet {
-				return fmt.Errorf("%v is an INVALID gridscale Kubernetes (GSK) version. Valid GSK versions are: %v\n", newVersionVal, strings.Join(versionList, ", "))
+				return fmt.Errorf("%v is an INVALID gridscale Kubernetes (GSK) version. Valid GSK versions are: %v", newVersionVal, strings.Join(versionList, ", "))
 			}
 			return validateK8sParameters(d, chosenTemplate)
 		},
@@ -551,7 +551,7 @@ func getK8sTemplateUUIDFromRelease(client *gsclient.Client, release string) (str
 		}
 	}
 	if !isReleaseValid {
-		return "", fmt.Errorf("%v is an INVALID Kubernetes minor release. Valid releases are: %v\n", release, strings.Join(releases, ", "))
+		return "", fmt.Errorf("%v is an INVALID Kubernetes minor release. Valid releases are: %v", release, strings.Join(releases, ", "))
 	}
 
 	return uTemplate.Properties.ObjectUUID, nil
@@ -577,7 +577,7 @@ func getK8sTemplateUUIDFromGSKVersion(client *gsclient.Client, version string) (
 		}
 	}
 	if !isVersionValid {
-		return "", fmt.Errorf("%v is an INVALID gridscale Kubernetes (GSK) version. Valid GSK versions are: %v\n", version, strings.Join(versions, ", "))
+		return "", fmt.Errorf("%v is an INVALID gridscale Kubernetes (GSK) version. Valid GSK versions are: %v", version, strings.Join(versions, ", "))
 	}
 
 	return uTemplate.Properties.ObjectUUID, nil
@@ -671,7 +671,7 @@ func validateK8sParameters(d *schema.ResourceDiff, template gsclient.PaaSTemplat
 			if cluster_cidr.(string) != "" {
 				_, _, err := net.ParseCIDR(cluster_cidr.(string))
 				if err != nil {
-					errorMessages = append(errorMessages, fmt.Sprintf("Invalid value for PaaS template release. Value must be a valid CIDR.\n"))
+					errorMessages = append(errorMessages, "Invalid value for PaaS template release. Value must be a valid CIDR.\n")
 				}
 			}
 			// if cluster_cidr_template is immutable, return error if it is set during k8s creation

gridscale/resource_gridscale_k8s_test.go

@@ -58,7 +58,7 @@ resource "gridscale_k8s" "foopaas" {
 }
 
 func testAccCheckResourceGridscaleK8sConfig_basic_update() string {
-	return fmt.Sprintf(`
+	return `
 resource "gridscale_k8s" "foopaas" {
 	name   = "newname"
 	release = "1.26"
@@ -72,5 +72,5 @@ resource "gridscale_k8s" "foopaas" {
 		rocket_storage = 90
 	}
 }
-`)
+`
 }

gridscale/resource_gridscale_loadbalancer.go

@@ -321,32 +321,34 @@ func expandLoadbalancerForwardingRules(forwardingRules interface{}) []gsclient.F
 func flattenLoadbalancerForwardingRules(forwardingRules []gsclient.ForwardingRule) []interface{} {
 	tempForwardingRules := make([]interface{}, 0)
 
-	if forwardingRules != nil {
-		for _, value := range forwardingRules {
-			forwardingRule := map[string]interface{}{
-				"letsencrypt_ssl":  value.LetsencryptSSL,
-				"certificate_uuid": value.CertificateUUID,
-				"listen_port":      value.ListenPort,
-				"mode":             value.Mode,
-				"target_port":      value.TargetPort,
-			}
-			tempForwardingRules = append(tempForwardingRules, forwardingRule)
+	if forwardingRules == nil {
+		return tempForwardingRules
+	}
+	for _, value := range forwardingRules {
+		forwardingRule := map[string]interface{}{
+			"letsencrypt_ssl":  value.LetsencryptSSL,
+			"certificate_uuid": value.CertificateUUID,
+			"listen_port":      value.ListenPort,
+			"mode":             value.Mode,
+			"target_port":      value.TargetPort,
 		}
+		tempForwardingRules = append(tempForwardingRules, forwardingRule)
 	}
 	return tempForwardingRules
 }
 
 func flattenLoadbalancerBackendServers(backendServers []gsclient.BackendServer) []interface{} {
 	tempBackendServers := make([]interface{}, 0)
-	if backendServers != nil {
-		for _, value := range backendServers {
-			backendServer := map[string]interface{}{
-				"weight":         value.Weight,
-				"host":           value.Host,
-				"proxy_protocol": value.ProxyProtocol,
-			}
-			tempBackendServers = append(tempBackendServers, backendServer)
+	if backendServers == nil {
+		return tempBackendServers
+	}
+	for _, value := range backendServers {
+		backendServer := map[string]interface{}{
+			"weight":         value.Weight,
+			"host":           value.Host,
+			"proxy_protocol": value.ProxyProtocol,
 		}
+		tempBackendServers = append(tempBackendServers, backendServer)
 	}
 	return tempBackendServers
 }

gridscale/resource_gridscale_mariadb.go

@@ -524,7 +524,7 @@ func getMariaDBTemplateUUID(client *gsclient.Client, release, performanceClass s
 		}
 	}
 	if !isReleaseValid {
-		return "", fmt.Errorf("%v is not a valid MariaDB release. Valid releases are: %v\n", release, strings.Join(releases, ", "))
+		return "", fmt.Errorf("%v is not a valid MariaDB release. Valid releases are: %v", release, strings.Join(releases, ", "))
 	}
 
 	return uTemplate.Properties.ObjectUUID, nil