Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit be203d0

Browse files
author
[Partner] Alexander Sokolov
committed
golangci-lint config added
some fix after running linters some fix in test, skipping k8s's tests in short mode
1 parent 1724f2c commit be203d0

27 files changed

+126
-102
lines changed

.golangci.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
run:
2+
timeout: 60m
3+
go: 1.17
4+
5+
issues:
6+
exclude-rules:
7+
- linters:
8+
- gosimple
9+
text: "S1034"
10+
11+
max-per-linter: 0
12+
max-same-issues: 0
13+
14+
linters:
15+
disable-all: true
16+
enable:
17+
- asciicheck
18+
- deadcode
19+
- errcheck
20+
- gocritic
21+
- goimports
22+
- gosimple
23+
- govet
24+
- ineffassign
25+
- nakedret
26+
- misspell
27+
- staticcheck
28+
- structcheck
29+
- typecheck
30+
- unused
31+
- unconvert
32+
- unparam
33+
- varcheck
34+
- vet
35+
- vetshadow
36+
37+
linters-settings:
38+
errcheck:
39+
ignore: github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,fmt:.*,io:Close,io:WriteString
40+
nakedret:
41+
max-func-lines: 40

GNUmakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ doc-generate:
4141
fmt:
4242
gofmt -w $(GOFMT_FILES)
4343

44+
linters:
45+
golangci-lint run ./...
46+
4447
fmtcheck:
4548
@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
4649

docs/data-sources/gcore_k8s.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ data "gcore_k8s" "v" {
4747
- `container_version` (String)
4848
- `created_at` (String)
4949
- `discovery_url` (String)
50+
- `external_dns_enabled` (Boolean)
5051
- `faults` (Map of String)
5152
- `fixed_network` (String)
5253
- `fixed_subnet` (String)

gcore/data_source_gcore_k8s.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ func dataSourceK8s() *schema.Resource {
6868
Type: schema.TypeBool,
6969
Computed: true,
7070
},
71-
//"external_dns_enabled": &schema.Schema{
72-
// Type: schema.TypeBool,
73-
// Computed: true,
74-
//},
71+
"external_dns_enabled": &schema.Schema{
72+
Type: schema.TypeBool,
73+
Computed: true,
74+
},
7575
"master_lb_floating_ip_enabled": &schema.Schema{
7676
Type: schema.TypeBool,
7777
Computed: true,
@@ -233,7 +233,7 @@ func dataSourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{
233233
d.Set("node_count", cluster.NodeCount)
234234
d.Set("status", cluster.Status)
235235
d.Set("status_reason", cluster.StatusReason)
236-
//d.Set("external_dns_enabled", cluster.ExternalDNSEnabled)
236+
d.Set("external_dns_enabled", cluster.ExternalDNSEnabled)
237237

238238
masterAddresses := make([]string, len(cluster.MasterAddresses))
239239
for i, addr := range cluster.MasterAddresses {

gcore/data_source_gcore_k8s_pool_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ import (
1919
)
2020

2121
func TestAccK8sPoolDataSource(t *testing.T) {
22+
if testing.Short() {
23+
t.Skip("skipping test in short mode")
24+
}
2225
cfg, err := createTestConfig()
2326
if err != nil {
2427
t.Fatal(err)

gcore/data_source_gcore_k8s_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
const (
2828
testClusterName = "test-cluster"
29-
testClusterVersion = "1.20.6"
29+
testClusterVersion = "1.20.15"
3030
testClusterPoolName = "test-pool"
3131
testPoolFlavor = "g1-standard-1-2"
3232
testNodeCount = 1
@@ -39,6 +39,9 @@ const (
3939
)
4040

4141
func TestAccK8sDataSource(t *testing.T) {
42+
if testing.Short() {
43+
t.Skip("skipping test in short mode")
44+
}
4245
fullName := "data.gcore_k8s.acctest"
4346

4447
cfg, err := createTestConfig()

gcore/data_source_gcore_network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ func dataSourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interf
9393
return diag.FromErr(err)
9494
}
9595

96-
//todo refactor, also refactor inner func
96+
// todo refactor, also refactor inner func
9797
var rawNetwork map[string]interface{}
9898
network, found := findNetworkByName(name, nets)
9999
if !found {
100-
//trying to find among shared networks
100+
// trying to find among shared networks
101101
nets, err := availablenetworks.ListAll(clientShared, nil)
102102
if err != nil {
103103
return diag.FromErr(err)

gcore/data_source_gcore_reservedfixedip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func dataSourceReservedFixedIPRead(ctx context.Context, d *schema.ResourceData,
134134
return diag.Errorf("reserved fixed ip %s not found", ipAddr)
135135
}
136136

137-
//should we use PortID as id?
137+
// should we use PortID as id?
138138
d.SetId(reservedFixedIP.PortID)
139139
d.Set("project_id", reservedFixedIP.ProjectID)
140140
d.Set("region_id", reservedFixedIP.RegionID)

gcore/data_source_gcore_storage_s3.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package gcore
22

33
import (
4+
"regexp"
5+
46
"github.com/hashicorp/go-cty/cty"
57
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
68
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7-
"regexp"
89
)
910

1011
func dataSourceStorageS3() *schema.Resource {

gcore/data_source_gcore_storage_sftp.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package gcore
22

33
import (
4+
"regexp"
5+
46
"github.com/hashicorp/go-cty/cty"
57
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
68
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7-
"regexp"
89
)
910

1011
func dataSourceStorageSFTP() *schema.Resource {

0 commit comments

Comments
 (0)