Skip to content

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

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
wing328 merged 2 commits into from
Jul 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa8d49b
Update AWS Go SDK from v1 to v2 in Go client templates (#3)
Copilot Jul 29, 2025
50cc0e3
Update indenting
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
Copy Markdown
Member

@wing328 wing328 Jul 29, 2025

Choose a reason for hiding this comment

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

thanks for the pr but looks like this line is not indented correctly

Copy link
Copy Markdown
Contributor Author

@dennismouwen-eye dennismouwen-eye Jul 29, 2025

Choose a reason for hiding this comment

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

Updated!

"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