Skip to content

Update AWS Go SDK from v1 to v2 in Go client templates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dennismouwen-eye merged 14 commits into from
Jul 29, 2025
Merged

Update AWS Go SDK from v1 to v2 in Go client templates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f8840d0
Initial plan
Copilot Jul 28, 2025
339c602
Update AWS Go SDK from v1 to v2 in Go client templates
Copilot Jul 28, 2025
267e9fb
Final validation: AWS SDK v2 integration working correctly
Copilot Jul 28, 2025
0586cd0
Fix AWS v4 signature implementation: retrieve credentials properly fr…
Copilot Jul 28, 2025
c39359a
Fix AWS v4 signature payload hash: properly compute SHA-256 hash for …
Copilot Jul 28, 2025
86979f8
Implement proper payload hashing
dennismouwen-eye Jul 28, 2025
54d1720
Merge remote-tracking branch 'origin/copilot/fix-2' into copilot/fix-2
dennismouwen-eye Jul 28, 2025
baee744
Revert go.sum file to original state as requested
Copilot Jul 28, 2025
96cd6ac
Revert go.mod and rename import alias from v4 back to awsv4
Copilot Jul 28, 2025
0405017
Revert go.mod file to original state removing all changes
Copilot Jul 29, 2025
1e9712b
Rename credentials import to awscredentials alias as requested
Copilot Jul 29, 2025
da0beda
Fix spacing
dennismouwen-eye Jul 29, 2025
c5ae6b8
Fix credentials and imports
dennismouwen-eye Jul 29, 2025
193fecb
Update aws sdk to latest version
dennismouwen-eye Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions modules/openapi-generator/src/main/resources/go/client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ import (
"golang.org/x/oauth2"
{{/hasOAuthMethods}}
{{#withAWSV4Signature}}
awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4"
awscredentials "github.com/aws/aws-sdk-go/aws/credentials"
awsv4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
awscredentials "github.com/aws/aws-sdk-go-v2/credentials"
"crypto/sha256"
Copy link

Copilot AI Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation uses spaces instead of tabs, which is inconsistent with the surrounding Go code that uses tabs. Go convention and gofmt typically use tabs for indentation.

Suggested change
"crypto/sha256"
"crypto/sha256"

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new imports 'crypto/sha256' and 'encoding/hex' are only used when withAWSV4Signature is enabled, but they are included unconditionally. Consider moving these imports inside the conditional block or adding appropriate mustache conditionals to only include them when needed.

Suggested change
"crypto/sha256"
"crypto/sha256"

Copilot uses AI. Check for mistakes.
"encoding/hex"
{{/withAWSV4Signature}}
)

Expand Down Expand Up @@ -458,13 +460,10 @@ func (c *APIClient) prepareRequest(
{{#withAWSV4Signature}}
// AWS Signature v4 Authentication
if auth, ok := ctx.Value(ContextAWSv4).(AWSv4); ok {
creds := awscredentials.NewStaticCredentials(auth.AccessKey, auth.SecretKey, auth.SessionToken)
signer := awsv4.NewSigner(creds)
var reader *strings.Reader
if body == nil {
reader = strings.NewReader("")
} else {
reader = strings.NewReader(body.String())
credsProvider := awscredentials.NewStaticCredentialsProvider(auth.AccessKey, auth.SecretKey, auth.SessionToken)
creds, err := credsProvider.Retrieve(ctx)
if err != nil {
return nil, err
}

// Define default values for region and service to maintain backward compatibility
Expand All @@ -477,8 +476,22 @@ func (c *APIClient) prepareRequest(
service = "oapi"
}

timestamp := time.Now()
_, err := signer.Sign(localVarRequest, reader, service, region, timestamp)
// Compute payload hash from the request body
var payloadHash string
if body == nil {
// Empty body
hash := sha256.Sum256([]byte(""))
payloadHash = hex.EncodeToString(hash[:])
} else {
// Hash the actual body content
bodyBytes := []byte(body.String())
hash := sha256.Sum256(bodyBytes)
payloadHash = hex.EncodeToString(hash[:])
}

// Sign the request with the computed payload hash
signer := awsv4.NewSigner()
err = signer.SignHTTP(ctx, creds, localVarRequest, payloadHash, service, region, time.Now())
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/go/go.mod.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
golang.org/x/oauth2 v0.27.0
{{/hasOAuthMethods}}
{{#withAWSV4Signature}}
github.com/aws/aws-sdk-go v1.34.14
github.com/aws/aws-sdk-go-v2 v1.37.0
{{/withAWSV4Signature}}
{{#importValidator}}
gopkg.in/validator.v2 v2.0.1
Expand Down
Loading