Skip to content

Commit 1412a76

Browse files
dombiszadombisza
authored
chore: upgrade golangci-lint@v2.12.2 and add constants for repeated tf resource names (#149)
1 parent 43ba3b2 commit 1412a76

8 files changed

Lines changed: 75 additions & 49 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
env:
1313
# Common versions
1414
GO_VERSION: "1.24.1"
15-
GOLANGCI_VERSION: "v2.3.1"
15+
GOLANGCI_VERSION: "v2.12.2"
1616
DOCKER_BUILDX_VERSION: "v0.28.0"
1717

1818
# Common users. We can't run a step 'if secrets.XXX != ""' but we can run a

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ NPROCS ?= 1
4545
GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
4646

4747
GO_REQUIRED_VERSION ?= 1.24
48-
GOLANGCILINT_VERSION ?= 2.4.0
48+
GOLANGCILINT_VERSION ?= 2.12.2
4949
GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator
5050
GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
5151
GO_SUBDIRS += cmd internal apis

‎config/cluster/cce/config.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import (
77
"github.com/opentelekomcloud/provider-opentelekomcloud/config/common"
88
)
99

10+
const (
11+
tfVpcSubnetV1 = "opentelekomcloud_vpc_subnet_v1"
12+
)
13+
1014
// Configure configures individual resources by adding custom ResourceConfigurators.
1115
func Configure(p *config.Provider) {
1216
p.AddResourceConfigurator("opentelekomcloud_cce_cluster_v3", func(r *config.Resource) {
@@ -15,19 +19,19 @@ func Configure(p *config.Provider) {
1519
TerraformName: "opentelekomcloud_vpc_v1",
1620
}
1721
r.References["subnet_id"] = config.Reference{
18-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
22+
TerraformName: tfVpcSubnetV1,
1923
Extractor: common.NetworkIDExtractor,
2024
}
2125
r.References["highway_subnet_id"] = config.Reference{
22-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
26+
TerraformName: tfVpcSubnetV1,
2327
Extractor: common.NetworkIDExtractor,
2428
}
2529
r.References["eni_subnet_id"] = config.Reference{
26-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
30+
TerraformName: tfVpcSubnetV1,
2731
Extractor: common.SubnetIDExtractor,
2832
}
2933
r.References["eni_subnet_cidr"] = config.Reference{
30-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
34+
TerraformName: tfVpcSubnetV1,
3135
Extractor: common.SubnetCIDRExtractor,
3236
}
3337
r.References["eip"] = config.Reference{
@@ -109,7 +113,7 @@ func Configure(p *config.Provider) {
109113
Extractor: common.AgencyNameExtractor,
110114
}
111115
r.References["subnet_id"] = config.Reference{
112-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
116+
TerraformName: tfVpcSubnetV1,
113117
Extractor: common.NetworkIDExtractor,
114118
}
115119
})

‎config/cluster/lb/config.go‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ import (
66
"github.com/opentelekomcloud/provider-opentelekomcloud/config/common"
77
)
88

9+
const (
10+
tfLbPoolV3 = "opentelekomcloud_lb_pool_v3"
11+
tfIdentityProjectV3 = "opentelekomcloud_identity_project_v3"
12+
)
13+
914
// Configure configures individual resources by adding custom ResourceConfigurators.
1015
func Configure(p *config.Provider) {
1116
p.AddResourceConfigurator("opentelekomcloud_lb_loadbalancer_v3", func(r *config.Resource) {
@@ -33,7 +38,7 @@ func Configure(p *config.Provider) {
3338
TerraformName: "opentelekomcloud_lb_certificate_v3",
3439
}
3540
r.References["default_pool_id"] = config.Reference{
36-
TerraformName: "opentelekomcloud_lb_pool_v3",
41+
TerraformName: tfLbPoolV3,
3742
}
3843
r.References["ip_group.id"] = config.Reference{
3944
TerraformName: "opentelekomcloud_lb_ipgroup_v3",
@@ -45,7 +50,7 @@ func Configure(p *config.Provider) {
4550
p.AddResourceConfigurator("opentelekomcloud_lb_pool_v3", func(r *config.Resource) {
4651
r.UseAsync = true
4752
r.References["project_id"] = config.Reference{
48-
TerraformName: "opentelekomcloud_identity_project_v3",
53+
TerraformName: tfIdentityProjectV3,
4954
}
5055
r.References["listener_id"] = config.Reference{
5156
TerraformName: "opentelekomcloud_lb_listener_v3",
@@ -60,10 +65,10 @@ func Configure(p *config.Provider) {
6065
p.AddResourceConfigurator("opentelekomcloud_lb_member_v3", func(r *config.Resource) {
6166
r.UseAsync = true
6267
r.References["project_id"] = config.Reference{
63-
TerraformName: "opentelekomcloud_identity_project_v3",
68+
TerraformName: tfIdentityProjectV3,
6469
}
6570
r.References["pool_id"] = config.Reference{
66-
TerraformName: "opentelekomcloud_lb_pool_v3",
71+
TerraformName: tfLbPoolV3,
6772
}
6873
r.References["subnet_id"] = config.Reference{
6974
TerraformName: "opentelekomcloud_vpc_subnet_v1",
@@ -72,7 +77,7 @@ func Configure(p *config.Provider) {
7277
p.AddResourceConfigurator("opentelekomcloud_lb_ipgroup_v3", func(r *config.Resource) {
7378
r.UseAsync = true
7479
r.References["project_id"] = config.Reference{
75-
TerraformName: "opentelekomcloud_identity_project_v3",
80+
TerraformName: tfIdentityProjectV3,
7681
}
7782
r.References["ip_list.ip"] = config.Reference{
7883
TerraformName: "opentelekomcloud_vpc_eip_v1",
@@ -82,16 +87,16 @@ func Configure(p *config.Provider) {
8287
p.AddResourceConfigurator("opentelekomcloud_lb_monitor_v3", func(r *config.Resource) {
8388
r.UseAsync = true
8489
r.References["pool_id"] = config.Reference{
85-
TerraformName: "opentelekomcloud_lb_pool_v3",
90+
TerraformName: tfLbPoolV3,
8691
}
8792
r.References["project_id"] = config.Reference{
88-
TerraformName: "opentelekomcloud_identity_project_v3",
93+
TerraformName: tfIdentityProjectV3,
8994
}
9095
})
9196
p.AddResourceConfigurator("opentelekomcloud_lb_policy_v3", func(r *config.Resource) {
9297
r.UseAsync = true
9398
r.References["project_id"] = config.Reference{
94-
TerraformName: "opentelekomcloud_identity_project_v3",
99+
TerraformName: tfIdentityProjectV3,
95100
}
96101
r.References["listener_id"] = config.Reference{
97102
TerraformName: "opentelekomcloud_lb_listener_v3",
@@ -100,10 +105,10 @@ func Configure(p *config.Provider) {
100105
TerraformName: "opentelekomcloud_lb_listener_v3",
101106
}
102107
r.References["redirect_pool_id"] = config.Reference{
103-
TerraformName: "opentelekomcloud_lb_pool_v3",
108+
TerraformName: tfLbPoolV3,
104109
}
105110
r.References["redirect_pools_config.pool_id"] = config.Reference{
106-
TerraformName: "opentelekomcloud_lb_pool_v3",
111+
TerraformName: tfLbPoolV3,
107112
}
108113
})
109114
p.AddResourceConfigurator("opentelekomcloud_lb_rule_v3", func(r *config.Resource) {
@@ -112,13 +117,13 @@ func Configure(p *config.Provider) {
112117
TerraformName: "opentelekomcloud_lb_policy_v3",
113118
}
114119
r.References["project_id"] = config.Reference{
115-
TerraformName: "opentelekomcloud_identity_project_v3",
120+
TerraformName: tfIdentityProjectV3,
116121
}
117122
})
118123
p.AddResourceConfigurator("opentelekomcloud_lb_security_policy_v3", func(r *config.Resource) {
119124
r.UseAsync = true
120125
r.References["project_id"] = config.Reference{
121-
TerraformName: "opentelekomcloud_identity_project_v3",
126+
TerraformName: tfIdentityProjectV3,
122127
}
123128
r.References["listener_ids"] = config.Reference{
124129
TerraformName: "opentelekomcloud_lb_listener_v3",

‎config/cluster/vpc/config.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ package vpc
22

33
import "github.com/crossplane/upjet/v2/pkg/config"
44

5+
const (
6+
tfVpcV1 = "opentelekomcloud_vpc_v1"
7+
)
8+
59
// Configure configures individual resources by adding custom ResourceConfigurators.
610
func Configure(p *config.Provider) {
711
p.AddResourceConfigurator("opentelekomcloud_vpc_subnet_v1", func(r *config.Resource) {
812
r.UseAsync = true
913
r.References["vpc_id"] = config.Reference{
10-
TerraformName: "opentelekomcloud_vpc_v1",
14+
TerraformName: tfVpcV1,
1115
}
1216
})
1317
p.AddResourceConfigurator("opentelekomcloud_vpc_v1", func(r *config.Resource) {
@@ -26,7 +30,7 @@ func Configure(p *config.Provider) {
2630
p.AddResourceConfigurator("opentelekomcloud_vpc_flow_log_v1", func(r *config.Resource) {
2731
r.UseAsync = true
2832
r.References["resource_id"] = config.Reference{
29-
TerraformName: "opentelekomcloud_vpc_v1",
33+
TerraformName: tfVpcV1,
3034
}
3135
r.References["log_group_id"] = config.Reference{
3236
TerraformName: "opentelekomcloud_logtank_group_v2",
@@ -38,10 +42,10 @@ func Configure(p *config.Provider) {
3842
p.AddResourceConfigurator("opentelekomcloud_vpc_peering_connection_v2", func(r *config.Resource) {
3943
r.UseAsync = true
4044
r.References["vpc_id"] = config.Reference{
41-
TerraformName: "opentelekomcloud_vpc_v1",
45+
TerraformName: tfVpcV1,
4246
}
4347
r.References["peer_vpc_id"] = config.Reference{
44-
TerraformName: "opentelekomcloud_vpc_v1",
48+
TerraformName: tfVpcV1,
4549
}
4650
})
4751
p.AddResourceConfigurator("opentelekomcloud_vpc_peering_connection_accepter_v2", func(r *config.Resource) {
@@ -53,13 +57,13 @@ func Configure(p *config.Provider) {
5357
p.AddResourceConfigurator("opentelekomcloud_vpc_route_v2", func(r *config.Resource) {
5458
r.UseAsync = true
5559
r.References["vpc_id"] = config.Reference{
56-
TerraformName: "opentelekomcloud_vpc_v1",
60+
TerraformName: tfVpcV1,
5761
}
5862
})
5963
p.AddResourceConfigurator("opentelekomcloud_vpc_route_table_v1", func(r *config.Resource) {
6064
r.UseAsync = true
6165
r.References["vpc_id"] = config.Reference{
62-
TerraformName: "opentelekomcloud_vpc_v1",
66+
TerraformName: tfVpcV1,
6367
}
6468
})
6569
}

‎config/namespaced/cce/config.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import (
77
"github.com/opentelekomcloud/provider-opentelekomcloud/config/common"
88
)
99

10+
const (
11+
tfVpcSubnetV1 = "opentelekomcloud_vpc_subnet_v1"
12+
)
13+
1014
// Configure configures individual resources by adding custom ResourceConfigurators.
1115
func Configure(p *config.Provider) {
1216
p.AddResourceConfigurator("opentelekomcloud_cce_cluster_v3", func(r *config.Resource) {
@@ -15,19 +19,19 @@ func Configure(p *config.Provider) {
1519
TerraformName: "opentelekomcloud_vpc_v1",
1620
}
1721
r.References["subnet_id"] = config.Reference{
18-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
22+
TerraformName: tfVpcSubnetV1,
1923
Extractor: common.NetworkIDExtractor,
2024
}
2125
r.References["highway_subnet_id"] = config.Reference{
22-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
26+
TerraformName: tfVpcSubnetV1,
2327
Extractor: common.NetworkIDExtractor,
2428
}
2529
r.References["eni_subnet_id"] = config.Reference{
26-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
30+
TerraformName: tfVpcSubnetV1,
2731
Extractor: common.SubnetIDExtractor,
2832
}
2933
r.References["eni_subnet_cidr"] = config.Reference{
30-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
34+
TerraformName: tfVpcSubnetV1,
3135
Extractor: common.SubnetCIDRExtractor,
3236
}
3337
r.References["eip"] = config.Reference{
@@ -109,7 +113,7 @@ func Configure(p *config.Provider) {
109113
Extractor: common.AgencyNameExtractor,
110114
}
111115
r.References["subnet_id"] = config.Reference{
112-
TerraformName: "opentelekomcloud_vpc_subnet_v1",
116+
TerraformName: tfVpcSubnetV1,
113117
Extractor: common.NetworkIDExtractor,
114118
}
115119
})

‎config/namespaced/lb/config.go‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ import (
66
"github.com/opentelekomcloud/provider-opentelekomcloud/config/common"
77
)
88

9+
const (
10+
tfLbPoolV3 = "opentelekomcloud_lb_pool_v3"
11+
tfIdentityProjectV3 = "opentelekomcloud_identity_project_v3"
12+
)
13+
914
// Configure configures individual resources by adding custom ResourceConfigurators.
1015
func Configure(p *config.Provider) {
1116
p.AddResourceConfigurator("opentelekomcloud_lb_loadbalancer_v3", func(r *config.Resource) {
@@ -33,7 +38,7 @@ func Configure(p *config.Provider) {
3338
TerraformName: "opentelekomcloud_lb_certificate_v3",
3439
}
3540
r.References["default_pool_id"] = config.Reference{
36-
TerraformName: "opentelekomcloud_lb_pool_v3",
41+
TerraformName: tfLbPoolV3,
3742
}
3843
r.References["ip_group.id"] = config.Reference{
3944
TerraformName: "opentelekomcloud_lb_ipgroup_v3",
@@ -45,7 +50,7 @@ func Configure(p *config.Provider) {
4550
p.AddResourceConfigurator("opentelekomcloud_lb_pool_v3", func(r *config.Resource) {
4651
r.UseAsync = true
4752
r.References["project_id"] = config.Reference{
48-
TerraformName: "opentelekomcloud_identity_project_v3",
53+
TerraformName: tfIdentityProjectV3,
4954
}
5055
r.References["listener_id"] = config.Reference{
5156
TerraformName: "opentelekomcloud_lb_listener_v3",
@@ -60,10 +65,10 @@ func Configure(p *config.Provider) {
6065
p.AddResourceConfigurator("opentelekomcloud_lb_member_v3", func(r *config.Resource) {
6166
r.UseAsync = true
6267
r.References["project_id"] = config.Reference{
63-
TerraformName: "opentelekomcloud_identity_project_v3",
68+
TerraformName: tfIdentityProjectV3,
6469
}
6570
r.References["pool_id"] = config.Reference{
66-
TerraformName: "opentelekomcloud_lb_pool_v3",
71+
TerraformName: tfLbPoolV3,
6772
}
6873
r.References["subnet_id"] = config.Reference{
6974
TerraformName: "opentelekomcloud_vpc_subnet_v1",
@@ -72,7 +77,7 @@ func Configure(p *config.Provider) {
7277
p.AddResourceConfigurator("opentelekomcloud_lb_ipgroup_v3", func(r *config.Resource) {
7378
r.UseAsync = true
7479
r.References["project_id"] = config.Reference{
75-
TerraformName: "opentelekomcloud_identity_project_v3",
80+
TerraformName: tfIdentityProjectV3,
7681
}
7782
r.References["ip_list.ip"] = config.Reference{
7883
TerraformName: "opentelekomcloud_vpc_eip_v1",
@@ -82,16 +87,16 @@ func Configure(p *config.Provider) {
8287
p.AddResourceConfigurator("opentelekomcloud_lb_monitor_v3", func(r *config.Resource) {
8388
r.UseAsync = true
8489
r.References["pool_id"] = config.Reference{
85-
TerraformName: "opentelekomcloud_lb_pool_v3",
90+
TerraformName: tfLbPoolV3,
8691
}
8792
r.References["project_id"] = config.Reference{
88-
TerraformName: "opentelekomcloud_identity_project_v3",
93+
TerraformName: tfIdentityProjectV3,
8994
}
9095
})
9196
p.AddResourceConfigurator("opentelekomcloud_lb_policy_v3", func(r *config.Resource) {
9297
r.UseAsync = true
9398
r.References["project_id"] = config.Reference{
94-
TerraformName: "opentelekomcloud_identity_project_v3",
99+
TerraformName: tfIdentityProjectV3,
95100
}
96101
r.References["listener_id"] = config.Reference{
97102
TerraformName: "opentelekomcloud_lb_listener_v3",
@@ -100,10 +105,10 @@ func Configure(p *config.Provider) {
100105
TerraformName: "opentelekomcloud_lb_listener_v3",
101106
}
102107
r.References["redirect_pool_id"] = config.Reference{
103-
TerraformName: "opentelekomcloud_lb_pool_v3",
108+
TerraformName: tfLbPoolV3,
104109
}
105110
r.References["redirect_pools_config.pool_id"] = config.Reference{
106-
TerraformName: "opentelekomcloud_lb_pool_v3",
111+
TerraformName: tfLbPoolV3,
107112
}
108113
})
109114
p.AddResourceConfigurator("opentelekomcloud_lb_rule_v3", func(r *config.Resource) {
@@ -112,13 +117,13 @@ func Configure(p *config.Provider) {
112117
TerraformName: "opentelekomcloud_lb_policy_v3",
113118
}
114119
r.References["project_id"] = config.Reference{
115-
TerraformName: "opentelekomcloud_identity_project_v3",
120+
TerraformName: tfIdentityProjectV3,
116121
}
117122
})
118123
p.AddResourceConfigurator("opentelekomcloud_lb_security_policy_v3", func(r *config.Resource) {
119124
r.UseAsync = true
120125
r.References["project_id"] = config.Reference{
121-
TerraformName: "opentelekomcloud_identity_project_v3",
126+
TerraformName: tfIdentityProjectV3,
122127
}
123128
r.References["listener_ids"] = config.Reference{
124129
TerraformName: "opentelekomcloud_lb_listener_v3",

0 commit comments

Comments
 (0)