Adjust regexps and do another pass.
diff --git a/openstack/identity/v2/extensions/admin/roles/requests.go b/openstack/identity/v2/extensions/admin/roles/requests.go
index 152031a..bbdf76a 100644
--- a/openstack/identity/v2/extensions/admin/roles/requests.go
+++ b/openstack/identity/v2/extensions/admin/roles/requests.go
@@ -1,7 +1,6 @@
package roles
import (
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -21,9 +20,8 @@
func AddUserRole(client *gophercloud.ServiceClient, tenantID, userID, roleID string) UserRoleResult {
var result UserRoleResult
- _, result.Err = perigee.Request("PUT", userRoleURL(client, tenantID, userID, roleID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{200, 201},
+ _, result.Err = client.Request("PUT", userRoleURL(client, tenantID, userID, roleID), gophercloud.RequestOpts{
+ OkCodes: []int{200, 201},
})
return result
@@ -35,9 +33,8 @@
func DeleteUserRole(client *gophercloud.ServiceClient, tenantID, userID, roleID string) UserRoleResult {
var result UserRoleResult
- _, result.Err = perigee.Request("DELETE", userRoleURL(client, tenantID, userID, roleID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, result.Err = client.Request("DELETE", userRoleURL(client, tenantID, userID, roleID), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return result
diff --git a/openstack/identity/v2/users/requests.go b/openstack/identity/v2/users/requests.go
index 045d9b3..2afe62a 100644
--- a/openstack/identity/v2/users/requests.go
+++ b/openstack/identity/v2/users/requests.go
@@ -3,7 +3,6 @@
import (
"errors"
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -104,10 +103,9 @@
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var result GetResult
- _, result.Err = perigee.Request("GET", ResourceURL(client, id), perigee.Options{
- Results: &result.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{200},
+ _, result.Err = client.Request("GET", ResourceURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
@@ -148,11 +146,10 @@
func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) UpdateResult {
var result UpdateResult
- _, result.Err = perigee.Request("PUT", ResourceURL(client, id), perigee.Options{
- Results: &result.Body,
- ReqBody: opts.ToUserUpdateMap(),
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{200},
+ _, result.Err = client.Request("PUT", ResourceURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ JSONBody: opts.ToUserUpdateMap(),
+ OkCodes: []int{200},
})
return result
@@ -162,9 +159,8 @@
func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
var result DeleteResult
- _, result.Err = perigee.Request("DELETE", ResourceURL(client, id), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, result.Err = client.Request("DELETE", ResourceURL(client, id), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return result
diff --git a/openstack/identity/v3/endpoints/requests.go b/openstack/identity/v3/endpoints/requests.go
index 2cf6b34..3e09b2a 100644
--- a/openstack/identity/v3/endpoints/requests.go
+++ b/openstack/identity/v3/endpoints/requests.go
@@ -1,7 +1,6 @@
package endpoints
import (
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -112,11 +111,10 @@
reqBody.Endpoint.ServiceID = gophercloud.MaybeString(opts.ServiceID)
var result UpdateResult
- _, result.Err = perigee.Request("PATCH", endpointURL(client, endpointID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &result.Body,
- OkCodes: []int{200},
+ _, result.Err = client.Request("PATCH", endpointURL(client, endpointID), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
}
@@ -124,9 +122,8 @@
// Delete removes an endpoint from the service catalog.
func Delete(client *gophercloud.ServiceClient, endpointID string) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", endpointURL(client, endpointID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, res.Err = client.Request("DELETE", endpointURL(client, endpointID), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return res
}
diff --git a/openstack/identity/v3/services/requests.go b/openstack/identity/v3/services/requests.go
index a3534e5..c6820c7 100644
--- a/openstack/identity/v3/services/requests.go
+++ b/openstack/identity/v3/services/requests.go
@@ -1,7 +1,6 @@
package services
import (
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -52,10 +51,9 @@
// Get returns additional information about a service, given its ID.
func Get(client *gophercloud.ServiceClient, serviceID string) GetResult {
var result GetResult
- _, result.Err = perigee.Request("GET", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- Results: &result.Body,
- OkCodes: []int{200},
+ _, result.Err = client.Request("GET", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
}
@@ -69,11 +67,10 @@
req := request{Type: serviceType}
var result UpdateResult
- _, result.Err = perigee.Request("PATCH", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- ReqBody: &req,
- Results: &result.Body,
- OkCodes: []int{200},
+ _, result.Err = client.Request("PATCH", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ JSONBody: &req,
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
}
@@ -82,9 +79,8 @@
// It either deletes all associated endpoints, or fails until all endpoints are deleted.
func Delete(client *gophercloud.ServiceClient, serviceID string) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, res.Err = client.Request("DELETE", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return res
}