Use the ServiceClient to generate URLs.
Add OkCodes to all of the perigee requests.
diff --git a/openstack/storage/v1/containers/requests.go b/openstack/storage/v1/containers/requests.go
index d2cec0b..0db691c 100644
--- a/openstack/storage/v1/containers/requests.go
+++ b/openstack/storage/v1/containers/requests.go
@@ -28,10 +28,11 @@
contentType = "text/plain"
}
- url := c.GetAccountURL() + query
+ url := getAccountURL(c) + query
resp, err := perigee.Request("GET", url, perigee.Options{
MoreHeaders: h,
Accept: contentType,
+ OkCodes: []int{200, 204},
})
return &resp.HttpResponse, err
}
@@ -50,9 +51,10 @@
h["X-Container-Meta-"+k] = v
}
- url := c.GetContainerURL(opts.Name)
- _, err = perigee.Request("PUT", url, perigee.Options{
+ url := getContainerURL(c, opts.Name)
+ _, err := perigee.Request("PUT", url, perigee.Options{
MoreHeaders: h,
+ OkCodes: []int{201, 204},
})
if err == nil {
ci = Container{
@@ -88,9 +90,10 @@
h["X-Container-Meta-"+k] = v
}
- url := c.GetContainerURL(opts.Name)
- _, err = perigee.Request("POST", url, perigee.Options{
+ url := getContainerURL(c, opts.Name)
+ _, err := perigee.Request("POST", url, perigee.Options{
MoreHeaders: h,
+ OkCodes: []int{204},
})
return err
}
@@ -104,9 +107,10 @@
h["X-Container-Meta-"+k] = v
}
- url := c.GetContainerURL(opts.Name)
+ url := getContainerURL(c, opts.Name)
resp, err := perigee.Request("HEAD", url, perigee.Options{
MoreHeaders: h,
+ OkCodes: []int{204},
})
return &resp.HttpResponse, err
}
diff --git a/openstack/storage/v1/containers/urls.go b/openstack/storage/v1/containers/urls.go
new file mode 100644
index 0000000..4084bcc
--- /dev/null
+++ b/openstack/storage/v1/containers/urls.go
@@ -0,0 +1,13 @@
+package containers
+
+import "github.com/rackspace/gophercloud"
+
+// getAccountURL returns the URI used to list Containers.
+func getAccountURL(c *gophercloud.ServiceClient) string {
+ return c.Endpoint
+}
+
+// getContainerURL returns the URI for making Container requests.
+func getContainerURL(c *gophercloud.ServiceClient, container string) string {
+ return c.ServiceURL(container)
+}