Skip to content

Commit

Permalink
Fixup golint for s3 signer
Browse files Browse the repository at this point in the history
  • Loading branch information
jasdel committed Sep 10, 2021
1 parent d8ccbac commit 5990156
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
8 changes: 4 additions & 4 deletions service/s3/internal/customizations/process_arn_resource.go
Expand Up @@ -413,8 +413,8 @@ func buildS3ObjectLambdaAccessPointRequest(ctx context.Context, options accesspo
}

func buildMultiRegionAccessPointsRequest(ctx context.Context, options accesspointOptions) (context.Context, error) {
const s3_global_label = "s3-global."
const accesspoint_label = "accesspoint."
const s3GlobalLabel = "s3-global."
const accesspointLabel = "accesspoint."

tv := options.resource
req := options.request
Expand Down Expand Up @@ -456,7 +456,7 @@ func buildMultiRegionAccessPointsRequest(ctx context.Context, options accesspoin
return ctx, fmt.Errorf("Error determining dns suffix from arn partition, %w", err)
}
// set url as per partition
endpoint.URL = scheme[0] + "://" + s3_global_label + dnsSuffix
endpoint.URL = scheme[0] + "://" + s3GlobalLabel + dnsSuffix

// assign resolved endpoint url to request url
req.URL, err = url.Parse(endpoint.URL)
Expand All @@ -465,7 +465,7 @@ func buildMultiRegionAccessPointsRequest(ctx context.Context, options accesspoin
}

// build access point host prefix
accessPointHostPrefix := tv.AccessPointName + "." + accesspoint_label
accessPointHostPrefix := tv.AccessPointName + "." + accesspointLabel

// add host prefix to url
req.URL.Host = accessPointHostPrefix + req.URL.Host
Expand Down
13 changes: 7 additions & 6 deletions service/s3/internal/customizations/signer_wrapper.go
Expand Up @@ -3,6 +3,7 @@ package customizations
import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
"github.com/aws/aws-sdk-go-v2/service/s3/internal/v4a"
Expand Down Expand Up @@ -110,10 +111,10 @@ func (s *SignHTTPRequestMiddleware) HandleFinalize(ctx context.Context, in middl
// present, this provided middleware will be swapped. Otherwise the middleware will be added at the tail of the
// finalize step.
func RegisterSigningMiddleware(stack *middleware.Stack, signingMiddleware *SignHTTPRequestMiddleware) (err error) {
const signingId = "Signing"
_, present := stack.Finalize.Get(signingId)
const signedID = "Signing"
_, present := stack.Finalize.Get(signedID)
if present {
_, err = stack.Finalize.Swap(signingId, signingMiddleware)
_, err = stack.Finalize.Swap(signedID, signingMiddleware)
} else {
err = stack.Finalize.Add(signingMiddleware, middleware.After)
}
Expand Down Expand Up @@ -201,10 +202,10 @@ func (p *PresignHTTPRequestMiddleware) HandleFinalize(
// present, this provided middleware will be swapped. Otherwise the middleware will be added at the tail of the
// finalize step.
func RegisterPreSigningMiddleware(stack *middleware.Stack, signingMiddleware *PresignHTTPRequestMiddleware) (err error) {
const signingId = "PresignHTTPRequest"
_, present := stack.Finalize.Get(signingId)
const signedID = "PresignHTTPRequest"
_, present := stack.Finalize.Get(signedID)
if present {
_, err = stack.Finalize.Swap(signingId, signingMiddleware)
_, err = stack.Finalize.Swap(signedID, signingMiddleware)
} else {
err = stack.Finalize.Add(signingMiddleware, middleware.After)
}
Expand Down
2 changes: 2 additions & 0 deletions service/s3/internal/v4a/credentials.go
Expand Up @@ -134,6 +134,8 @@ func (s *SymmetricCredentialAdaptor) retrieveFromSymmetricProvider(ctx context.C
return credentials, nil
}

// CredentialsProvider is the interface for a provider to retrieve credentials
// to sign requests with.
type CredentialsProvider interface {
RetrievePrivateKey(context.Context) (Credentials, error)
}
6 changes: 3 additions & 3 deletions service/s3/internal/v4a/middleware.go
Expand Up @@ -94,10 +94,10 @@ func hasCredentialProvider(p CredentialsProvider) bool {
// present, this provided middleware will be swapped. Otherwise the middleware will be added at the tail of the
// finalize step.
func RegisterSigningMiddleware(stack *middleware.Stack, signingMiddleware *SignHTTPRequestMiddleware) (err error) {
const signingId = "Signing"
_, present := stack.Finalize.Get(signingId)
const signedID = "Signing"
_, present := stack.Finalize.Get(signedID)
if present {
_, err = stack.Finalize.Swap(signingId, signingMiddleware)
_, err = stack.Finalize.Swap(signedID, signingMiddleware)
} else {
err = stack.Finalize.Add(signingMiddleware, middleware.After)
}
Expand Down
4 changes: 2 additions & 2 deletions service/s3/internal/v4a/v4a_test.go
Expand Up @@ -122,7 +122,7 @@ func TestPresignHTTP(t *testing.T) {
query.Set("X-Amz-Expires", "18000")
req.URL.RawQuery = query.Encode()

signedUrl, _, err := signer.PresignHTTP(context.Background(), key, req, EmptyStringSHA256, "dynamodb", []string{"us-east-1"}, time.Unix(0, 0))
signedURL, _, err := signer.PresignHTTP(context.Background(), key, req, EmptyStringSHA256, "dynamodb", []string{"us-east-1"}, time.Unix(0, 0))
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
Expand All @@ -134,7 +134,7 @@ func TestPresignHTTP(t *testing.T) {
expectedStrToSignHash := "d7ffbd2fab644384c056957e6ac38de4ae68246764b5f5df171b3824153b6397"
expectedTarget := "prefix.Operation"

signedReq, err := url.Parse(signedUrl)
signedReq, err := url.Parse(signedURL)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
Expand Down

0 comments on commit 5990156

Please sign in to comment.