gophercloud · stephenfin · May 16, 2025 · May 16, 2025 · May 16, 2025 · May 16, 2025
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,19 +1,34 @@
---
+version: "2"
 linters:
-  disable-all: true
+  default: none
  enable:
    - errcheck
-    - gofmt
-    - goimports
    - govet
    - staticcheck
    - unparam
    - unused
-
-issues:
-  exclude:
-    - SA1006  # printf-style function with dynamic format string and no further arguments should use print-style function instead (staticcheck)
-  exclude-rules:
-    - linters:
-        - staticcheck
-      text: 'SA1019: (x509.EncryptPEMBlock|strings.Title)'
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: "SA1019: (x509.EncryptPEMBlock|strings.Title)"
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 undefine GOFLAGS

-GOLANGCI_LINT_VERSION?=v1.62.2
+GOLANGCI_LINT_VERSION?=v2.1.6
 GO_TEST?=go run gotest.tools/gotestsum@latest --format testname --
 TIMEOUT := "60m"


diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -8,7 +8,7 @@ Please see our dedicated document [here](MICROVERSIONS.md).

 You can implement custom logging and/or limit re-auth attempts by creating a custom HTTP client
 like the following and setting it as the provider client's HTTP Client (via the
-`gophercloud.ProviderClient.HTTPClient` field):
+`gophercloud.HTTPClient` field):

 ```go
 //...
@@ -41,7 +41,7 @@ func (lrt *LogRoundTripper) RoundTrip(request *http.Request) (*http.Response, er

 	if response.StatusCode == http.StatusUnauthorized {
 		if lrt.numReauthAttempts == 3 {
-			return response, fmt.Errorf("Tried to re-authenticate 3 times with no success.")
+			return response, fmt.Errorf("tried to re-authenticate 3 times with no success")
 		}
 		lrt.numReauthAttempts++
 	}

diff --git a/internal/acceptance/clients/clients.go b/internal/acceptance/clients/clients.go
@@ -108,13 +108,11 @@ func AcceptanceTestChoicesFromEnv() (*AcceptanceTestChoices, error) {
 	}

 	if len(missing) > 0 {
-		text := "You're missing some important setup:\n * These environment variables must be provided: %s\n"
-		return nil, fmt.Errorf(text, strings.Join(missing, ", "))
+		return nil, fmt.Errorf("you're missing some important setup:\n * These environment variables must be provided: %s", strings.Join(missing, ", "))
 	}

 	if notDistinct != "" {
-		text := "You're missing some important setup:\n * %s\n"
-		return nil, fmt.Errorf(text, notDistinct)
+		return nil, fmt.Errorf("you're missing some important setup:\n * %s", notDistinct)
 	}

 	return &AcceptanceTestChoices{

diff --git a/internal/acceptance/clients/conditions.go b/internal/acceptance/clients/conditions.go
@@ -94,7 +94,7 @@ func IsCurrentAbove(t *testing.T, release string) bool {
 		if isReleaseNumeral(current) && !isReleaseNumeral(release) {
 			return true
 		}
-		if current > release && !(!isReleaseNumeral(current) && isReleaseNumeral(release)) {
+		if current > release && (isReleaseNumeral(current) || !isReleaseNumeral(release)) {
 			return true
 		}
 	}
@@ -118,7 +118,7 @@ func IsCurrentBelow(t *testing.T, release string) bool {
 		if isReleaseNumeral(release) && !isReleaseNumeral(current) {
 			return true
 		}
-		if release > current && !(!isReleaseNumeral(release) && isReleaseNumeral(current)) {
+		if release > current && (isReleaseNumeral(release) || !isReleaseNumeral(current)) {
 			return true
 		}
 	}

diff --git a/internal/acceptance/openstack/blockstorage/v2/blockstorage.go b/internal/acceptance/openstack/blockstorage/v2/blockstorage.go
@@ -455,7 +455,7 @@ func SetBootable(t *testing.T, client *gophercloud.ServiceClient, volume *volume
 	}

 	if strings.ToLower(vol.Bootable) != "true" {
-		return fmt.Errorf("Volume bootable status is %q, expected 'true'", vol.Bootable)
+		return fmt.Errorf("volume bootable status is %q, expected 'true'", vol.Bootable)
 	}

 	bootableOpts = volumes.BootableOpts{
@@ -473,7 +473,7 @@ func SetBootable(t *testing.T, client *gophercloud.ServiceClient, volume *volume
 	}

 	if strings.ToLower(vol.Bootable) == "true" {
-		return fmt.Errorf("Volume bootable status is %q, expected 'false'", vol.Bootable)
+		return fmt.Errorf("volume bootable status is %q, expected 'false'", vol.Bootable)
 	}

 	return nil

diff --git a/internal/acceptance/openstack/blockstorage/v3/blockstorage.go b/internal/acceptance/openstack/blockstorage/v3/blockstorage.go
@@ -673,7 +673,7 @@ func SetBootable(t *testing.T, client *gophercloud.ServiceClient, volume *volume
 	}

 	if strings.ToLower(vol.Bootable) != "true" {
-		return fmt.Errorf("Volume bootable status is %q, expected 'true'", vol.Bootable)
+		return fmt.Errorf("volume bootable status is %q, expected 'true'", vol.Bootable)
 	}

 	bootableOpts = volumes.BootableOpts{
@@ -691,7 +691,7 @@ func SetBootable(t *testing.T, client *gophercloud.ServiceClient, volume *volume
 	}

 	if strings.ToLower(vol.Bootable) == "true" {
-		return fmt.Errorf("Volume bootable status is %q, expected 'false'", vol.Bootable)
+		return fmt.Errorf("volume bootable status is %q, expected 'false'", vol.Bootable)
 	}

 	return nil

diff --git a/internal/acceptance/openstack/blockstorage/v3/volumeattachments.go b/internal/acceptance/openstack/blockstorage/v3/volumeattachments.go
@@ -72,7 +72,7 @@ func CreateVolumeAttachment(t *testing.T, client *gophercloud.ServiceClient, vol
 	}

 	if allAttachments[0].ID != attachment.ID {
-		return fmt.Errorf("Attachment IDs from get and list are not equal: %q != %q", allAttachments[0].ID, attachment.ID)
+		return fmt.Errorf("attachment IDs from get and list are not equal: %q != %q", allAttachments[0].ID, attachment.ID)
 	}

 	t.Logf("Attached volume %s to server %s within %q attachment", volume.ID, server.ID, attachment.ID)

diff --git a/internal/acceptance/openstack/compute/v2/aggregates_test.go b/internal/acceptance/openstack/compute/v2/aggregates_test.go
@@ -147,5 +147,5 @@ func getHypervisor(t *testing.T, client *gophercloud.ServiceClient) (string, err
 		return host, nil
 	}

-	return "", fmt.Errorf("Unable to get hypervisor")
+	return "", fmt.Errorf("unable to get hypervisor")
 }
diff --git a/internal/acceptance/openstack/compute/v2/compute.go b/internal/acceptance/openstack/compute/v2/compute.go
@@ -888,7 +888,7 @@ func GetNetworkIDFromNetworks(t *testing.T, client *gophercloud.ServiceClient, n
 		}
 	}

-	return "", fmt.Errorf("Failed to obtain network ID for network %s", networkName)
+	return "", fmt.Errorf("failed to obtain network ID for network %s", networkName)
 }

 // ImportPublicKey will create a KeyPair with a random name and a specified
@@ -952,7 +952,7 @@ func WaitForComputeStatus(client *gophercloud.ServiceClient, server *servers.Ser
 		}

 		if latest.Status == "ERROR" {
-			return false, fmt.Errorf("Instance in ERROR state")
+			return false, fmt.Errorf("instance in ERROR state")
 		}

 		return false, nil

diff --git a/internal/acceptance/openstack/compute/v2/hypervisors_test.go b/internal/acceptance/openstack/compute/v2/hypervisors_test.go
@@ -121,5 +121,5 @@ func getHypervisorID(t *testing.T, client *gophercloud.ServiceClient) (string, e
 		return allHypervisors[0].ID, nil
 	}

-	return "", fmt.Errorf("Unable to get hypervisor ID")
+	return "", fmt.Errorf("unable to get hypervisor ID")
 }
diff --git a/internal/acceptance/openstack/compute/v2/quotaset_test.go b/internal/acceptance/openstack/compute/v2/quotaset_test.go
@@ -45,7 +45,7 @@ func getProjectID(t *testing.T, client *gophercloud.ServiceClient) (string, erro
 		return project.ID, nil
 	}

-	return "", fmt.Errorf("Unable to get project ID")
+	return "", fmt.Errorf("unable to get project ID")
 }

 func getProjectIDByName(t *testing.T, client *gophercloud.ServiceClient, name string) (string, error) {
@@ -61,7 +61,7 @@ func getProjectIDByName(t *testing.T, client *gophercloud.ServiceClient, name st
 		}
 	}

-	return "", fmt.Errorf("Unable to get project ID")
+	return "", fmt.Errorf("unable to get project ID")
 }

 // What will be sent as desired Quotas to the Server

diff --git a/internal/acceptance/openstack/container/v1/capsules.go b/internal/acceptance/openstack/container/v1/capsules.go
@@ -36,11 +36,11 @@ func WaitForCapsuleStatus(client *gophercloud.ServiceClient, uuid, status string
 		}

 		if newStatus == "Failed" {
-			return false, fmt.Errorf("Capsule in FAILED state")
+			return false, fmt.Errorf("capsule in FAILED state")
 		}

 		if newStatus == "Error" {
-			return false, fmt.Errorf("Capsule in ERROR state")
+			return false, fmt.Errorf("capsule in ERROR state")
 		}

 		return false, nil

diff --git a/internal/acceptance/openstack/containerinfra/v1/containerinfra.go b/internal/acceptance/openstack/containerinfra/v1/containerinfra.go
@@ -203,7 +203,7 @@ func WaitForCluster(client *gophercloud.ServiceClient, clusterID string, status
 		}

 		if strings.Contains(cluster.Status, "FAILED") {
-			return false, fmt.Errorf("Cluster %s FAILED. Status=%s StatusReason=%s", clusterID, cluster.Status, cluster.StatusReason)
+			return false, fmt.Errorf("cluster %s FAILED. Status=%s StatusReason=%s", clusterID, cluster.Status, cluster.StatusReason)
 		}

 		return false, nil

diff --git a/internal/acceptance/openstack/db/v1/db.go b/internal/acceptance/openstack/db/v1/db.go
@@ -138,7 +138,7 @@ func WaitForInstanceStatus(
 		}

 		if latest.Status == "ERROR" {
-			return false, fmt.Errorf("Instance in ERROR state")
+			return false, fmt.Errorf("instance in ERROR state")
 		}

 		return false, nil

diff --git a/internal/acceptance/openstack/identity/v3/domains_test.go b/internal/acceptance/openstack/identity/v3/domains_test.go
@@ -35,7 +35,7 @@ func TestDomainsList(t *testing.T) {
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)

-	var iTrue bool = true
+	var iTrue = true
 	listOpts := domains.ListOpts{
 		Enabled: &iTrue,
 	}
@@ -78,7 +78,7 @@ func TestDomainsCRUD(t *testing.T) {
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)

-	var iTrue bool = true
+	var iTrue = true
 	var description = "Testing Domain"
 	createOpts := domains.CreateOpts{
 		Description: description,
@@ -93,7 +93,7 @@ func TestDomainsCRUD(t *testing.T) {

 	th.AssertEquals(t, domain.Description, description)

-	var iFalse bool = false
+	var iFalse = false
 	description = ""
 	updateOpts := domains.UpdateOpts{
 		Description: &description,

diff --git a/internal/acceptance/openstack/identity/v3/oauth1_test.go b/internal/acceptance/openstack/identity/v3/oauth1_test.go
@@ -215,7 +215,7 @@ func oauth1MethodTest(t *testing.T, client *gophercloud.ServiceClient, consumer
 		tokens.Token
 		oauth1.TokenExt
 	}
-	tokenRes := tokens.Get(context.TODO(), newClient, newClient.ProviderClient.TokenID)
+	tokenRes := tokens.Get(context.TODO(), newClient, newClient.TokenID)
 	err = tokenRes.ExtractInto(&token)
 	th.AssertNoErr(t, err)
 	oauth1Roles, err := tokenRes.ExtractRoles()

diff --git a/internal/acceptance/openstack/identity/v3/projects_test.go b/internal/acceptance/openstack/identity/v3/projects_test.go
@@ -35,7 +35,7 @@ func TestProjectsList(t *testing.T) {
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)

-	var iTrue bool = true
+	var iTrue = true
 	listOpts := projects.ListOpts{
 		Enabled: &iTrue,
 	}

diff --git a/internal/acceptance/openstack/identity/v3/users_test.go b/internal/acceptance/openstack/identity/v3/users_test.go
@@ -20,7 +20,7 @@ func TestUsersList(t *testing.T) {
 	client, err := clients.NewIdentityV3Client()
 	th.AssertNoErr(t, err)

-	var iTrue bool = true
+	var iTrue = true
 	listOpts := users.ListOpts{
 		Enabled: &iTrue,
 	}

diff --git a/internal/acceptance/openstack/keymanager/v1/keymanager.go b/internal/acceptance/openstack/keymanager/v1/keymanager.go
@@ -646,7 +646,7 @@ func DeleteSecret(t *testing.T, client *gophercloud.ServiceClient, id string) {
 func ParseID(ref string) (string, error) {
 	parts := strings.Split(ref, "/")
 	if len(parts) < 2 {
-		return "", fmt.Errorf("Could not parse %s", ref)
+		return "", fmt.Errorf("could not parse %s", ref)
 	}

 	return parts[len(parts)-1], nil
@@ -757,7 +757,7 @@ func WaitForOrder(client *gophercloud.ServiceClient, orderID string) error {
 		}

 		if order.Status == "ERROR" {
-			return false, fmt.Errorf("Order %s in ERROR state", orderID)
+			return false, fmt.Errorf("order %s in ERROR state", orderID)
 		}

 		return false, nil

diff --git a/internal/acceptance/openstack/loadbalancer/v2/loadbalancer.go b/internal/acceptance/openstack/loadbalancer/v2/loadbalancer.go
@@ -47,7 +47,7 @@ func CreateListener(t *testing.T, client *gophercloud.ServiceClient, lb *loadbal
 	t.Logf("Successfully created listener %s", listenerName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return listener, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return listener, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, listener.Name, listenerName)
@@ -99,7 +99,7 @@ func CreateListenerHTTP(t *testing.T, client *gophercloud.ServiceClient, lb *loa
 	t.Logf("Successfully created listener %s", listenerName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return listener, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return listener, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, listener.Name, listenerName)
@@ -318,7 +318,7 @@ func CreateMember(t *testing.T, client *gophercloud.ServiceClient, lb *loadbalan
 	t.Logf("Successfully created member %s", memberName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return member, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return member, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, member.Name, memberName)
@@ -352,7 +352,7 @@ func CreateMonitor(t *testing.T, client *gophercloud.ServiceClient, lb *loadbala
 	t.Logf("Successfully created monitor: %s", monitorName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return monitor, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return monitor, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, monitor.Name, monitorName)
@@ -391,7 +391,7 @@ func CreatePool(t *testing.T, client *gophercloud.ServiceClient, lb *loadbalance
 	t.Logf("Successfully created pool %s", poolName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return pool, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return pool, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, pool.Name, poolName)
@@ -428,7 +428,7 @@ func CreatePoolHTTP(t *testing.T, client *gophercloud.ServiceClient, lb *loadbal
 	t.Logf("Successfully created pool %s", poolName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return pool, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return pool, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, pool.Name, poolName)
@@ -466,7 +466,7 @@ func CreateL7Policy(t *testing.T, client *gophercloud.ServiceClient, listener *l
 	t.Logf("Successfully created l7 policy %s", policyName)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return policy, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return policy, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, policy.Name, policyName)
@@ -498,7 +498,7 @@ func CreateL7Rule(t *testing.T, client *gophercloud.ServiceClient, policyID stri
 	t.Logf("Successfully created l7 rule for policy %s", policyID)

 	if err := WaitForLoadBalancerState(client, lb.ID, "ACTIVE"); err != nil {
-		return rule, fmt.Errorf("Timed out waiting for loadbalancer to become active: %s", err)
+		return rule, fmt.Errorf("timed out waiting for loadbalancer to become active: %s", err)
 	}

 	th.AssertEquals(t, rule.RuleType, string(l7policies.TypePath))
@@ -686,7 +686,7 @@ func WaitForLoadBalancerState(client *gophercloud.ServiceClient, lbID, status st
 		}

 		if current.ProvisioningStatus == "ERROR" {
-			return false, fmt.Errorf("Load balancer is in ERROR state")
+			return false, fmt.Errorf("load balancer is in ERROR state")
 		}

 		return false, nil