Skip to content
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

use aws sdk auth token gen #5

Merged
merged 2 commits into from
Jan 7, 2025
Merged

use aws sdk auth token gen #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15e026
use aws sdk token gen
Jan 6, 2025
25a4b49
Update example.go
vic-tsang Jan 6, 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
39 changes: 5 additions & 34 deletions go/pgx/example.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ package main
import (
"context"
"fmt"
"net/http"
"os"
"strconv"
"strings"
"time"

_ "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/feature/dsql/auth"

"github.com/aws/aws-sdk-go-v2/config"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
Expand All @@ -32,38 +30,11 @@ func GenerateDbConnectAdminAuthToken(clusterEndpoint string, region string, acti
return "", err
}

creds, err := cfg.Credentials.Retrieve(ctx)
if err != nil {
return "", err
}

// The scheme is arbitrary and is only needed because validation of the URL requires one.
endpoint := "https://" + clusterEndpoint
req, err := http.NewRequest("GET", endpoint, nil)
token, err := auth.GenerateDBConnectAdminAuthToken(ctx, clusterEndpoint, region, cfg.Credentials)
if err != nil {
return "", err
}
values := req.URL.Query()
values.Set("Action", action)

// Set an expiry time for 15 minutes
values.Set("X-Amz-Expires", strconv.Itoa(15*60))
req.URL.RawQuery = values.Encode()

signer := v4.NewSigner()

// The payloadHash is the hex encoded SHA-256 hash of the request payload, and
// must be provided. Even if the request has no payload (aka body). If the
// request has no payload you should use the hex encoded SHA-256 of an empty
// string as the payloadHash value.
// e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855

uri, _, err := signer.PresignHTTP(ctx, creds, req, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "dsql", region, time.Now())
if err != nil {
panic(err)
}

token := uri[len("https://"):]
return token, nil
}

Expand Down Expand Up @@ -104,6 +75,8 @@ func example(clusterEndpoint string, region string) error {
return err
}

defer conn.Close(ctx)

// Create owner table
_, err = conn.Exec(ctx, `
CREATE TABLE IF NOT EXISTS owner (
Expand Down Expand Up @@ -143,8 +116,6 @@ func example(clusterEndpoint string, region string) error {
return err
}

defer conn.Close(ctx)

return nil
}

Expand Down
1 change: 1 addition & 0 deletions go/pgx/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (

require (
github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect
github.com/aws/aws-sdk-go-v2/feature/dsql/auth v1.0.1
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go/pgx/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ github.com/aws/aws-sdk-go-v2/config v1.28.7 h1:GduUnoTXlhkgnxTD93g1nv4tVPILbdNQO
github.com/aws/aws-sdk-go-v2/config v1.28.7/go.mod h1:vZGX6GVkIE8uECSUHB6MWAUsd4ZcG2Yq/dMa4refR3M=
github.com/aws/aws-sdk-go-v2/credentials v1.17.48 h1:IYdLD1qTJ0zanRavulofmqut4afs45mOWEI+MzZtTfQ=
github.com/aws/aws-sdk-go-v2/credentials v1.17.48/go.mod h1:tOscxHN3CGmuX9idQ3+qbkzrjVIx32lqDSU1/0d/qXs=
github.com/aws/aws-sdk-go-v2/feature/dsql/auth v1.0.1 h1:Ux1HM2GlmnpxeZrxAwLlYVgLjMgsP03jm/Uu1YdzYTI=
github.com/aws/aws-sdk-go-v2/feature/dsql/auth v1.0.1/go.mod h1:CmXEvpYo6HSxwjL6AStNox9FVc2gTw2ZplzzxU2nauE=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 h1:kqOrpojG71DxJm/KDPO+Z/y1phm1JlC8/iT+5XRmAn8=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22/go.mod h1:NtSFajXVVL8TA2QNngagVZmUtXciyrHOt7xgz4faS/M=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI=
Expand Down
Loading