summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--account.go6
-rw-r--r--bulk.go4
-rw-r--r--container.go10
-rw-r--r--iterator.go2
-rw-r--r--object.go12
-rw-r--r--object_test.go4
-rw-r--r--request.go2
7 files changed, 20 insertions, 20 deletions
diff --git a/account.go b/account.go
index d783baf..12d4d75 100644
--- a/account.go
+++ b/account.go
@@ -105,7 +105,7 @@ func (a *Account) Headers(ctx context.Context) (AccountHeaders, error) {
}
resp, err := Request{
- Method: "HEAD",
+ Method: http.MethodHead,
ExpectStatusCodes: []int{204},
}.Do(ctx, a.backend)
if err != nil {
@@ -136,7 +136,7 @@ func (a *Account) Invalidate() {
// A successful POST request implies Invalidate() since it may change metadata.
func (a *Account) Update(ctx context.Context, headers AccountHeaders, opts *RequestOptions) error {
resp, err := Request{
- Method: "POST",
+ Method: http.MethodPost,
Options: cloneRequestOptions(opts, headers.Headers),
ExpectStatusCodes: []int{204},
}.Do(ctx, a.backend)
@@ -153,7 +153,7 @@ func (a *Account) Update(ctx context.Context, headers AccountHeaders, opts *Requ
// A successful PUT request implies Invalidate() since it may change metadata.
func (a *Account) Create(ctx context.Context, opts *RequestOptions) error {
resp, err := Request{
- Method: "PUT",
+ Method: http.MethodPut,
Options: opts,
ExpectStatusCodes: []int{201, 202},
DrainResponseBody: true,
diff --git a/bulk.go b/bulk.go
index a21f199..7c08345 100644
--- a/bulk.go
+++ b/bulk.go
@@ -76,7 +76,7 @@ func (a *Account) BulkUpload(ctx context.Context, uploadPath string, format Bulk
}
req := Request{
- Method: "PUT",
+ Method: http.MethodPut,
Body: contents,
Options: cloneRequestOptions(opts, nil),
ExpectStatusCodes: []int{200},
@@ -259,7 +259,7 @@ func (a *Account) bulkDeleteSingle(ctx context.Context, objects []*Object, conta
// account.Capabilities.BulkDelete.MaximumDeletesPerRequest`.
func (a *Account) bulkDelete(ctx context.Context, names []string, opts *RequestOptions) (numDeleted, numNotFound int, err error) {
req := Request{
- Method: "DELETE",
+ Method: http.MethodDelete,
Body: strings.NewReader(strings.Join(names, "\n") + "\n"),
Options: cloneRequestOptions(opts, nil),
ExpectStatusCodes: []int{200},
diff --git a/container.go b/container.go
index 5d03000..b54a8f9 100644
--- a/container.go
+++ b/container.go
@@ -85,7 +85,7 @@ func (c *Container) Headers(ctx context.Context) (ContainerHeaders, error) {
}
resp, err := Request{
- Method: "HEAD",
+ Method: http.MethodHead,
ContainerName: c.name,
ExpectStatusCodes: []int{204},
}.Do(ctx, c.a.backend)
@@ -111,7 +111,7 @@ func (c *Container) Headers(ctx context.Context) (ContainerHeaders, error) {
// A successful POST request implies Invalidate() since it may change metadata.
func (c *Container) Update(ctx context.Context, headers ContainerHeaders, opts *RequestOptions) error {
resp, err := Request{
- Method: "POST",
+ Method: http.MethodPost,
ContainerName: c.name,
Options: cloneRequestOptions(opts, headers.Headers),
ExpectStatusCodes: []int{204},
@@ -131,7 +131,7 @@ func (c *Container) Update(ctx context.Context, headers ContainerHeaders, opts *
// A successful PUT request implies Invalidate() since it may change metadata.
func (c *Container) Create(ctx context.Context, opts *RequestOptions) error {
resp, err := Request{
- Method: "PUT",
+ Method: http.MethodPut,
ContainerName: c.name,
Options: opts,
ExpectStatusCodes: []int{201, 202},
@@ -154,7 +154,7 @@ func (c *Container) Create(ctx context.Context, opts *RequestOptions) error {
// A successful DELETE request implies Invalidate().
func (c *Container) Delete(ctx context.Context, opts *RequestOptions) error {
resp, err := Request{
- Method: "DELETE",
+ Method: http.MethodDelete,
ContainerName: c.name,
Options: opts,
ExpectStatusCodes: []int{204},
@@ -183,7 +183,7 @@ func (c *Container) Invalidate() {
// container, err := account.Container("documents").EnsureExists()
func (c *Container) EnsureExists(ctx context.Context) (*Container, error) {
resp, err := Request{
- Method: "PUT",
+ Method: http.MethodPut,
ContainerName: c.name,
ExpectStatusCodes: []int{201, 202},
DrainResponseBody: true,
diff --git a/iterator.go b/iterator.go
index 3b26a1d..97ab665 100644
--- a/iterator.go
+++ b/iterator.go
@@ -78,7 +78,7 @@ type iteratorBase struct {
func (b *iteratorBase) request(limit int, detailed bool) Request {
r := Request{
- Method: "GET",
+ Method: http.MethodGet,
ContainerName: b.i.getContainerName(),
Options: cloneRequestOptions(b.i.getOptions(), nil),
}
diff --git a/object.go b/object.go
index 223c1a3..a09b18c 100644
--- a/object.go
+++ b/object.go
@@ -126,7 +126,7 @@ func (o *Object) Headers(ctx context.Context) (ObjectHeaders, error) {
func (o *Object) fetchHeaders(ctx context.Context, opts *RequestOptions) (*ObjectHeaders, error) {
resp, err := Request{
- Method: "HEAD",
+ Method: http.MethodHead,
ContainerName: o.c.name,
ObjectName: o.name,
Options: opts,
@@ -152,7 +152,7 @@ func (o *Object) fetchHeaders(ctx context.Context, opts *RequestOptions) (*Objec
// A successful POST request implies Invalidate() since it may change metadata.
func (o *Object) Update(ctx context.Context, headers ObjectHeaders, opts *RequestOptions) error {
resp, err := Request{
- Method: "POST",
+ Method: http.MethodPost,
ContainerName: o.c.name,
ObjectName: o.name,
Options: cloneRequestOptions(opts, headers.Headers),
@@ -263,7 +263,7 @@ func (o *Object) Upload(ctx context.Context, content io.Reader, opts *UploadOpti
}
resp, err := Request{
- Method: "PUT",
+ Method: http.MethodPut,
ContainerName: o.c.name,
ObjectName: o.name,
Options: ropts,
@@ -415,7 +415,7 @@ func (o *Object) Delete(ctx context.Context, opts *DeleteOptions, ropts *Request
}
resp, err := Request{
- Method: "DELETE",
+ Method: http.MethodDelete,
ContainerName: o.c.name,
ObjectName: o.name,
Options: ropts,
@@ -455,7 +455,7 @@ func (o *Object) Invalidate() {
// object results in undefined behavior.
func (o *Object) Download(ctx context.Context, opts *RequestOptions) DownloadedObject {
resp, err := Request{
- Method: "GET",
+ Method: http.MethodGet,
ContainerName: o.c.name,
ObjectName: o.name,
Options: opts,
@@ -641,7 +641,7 @@ func (o *Object) URL() (string, error) {
// err := c.Update(ctx, hdr, nil)
//
// //...we can use it to generate temporary URLs.
-// url := o.TempURL(ctx, key, "GET", time.Now().Add(10 * time.Minute))
+// url := o.TempURL(ctx, key, http.MethodGet, time.Now().Add(10 * time.Minute))
// resp, err := http.Get(url)
// //This time, resp.StatusCode == 200 because the URL includes a token.
func (o *Object) TempURL(ctx context.Context, key, method string, expires time.Time) (string, error) {
diff --git a/object_test.go b/object_test.go
index e614174..c0bb168 100644
--- a/object_test.go
+++ b/object_test.go
@@ -67,7 +67,7 @@ func TestObjectTempURLSha1Only(t *testing.T) {
})
must(t, err)
- actualURL, err := account.Container("foo").Object("bar").TempURL(context.TODO(), "supersecretkey", "GET", time.Unix(1e9, 0))
+ actualURL, err := account.Container("foo").Object("bar").TempURL(context.TODO(), "supersecretkey", http.MethodGet, time.Unix(1e9, 0))
must(t, err)
expectedURL := "https://example.com/v1/AUTH_example/foo/bar?temp_url_sig=ed44d92005345aee463c884d76d4850ef6d2778d&temp_url_expires=1000000000"
@@ -82,7 +82,7 @@ func TestObjectTempURL(t *testing.T) {
})
must(t, err)
- actualURL, err := account.Container("foo").Object("bar").TempURL(context.TODO(), "supersecretkey", "GET", time.Unix(1e9, 0))
+ actualURL, err := account.Container("foo").Object("bar").TempURL(context.TODO(), "supersecretkey", http.MethodGet, time.Unix(1e9, 0))
must(t, err)
expectedURL := "https://example.com/v1/AUTH_example/foo/bar?temp_url_sig=5fc94a988b502d83e88863774812636ef0133b8aae04b20366fd906bff41189f&temp_url_expires=1000000000"
diff --git a/request.go b/request.go
index 52b457d..2ca98c0 100644
--- a/request.go
+++ b/request.go
@@ -59,7 +59,7 @@ func cloneRequestOptions(orig *RequestOptions, additional Headers) *RequestOptio
// Request contains the parameters that can be set in a request to the Swift API.
type Request struct {
- Method string // "GET", "HEAD", "PUT", "POST" or "DELETE"
+ Method string // e.g. http.MethodGet, or a string literal like "COPY"
ContainerName string // empty for requests on accounts
ObjectName string // empty for requests on accounts/containers
Options *RequestOptions
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-03 06:29:29 +0000