Adapt to path changes in Gophercloud v2

gophercloud · May 27, 2024 · 355fdce · 355fdce
1 parent f79c3b8
commit 355fdce
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 100 deletions.
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version:
-          - "1.21"
+          - "1.22"
 
     env:
       GO111MODULE: "on"

diff --git a/go.mod b/go.mod
@@ -1,14 +1,12 @@
 module github.com/gophercloud/utils/v2
 
+go 1.22
+
 require (
-	github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2
+	github.com/gophercloud/gophercloud/v2 v2.0.0-rc.1
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/mitchellh/go-homedir v1.1.0
 	golang.org/x/sys v0.20.0
 	golang.org/x/text v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 )
-
-go 1.21.6
-
-toolchain go1.21.7
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2 h1:JWv6L7eg3+aIS57n11YlVvtn1pVCKpVlMo24ANj/OVc=
-github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2/go.mod h1:Sy5GHwY4iazyaRf94rzL/VxJToVWn8WnIH+1cXqoAks=
+github.com/gophercloud/gophercloud/v2 v2.0.0-rc.1 h1:B0J9VVGlNuMF/743KMVFScDB8M2Bd5N1KlsEZykSBlc=
+github.com/gophercloud/gophercloud/v2 v2.0.0-rc.1/go.mod h1:cwPW9cbJmfBt1c7o/yzXuNjwonhWA+F9Zw8LNQzd3Zk=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=

diff --git a/openstack/blockstorage/v1/snapshots/utils.go b/openstack/blockstorage/v1/snapshots/utils.go
diff --git a/openstack/blockstorage/v1/volumes/utils.go b/openstack/blockstorage/v1/volumes/utils.go
diff --git a/openstack/blockstorage/v3/availabilityzones/utils.go b/openstack/blockstorage/v3/availabilityzones/utils.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/extensions/availabilityzones"
+	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/availabilityzones"
 )
 
 // ListAvailableAvailabilityZones is a convenience function that return a slice of available Availability Zones.

diff --git a/.../blockstorage/extensions/backups/utils.go → openstack/blockstorage/v3/backups/utils.go b/.../blockstorage/extensions/backups/utils.go → openstack/blockstorage/v3/backups/utils.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/extensions/backups"
+	"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/backups"
 )
 
 // IDFromName is a convenience function that returns a backup's ID given its

diff --git a/openstack/compute/v2/availabilityzones/utils.go b/openstack/compute/v2/availabilityzones/utils.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones"
+	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/availabilityzones"
 )
 
 // ListAvailableAvailabilityZones is a convenience function that return a slice of available Availability Zones.

diff --git a/openstack/imageservice/v2/images/utils.go → openstack/image/v2/images/utils.go b/openstack/imageservice/v2/images/utils.go → openstack/image/v2/images/utils.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/gophercloud/gophercloud/v2"
-	"github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
 )
 
 // IDFromName is a convenience function that returns an image's ID given its
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ jobs: @@
           fail-fast: false
           matrix:
             go-version:
-              - "1.21"
+              - "1.22"
         env:
           GO111MODULE: "on"
@@ Expand Down @@