Update Go to v1.20 (#186)

* Update go to v1.20 * Bump golangci-lint version * Fix lint errors * Remove uneeded continue statement
vultr · Jul 7, 2023 · c963b53 · c963b53
1 parent 0dacb7e
commit c963b53
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 65 deletions.
diff --git a/.github/workflows/go-checks.yaml b/.github/workflows/go-checks.yaml
@@ -17,14 +17,13 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: "1.20"
 
       - name: Install dependencies
         run: |
           go version
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
 
       - name: Run golangci-lint
         run: |
           golangci-lint run --timeout=5m vultr/...
-
diff --git a/.github/workflows/releaser.yaml b/.github/workflows/releaser.yaml
@@ -53,7 +53,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: "1.20"
       -
         name: Docker Login
         env:
@@ -86,4 +86,4 @@ jobs:
         env:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
           MATTERMOST_USERNAME: ${{ secrets.MATTERMOST_USERNAME}}
-          MATTERMOST_ICON: ${{ secrets.MATTERMOST_ICON }}
+          MATTERMOST_ICON: ${{ secrets.MATTERMOST_ICON }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v2
         with:
-          go-version: '1.19.1'
+          go-version: "1.20"
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vultr/vultr-cloud-controller-manager
 
-go 1.19
+go 1.20
 
 require (
 	github.com/spf13/pflag v1.0.5

diff --git a/vultr/cloud.go b/vultr/cloud.go
@@ -84,7 +84,7 @@ func newCloud() (cloudprovider.Interface, error) {
 	}, nil
 }
 
-func (c *cloud) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, stop <-chan struct{}) {
+func (c *cloud) Initialize(_ cloudprovider.ControllerClientBuilder, _ <-chan struct{}) {
 }
 
 func (c *cloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {

diff --git a/vultr/fakeclient.go b/vultr/fakeclient.go
@@ -22,27 +22,27 @@ type FakeInstance struct {
 }
 
 // ListVPCInfo returns VPC info (not implemented, yet)
-func (f *FakeInstance) ListVPCInfo(ctx context.Context, instanceID string, options *govultr.ListOptions) ([]govultr.VPCInfo, *govultr.Meta, error) {
+func (f *FakeInstance) ListVPCInfo(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.VPCInfo, *govultr.Meta, error) {
 	panic("implement me")
 }
 
 // AttachVPC attaches VPC (not implemented, yet)
-func (f *FakeInstance) AttachVPC(ctx context.Context, instanceID, vpcID string) error {
+func (f *FakeInstance) AttachVPC(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // DetachVPC detaches VPC (not implemented, yet)
-func (f *FakeInstance) DetachVPC(ctx context.Context, instanceID, vpcID string) error {
+func (f *FakeInstance) DetachVPC(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // Create creates an instance (not implemented, yet)
-func (f *FakeInstance) Create(ctx context.Context, instanceReq *govultr.InstanceCreateReq) (*govultr.Instance, error) {
+func (f *FakeInstance) Create(_ context.Context, _ *govultr.InstanceCreateReq) (*govultr.Instance, error) {
 	panic("implement me")
 }
 
 // Get returns instance
-func (f *FakeInstance) Get(ctx context.Context, instanceID string) (*govultr.Instance, error) {
+func (f *FakeInstance) Get(_ context.Context, _ string) (*govultr.Instance, error) {
 	return &govultr.Instance{
 		ID:           "75b95d83-47e2-4c0f-b273-cc9ce2b456f8",
 		MainIP:       "149.28.225.110",
@@ -59,17 +59,17 @@ func (f *FakeInstance) Get(ctx context.Context, instanceID string) (*govultr.Ins
 }
 
 // Update updates and instance
-func (f *FakeInstance) Update(ctx context.Context, instanceID string, instanceReq *govultr.InstanceUpdateReq) (*govultr.Instance, error) {
+func (f *FakeInstance) Update(_ context.Context, _ string, _ *govultr.InstanceUpdateReq) (*govultr.Instance, error) {
 	panic("implement me")
 }
 
 // Delete deletes an instance
-func (f *FakeInstance) Delete(ctx context.Context, instanceID string) error {
+func (f *FakeInstance) Delete(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // List lists instances
-func (f *FakeInstance) List(ctx context.Context, options *govultr.ListOptions) ([]govultr.Instance, *govultr.Meta, error) {
+func (f *FakeInstance) List(_ context.Context, _ *govultr.ListOptions) ([]govultr.Instance, *govultr.Meta, error) {
 	return []govultr.Instance{
 			{
 				ID:           "75b95d83-47e2-4c0f-b273-cc9ce2b456f8",
@@ -94,147 +94,147 @@ func (f *FakeInstance) List(ctx context.Context, options *govultr.ListOptions) (
 }
 
 // Start starts an instance
-func (f *FakeInstance) Start(ctx context.Context, instanceID string) error {
+func (f *FakeInstance) Start(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // Halt halts/stops an instance
-func (f *FakeInstance) Halt(ctx context.Context, instanceID string) error {
+func (f *FakeInstance) Halt(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // Reboot reboots an instance
-func (f *FakeInstance) Reboot(ctx context.Context, instanceID string) error {
+func (f *FakeInstance) Reboot(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // Reinstall reinstalls an instance
-func (f *FakeInstance) Reinstall(ctx context.Context, instanceID string, req *govultr.ReinstallReq) (*govultr.Instance, error) {
+func (f *FakeInstance) Reinstall(_ context.Context, _ string, _ *govultr.ReinstallReq) (*govultr.Instance, error) {
 	panic("implement me")
 }
 
 // MassStart bulk starts instances
-func (f *FakeInstance) MassStart(ctx context.Context, instanceList []string) error {
+func (f *FakeInstance) MassStart(_ context.Context, _ []string) error {
 	panic("implement me")
 }
 
 // MassHalt bulk stops instances
-func (f *FakeInstance) MassHalt(ctx context.Context, instanceList []string) error {
+func (f *FakeInstance) MassHalt(_ context.Context, _ []string) error {
 	panic("implement me")
 }
 
 // MassReboot bulk reboots instances
-func (f *FakeInstance) MassReboot(ctx context.Context, instanceList []string) error {
+func (f *FakeInstance) MassReboot(_ context.Context, _ []string) error {
 	panic("implement me")
 }
 
 // Restore restores an instance
-func (f *FakeInstance) Restore(ctx context.Context, instanceID string, restoreReq *govultr.RestoreReq) error {
+func (f *FakeInstance) Restore(_ context.Context, _ string, _ *govultr.RestoreReq) error {
 	panic("implement me")
 }
 
 // GetBandwidth gets bandwidth for an instance
-func (f *FakeInstance) GetBandwidth(ctx context.Context, instanceID string) (*govultr.Bandwidth, error) {
+func (f *FakeInstance) GetBandwidth(_ context.Context, _ string) (*govultr.Bandwidth, error) {
 	panic("implement me")
 }
 
 // GetNeighbors gets neighors for an instance
-func (f *FakeInstance) GetNeighbors(ctx context.Context, instanceID string) (*govultr.Neighbors, error) {
+func (f *FakeInstance) GetNeighbors(_ context.Context, _ string) (*govultr.Neighbors, error) {
 	panic("implement me")
 }
 
 // ListPrivateNetworks gets private networks
-func (f *FakeInstance) ListPrivateNetworks(context.Context, string, *govultr.ListOptions) ([]govultr.PrivateNetwork, *govultr.Meta, error) {
+func (f *FakeInstance) ListPrivateNetworks(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.PrivateNetwork, *govultr.Meta, error) {
 	panic("implement me")
 }
 
 // AttachPrivateNetwork attches private networks
-func (f *FakeInstance) AttachPrivateNetwork(ctx context.Context, instanceID, networkID string) error {
+func (f *FakeInstance) AttachPrivateNetwork(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // DetachPrivateNetwork detaches private network from instance
-func (f *FakeInstance) DetachPrivateNetwork(ctx context.Context, instanceID, networkID string) error {
+func (f *FakeInstance) DetachPrivateNetwork(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // ISOStatus gets ISO status from instance
-func (f *FakeInstance) ISOStatus(ctx context.Context, instanceID string) (*govultr.Iso, error) {
+func (f *FakeInstance) ISOStatus(_ context.Context, _ string) (*govultr.Iso, error) {
 	panic("implement me")
 }
 
 // AttachISO attaches ISO to instance
-func (f *FakeInstance) AttachISO(ctx context.Context, instanceID, isoID string) error {
+func (f *FakeInstance) AttachISO(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // DetachISO detaches ISO from instance
-func (f *FakeInstance) DetachISO(ctx context.Context, instanceID string) error {
+func (f *FakeInstance) DetachISO(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // GetBackupSchedule gets instance backup stchedule
-func (f *FakeInstance) GetBackupSchedule(ctx context.Context, instanceID string) (*govultr.BackupSchedule, error) {
+func (f *FakeInstance) GetBackupSchedule(_ context.Context, _ string) (*govultr.BackupSchedule, error) {
 	panic("implement me")
 }
 
 // SetBackupSchedule sets instance backup schedule
-func (f *FakeInstance) SetBackupSchedule(ctx context.Context, instanceID string, backup *govultr.BackupScheduleReq) error {
+func (f *FakeInstance) SetBackupSchedule(_ context.Context, _ string, _ *govultr.BackupScheduleReq) error {
 	panic("implement me")
 }
 
 // CreateIPv4 creates an IPv4 association to instance
-func (f *FakeInstance) CreateIPv4(ctx context.Context, instanceID string, reboot *bool) (*govultr.IPv4, error) {
+func (f *FakeInstance) CreateIPv4(_ context.Context, _ string, _ *bool) (*govultr.IPv4, error) {
 	panic("implement me")
 }
 
 // ListIPv4 gets IPv4 addresses associated with instance
-func (f *FakeInstance) ListIPv4(ctx context.Context, instanceID string, option *govultr.ListOptions) ([]govultr.IPv4, *govultr.Meta, error) {
+func (f *FakeInstance) ListIPv4(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.IPv4, *govultr.Meta, error) {
 	panic("implement me")
 }
 
 // DeleteIPv4 deletes IPv4 address associated with instance
-func (f *FakeInstance) DeleteIPv4(ctx context.Context, instanceID, ip string) error {
+func (f *FakeInstance) DeleteIPv4(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // ListIPv6 lists IPv6 addresses associated with instance
-func (f *FakeInstance) ListIPv6(ctx context.Context, instanceID string, option *govultr.ListOptions) ([]govultr.IPv6, *govultr.Meta, error) {
+func (f *FakeInstance) ListIPv6(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.IPv6, *govultr.Meta, error) {
 	panic("implement me")
 }
 
 // CreateReverseIPv6 adds reverse IP to IPv6
-func (f *FakeInstance) CreateReverseIPv6(ctx context.Context, instanceID string, reverseReq *govultr.ReverseIP) error {
+func (f *FakeInstance) CreateReverseIPv6(_ context.Context, _ string, _ *govultr.ReverseIP) error {
 	panic("implement me")
 }
 
 // ListReverseIPv6 gets reverse IP for IPv6 on instance
-func (f *FakeInstance) ListReverseIPv6(ctx context.Context, instanceID string) ([]govultr.ReverseIP, error) {
+func (f *FakeInstance) ListReverseIPv6(_ context.Context, _ string) ([]govultr.ReverseIP, error) {
 	panic("implement me")
 }
 
 // DeleteReverseIPv6 deletes IPv6 reverse for instance
-func (f *FakeInstance) DeleteReverseIPv6(ctx context.Context, instanceID, ip string) error {
+func (f *FakeInstance) DeleteReverseIPv6(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // CreateReverseIPv4 creates reverse IPv4 for instance
-func (f *FakeInstance) CreateReverseIPv4(ctx context.Context, instanceID string, reverseReq *govultr.ReverseIP) error {
+func (f *FakeInstance) CreateReverseIPv4(_ context.Context, _ string, _ *govultr.ReverseIP) error {
 	panic("implement me")
 }
 
 // DefaultReverseIPv4 sets default for IPv4 on instance
-func (f *FakeInstance) DefaultReverseIPv4(ctx context.Context, instanceID, ip string) error {
+func (f *FakeInstance) DefaultReverseIPv4(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // GetUserData returns instance userdata
-func (f *FakeInstance) GetUserData(ctx context.Context, instanceID string) (*govultr.UserData, error) {
+func (f *FakeInstance) GetUserData(_ context.Context, _ string) (*govultr.UserData, error) {
 	panic("implement me")
 }
 
 // GetUpgrades gets instance upgade
-func (f *FakeInstance) GetUpgrades(ctx context.Context, instanceID string) (*govultr.Upgrades, error) {
+func (f *FakeInstance) GetUpgrades(_ context.Context, _ string) (*govultr.Upgrades, error) {
 	panic("implement me")
 }
 
@@ -243,12 +243,12 @@ type fakeLB struct {
 }
 
 // Create creates loadbalancer
-func (f *fakeLB) Create(ctx context.Context, createReq *govultr.LoadBalancerReq) (*govultr.LoadBalancer, error) {
+func (f *fakeLB) Create(_ context.Context, _ *govultr.LoadBalancerReq) (*govultr.LoadBalancer, error) {
 	panic("implement me")
 }
 
 // Get gets loadbalancer
-func (f *fakeLB) Get(ctx context.Context, id string) (*govultr.LoadBalancer, error) {
+func (f *fakeLB) Get(_ context.Context, _ string) (*govultr.LoadBalancer, error) {
 	return &govultr.LoadBalancer{
 		ID:        "6334f227-6d96-4cbd-9bcb-5be0759354fa",
 		Region:    "ewr",
@@ -260,17 +260,17 @@ func (f *fakeLB) Get(ctx context.Context, id string) (*govultr.LoadBalancer, err
 }
 
 // Update updates loadbalancer
-func (f *fakeLB) Update(ctx context.Context, id string, updateReq *govultr.LoadBalancerReq) error {
+func (f *fakeLB) Update(_ context.Context, _ string, _ *govultr.LoadBalancerReq) error {
 	return nil
 }
 
 // Delete deletes loadbalancer
-func (f *fakeLB) Delete(ctx context.Context, id string) error {
+func (f *fakeLB) Delete(_ context.Context, _ string) error {
 	panic("implement me")
 }
 
 // List gets loadbalancers
-func (f *fakeLB) List(ctx context.Context, options *govultr.ListOptions) ([]govultr.LoadBalancer, *govultr.Meta, error) {
+func (f *fakeLB) List(_ context.Context, _ *govultr.ListOptions) ([]govultr.LoadBalancer, *govultr.Meta, error) {
 	return []govultr.LoadBalancer{
 			{
 				ID:     "6334f227-6d96-4cbd-9bcb-5be0759354fa",
@@ -289,22 +289,22 @@ func (f *fakeLB) List(ctx context.Context, options *govultr.ListOptions) ([]govu
 }
 
 // CreateForwardingRule adds forwarding rule
-func (f *fakeLB) CreateForwardingRule(ctx context.Context, id string, rule *govultr.ForwardingRule) (*govultr.ForwardingRule, error) {
+func (f *fakeLB) CreateForwardingRule(_ context.Context, _ string, _ *govultr.ForwardingRule) (*govultr.ForwardingRule, error) {
 	panic("implement me")
 }
 
 // GetForwardingRule returns forwarding rule
-func (f *fakeLB) GetForwardingRule(ctx context.Context, id, ruleID string) (*govultr.ForwardingRule, error) {
+func (f *fakeLB) GetForwardingRule(_ context.Context, _, _ string) (*govultr.ForwardingRule, error) {
 	panic("implement me")
 }
 
 // DeleteForwardingRule deletes forwarding rule
-func (f *fakeLB) DeleteForwardingRule(ctx context.Context, id, ruleID string) error {
+func (f *fakeLB) DeleteForwardingRule(_ context.Context, _, _ string) error {
 	panic("implement me")
 }
 
 // ListForwardingRules gets forwarding rules
-func (f *fakeLB) ListForwardingRules(ctx context.Context, id string, options *govultr.ListOptions) ([]govultr.ForwardingRule, *govultr.Meta, error) {
+func (f *fakeLB) ListForwardingRules(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.ForwardingRule, *govultr.Meta, error) {
 	return []govultr.ForwardingRule{{
 			RuleID:           "1234",
 			FrontendProtocol: "tcp",
@@ -321,11 +321,11 @@ func (f *fakeLB) ListForwardingRules(ctx context.Context, id string, options *go
 }
 
 // ListFirewallRules gets forwarding rules
-func (f *fakeLB) ListFirewallRules(ctx context.Context, id string, options *govultr.ListOptions) ([]govultr.LBFirewallRule, *govultr.Meta, error) {
+func (f *fakeLB) ListFirewallRules(_ context.Context, _ string, _ *govultr.ListOptions) ([]govultr.LBFirewallRule, *govultr.Meta, error) {
 	return nil, nil, nil
 }
 
 // GetFirewallRule gets firewall rules
-func (f *fakeLB) GetFirewallRule(ctx context.Context, id, ruleID string) (*govultr.LBFirewallRule, error) {
+func (f *fakeLB) GetFirewallRule(_ context.Context, _, _ string) (*govultr.LBFirewallRule, error) {
 	return nil, nil
 }
diff --git a/vultr/instances.go b/vultr/instances.go
@@ -95,12 +95,12 @@ func (i *instances) InstanceTypeByProviderID(ctx context.Context, providerID str
 }
 
 // AddSSHKeyToAllInstances is not implemented.
-func (i *instances) AddSSHKeyToAllInstances(ctx context.Context, user string, keyData []byte) error {
+func (i *instances) AddSSHKeyToAllInstances(_ context.Context, _ string, _ []byte) error {
 	return cloudprovider.NotImplemented
 }
 
 // CurrentNodeName returns the hostname as a NodeName.
-func (i *instances) CurrentNodeName(ctx context.Context, hostname string) (types.NodeName, error) {
+func (i *instances) CurrentNodeName(_ context.Context, hostname string) (types.NodeName, error) {
 	return types.NodeName(hostname), nil
 }
 
@@ -206,10 +206,9 @@ func vultrByName(ctx context.Context, client *govultr.Client, nodeName types.Nod
 
 		if meta.Links.Next == "" {
 			break
-		} else {
-			listOptions.Cursor = meta.Links.Next
-			continue
 		}
+
+		listOptions.Cursor = meta.Links.Next
 	}
 
 	if len(instances) == 0 {