golangci-lint config added

some fix after running linters
some fix in test, skipping k8s's tests in short mode

.golangci.yml

@@ -0,0 +1,41 @@
+run:
+  timeout: 60m
+  go: 1.17
+
+issues:
+  exclude-rules:
+    - linters:
+        - gosimple
+      text: "S1034"
+
+  max-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  disable-all: true
+  enable:
+    - asciicheck
+    - deadcode
+    - errcheck
+    - gocritic
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - nakedret
+    - misspell
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - unconvert
+    - unparam
+    - varcheck
+    - vet
+    - vetshadow
+
+linters-settings:
+  errcheck:
+    ignore: github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,fmt:.*,io:Close,io:WriteString
+  nakedret:
+    max-func-lines: 40

GNUmakefile

@@ -41,6 +41,9 @@ doc-generate:
 fmt:
 	gofmt -w $(GOFMT_FILES)
 
+linters:
+	golangci-lint run ./...
+
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 

docs/data-sources/gcore_k8s.md

@@ -47,6 +47,7 @@ data "gcore_k8s" "v" {
 - `container_version` (String)
 - `created_at` (String)
 - `discovery_url` (String)
+- `external_dns_enabled` (Boolean)
 - `faults` (Map of String)
 - `fixed_network` (String)
 - `fixed_subnet` (String)

gcore/data_source_gcore_k8s.go

@@ -68,10 +68,10 @@ func dataSourceK8s() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			//"external_dns_enabled": &schema.Schema{
-			//	Type:     schema.TypeBool,
-			//	Computed: true,
-			//},
+			"external_dns_enabled": &schema.Schema{
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"master_lb_floating_ip_enabled": &schema.Schema{
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -233,7 +233,7 @@ func dataSourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{
 	d.Set("node_count", cluster.NodeCount)
 	d.Set("status", cluster.Status)
 	d.Set("status_reason", cluster.StatusReason)
-	//d.Set("external_dns_enabled", cluster.ExternalDNSEnabled)
+	d.Set("external_dns_enabled", cluster.ExternalDNSEnabled)
 
 	masterAddresses := make([]string, len(cluster.MasterAddresses))
 	for i, addr := range cluster.MasterAddresses {

gcore/data_source_gcore_k8s_pool_test.go

@@ -19,6 +19,9 @@ import (
 )
 
 func TestAccK8sPoolDataSource(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode")
+	}
 	cfg, err := createTestConfig()
 	if err != nil {
 		t.Fatal(err)

gcore/data_source_gcore_k8s_test.go

@@ -26,7 +26,7 @@ import (
 
 const (
 	testClusterName      = "test-cluster"
-	testClusterVersion   = "1.20.6"
+	testClusterVersion   = "1.20.15"
 	testClusterPoolName  = "test-pool"
 	testPoolFlavor       = "g1-standard-1-2"
 	testNodeCount        = 1
@@ -39,6 +39,9 @@ const (
 )
 
 func TestAccK8sDataSource(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode")
+	}
 	fullName := "data.gcore_k8s.acctest"
 
 	cfg, err := createTestConfig()

gcore/data_source_gcore_network.go

@@ -93,11 +93,11 @@ func dataSourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
-	//todo refactor, also refactor inner func
+	// todo refactor, also refactor inner func
 	var rawNetwork map[string]interface{}
 	network, found := findNetworkByName(name, nets)
 	if !found {
-		//trying to find among shared networks
+		// trying to find among shared networks
 		nets, err := availablenetworks.ListAll(clientShared, nil)
 		if err != nil {
 			return diag.FromErr(err)

gcore/data_source_gcore_reservedfixedip.go

@@ -134,7 +134,7 @@ func dataSourceReservedFixedIPRead(ctx context.Context, d *schema.ResourceData,
 		return diag.Errorf("reserved fixed ip %s not found", ipAddr)
 	}
 
-	//should we use PortID as id?
+	// should we use PortID as id?
 	d.SetId(reservedFixedIP.PortID)
 	d.Set("project_id", reservedFixedIP.ProjectID)
 	d.Set("region_id", reservedFixedIP.RegionID)

gcore/data_source_gcore_storage_s3.go

@@ -1,10 +1,11 @@
 package gcore
 
 import (
+	"regexp"
+
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"regexp"
 )
 
 func dataSourceStorageS3() *schema.Resource {

gcore/data_source_gcore_storage_sftp.go

@@ -1,10 +1,11 @@
 package gcore
 
 import (
+	"regexp"
+
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"regexp"
 )
 
 func dataSourceStorageSFTP() *schema.Resource {

gcore/data_source_gcore_storage_sftp_key.go

@@ -1,10 +1,11 @@
 package gcore
 
 import (
+	"regexp"
+
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"regexp"
 )
 
 func dataSourceStorageSFTPKey() *schema.Resource {

gcore/provider_test.go

@@ -121,6 +121,7 @@ func TestProvider(t *testing.T) {
 	}
 }
 
+// nolint: deadcode,unused
 func testAccPreCheck(t *testing.T) {
 	vars := map[string]interface{}{
 		"GCORE_USERNAME": GCORE_USERNAME,
@@ -135,6 +136,7 @@ func testAccPreCheck(t *testing.T) {
 	checkNameAndID("REGION", t)
 }
 
+// nolint: unused
 func checkNameAndID(resourceType string, t *testing.T) {
 	// resourceType is a word in capital letters
 	keyID := fmt.Sprintf("TEST_%s_ID", resourceType)
@@ -149,14 +151,17 @@ func checkNameAndID(resourceType string, t *testing.T) {
 	}
 }
 
+// nolint: deadcode,unused
 func regionInfo() string {
 	return objectInfo("REGION")
 }
 
+// nolint: deadcode,unused
 func projectInfo() string {
 	return objectInfo("PROJECT")
 }
 
+// nolint: unused
 func objectInfo(resourceType string) string {
 	// resourceType is a word in capital letters
 	keyID := fmt.Sprintf("TEST_%s_ID", resourceType)

gcore/resource_gcore_baremetal.go

@@ -160,7 +160,7 @@ func resourceBmInstance() *schema.Resource {
 							Description: "required if type is  'reserved_fixed_ip'",
 							Optional:    true,
 						},
-						//nested map is not supported, in this case, you do not need to use the list for the map
+						// nested map is not supported, in this case, you do not need to use the list for the map
 						"fip_source": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -280,7 +280,7 @@ func resourceBmInstanceCreate(ctx context.Context, d *schema.ResourceData, m int
 	}
 
 	ifs := d.Get("interface").([]interface{})
-	//sort interfaces by 'is_parent' at first and by 'order' key to attach it in right order
+	// sort interfaces by 'is_parent' at first and by 'order' key to attach it in right order
 	sort.Sort(instanceInterfaces(ifs))
 	newInterface := make([]bminstances.InterfaceOpts, len(ifs))
 	for i, iface := range ifs {
@@ -335,10 +335,7 @@ func resourceBmInstanceCreate(ctx context.Context, d *schema.ResourceData, m int
 			opts.Metadata = &md
 		}
 	} else if metadataRaw, ok := d.GetOk("metadata_map"); ok {
-		md, err := extractMetadataMap(metadataRaw.(map[string]interface{}))
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		md := extractMetadataMap(metadataRaw.(map[string]interface{}))
 		opts.Metadata = &md
 	}
 
@@ -422,7 +419,7 @@ func resourceBmInstanceRead(ctx context.Context, d *schema.ResourceData, m inter
 		for _, assignment := range iface.IPAssignments {
 			subnetID := assignment.SubnetID
 
-			//bad idea, but what to do
+			// bad idea, but what to do
 			var iOpts OrderedInterfaceOpts
 			var orderedIOpts OrderedInterfaceOpts
 			var ok bool
@@ -460,7 +457,7 @@ func resourceBmInstanceRead(ctx context.Context, d *schema.ResourceData, m inter
 			for _, assignment := range iface1.IPAssignments {
 				subnetID := assignment.SubnetID
 
-				//bad idea, but what to do
+				// bad idea, but what to do
 				var iOpts OrderedInterfaceOpts
 				var orderedIOpts OrderedInterfaceOpts
 				var ok bool

gcore/resource_gcore_baremetal_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func TestAccBaremetal(t *testing.T) {
-	if os.Getenv("LOCAL_TEST") != "" {
+	if os.Getenv("LOCAL_TEST") == "" {
 		t.Skip("skip test in ci")
 	}
 

gcore/resource_gcore_instance.go

@@ -114,8 +114,7 @@ func resourceInstance() *schema.Resource {
 							Description: "Currently available only 'existing-volume' value",
 							ValidateDiagFunc: func(val interface{}, key cty.Path) diag.Diagnostics {
 								v := val.(string)
-								switch types.VolumeSource(v) {
-								case types.ExistingVolume:
+								if types.VolumeSource(v) == types.ExistingVolume {
 									return diag.Diagnostics{}
 								}
 								return diag.Errorf("wrong source type %s, now available values is '%s'", v, types.ExistingVolume)
@@ -187,7 +186,7 @@ func resourceInstance() *schema.Resource {
 							Optional:    true,
 							Computed:    true,
 						},
-						//nested map is not supported, in this case, you do not need to use the list for the map
+						// nested map is not supported, in this case, you do not need to use the list for the map
 						"fip_source": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -397,7 +396,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	ifs := d.Get("interface").([]interface{})
-	//sort interfaces by 'order' key to attach it in right order
+	// sort interfaces by 'order' key to attach it in right order
 	sort.Sort(instanceInterfaces(ifs))
 	if len(ifs) > 0 {
 		ifaces, err := extractInstanceInterfacesMap(ifs)
@@ -425,10 +424,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 			createOpts.Metadata = &md
 		}
 	} else if metadataRaw, ok := d.GetOk("metadata_map"); ok {
-		md, err := extractMetadataMap(metadataRaw.(map[string]interface{}))
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		md := extractMetadataMap(metadataRaw.(map[string]interface{}))
 		createOpts.Metadata = &md
 	}
 
@@ -503,20 +499,16 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 	flavor["vcpus"] = strconv.Itoa(instance.Flavor.VCPUS)
 	d.Set("flavor", flavor)
 
-	currentVolumes, err := extractVolumesIntoMap(d.Get("volume").(*schema.Set).List())
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	currentVolumes := extractVolumesIntoMap(d.Get("volume").(*schema.Set).List())
 
 	extVolumes := make([]interface{}, 0)
 	for _, vol := range instance.Volumes {
 		v, ok := currentVolumes[vol.ID]
-		//todo fix it
+		// todo fix it
 		if !ok {
 			v = make(map[string]interface{})
 			v["volume_id"] = vol.ID
 			v["source"] = types.ExistingVolume.String()
-			//return diag.Errorf("cant find volume %s in state", vol.ID)
 		}
 
 		v["id"] = vol.ID
@@ -547,7 +539,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
 		for _, assignment := range iface.IPAssignments {
 			subnetID := assignment.SubnetID
 
-			//bad idea, but what to do
+			// bad idea, but what to do
 			var iOpts instances.InterfaceOpts
 			var orderedIOpts OrderedInterfaceOpts
 			var ok bool
@@ -847,19 +839,13 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		}
 
 		oldVolumesRaw, newVolumesRaw := d.GetChange("volume")
-		oldVolumes, err := extractInstanceVolumesMap(oldVolumesRaw.(*schema.Set).List())
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		newVolumes, err := extractInstanceVolumesMap(newVolumesRaw.(*schema.Set).List())
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		oldVolumes := extractInstanceVolumesMap(oldVolumesRaw.(*schema.Set).List())
+		newVolumes := extractInstanceVolumesMap(newVolumesRaw.(*schema.Set).List())
 
 		vOpts := volumes.InstanceOperationOpts{InstanceID: d.Id()}
 		for vid := range oldVolumes {
 			if isAttached := newVolumes[vid]; isAttached {
-				//mark as already attached
+				// mark as already attached
 				newVolumes[vid] = false
 				continue
 			}
@@ -868,7 +854,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 			}
 		}
 
-		//range over not attached volumes
+		// range over not attached volumes
 		for vid, ok := range newVolumes {
 			if ok {
 				if _, err := volumes.Attach(vClient, vid, vOpts).Extract(); err != nil {

gcore/resource_gcore_k8s_pool_test.go

@@ -21,6 +21,10 @@ import (
 )
 
 func TestAccK8sPool(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode")
+	}
+
 	cfg, err := createTestConfig()
 	if err != nil {
 		t.Fatal(err)

gcore/resource_gcore_k8s_test.go

@@ -19,6 +19,10 @@ import (
 )
 
 func TestAccK8s(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode")
+	}
+
 	cfg, err := createTestConfig()
 	if err != nil {
 		t.Fatal(err)