Skip to content
This repository was archived by the owner on May 2, 2023. It is now read-only.

Add session token for redshift #9

Open
tommichaelis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add session token for redshift #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var (
config = kingpin.Flag("config", "Configuration file with S3 and Redshift credentials").Required().File()
accessKey = kingpin.Flag("access-key", "AWS access key. Defaults to $AWS_ACCESS_KEY_ID").OverrideDefaultFromEnvar("AWS_ACCESS_KEY_ID").Required().String()
secretKey = kingpin.Flag("secret-access-key", "AWS secret access key. Defaults to $AWS_SECRET_").OverrideDefaultFromEnvar("AWS_SECRET_ACCESS_KEY").Required().String()
sessionToken = kingpin.Flag("session-token", "AWS session token.").String()
project = kingpin.Flag("project", "Google Project ID").OverrideDefaultFromEnvar("GCLOUD_PROJECT").Required().String()
overwrite = kingpin.Flag("overwrite", "Overwrite BigQuery table").Bool()
usePartitionedTables = kingpin.Flag("partition", "Create time partitioned BigQuery tables.").Bool()
Expand Down Expand Up @@ -67,6 +68,7 @@ func main() {
}
awsConfig.S3.AccessKey = *accessKey
awsConfig.S3.SecretKey = *secretKey
awsConfig.S3.SessionToken = *sessionToken

config := &Configuration{
AWS: awsConfig,
Expand Down
12 changes: 8 additions & 4 deletions redshift/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,17 @@ type RedshiftConnectionDetails struct {
}

type S3Configuration struct {
Bucket string `yaml:"bucket"`
AccessKey string `yaml:"access_key"`
SecretKey string `yaml:"secret_key"`
Bucket string `yaml:"bucket"`
AccessKey string `yaml:"access_key"`
SecretKey string `yaml:"secret_key"`
SessionToken string `yaml:"session_token"`
}

func (c S3Configuration) ToRedshiftCredentialsClause() string {
return fmt.Sprintf("aws_access_key_id=%s;aws_secret_access_key=%s", c.AccessKey, c.SecretKey)
if c.SessionToken == "" {
return fmt.Sprintf("aws_access_key_id=%s;aws_secret_access_key=%s", c.AccessKey, c.SecretKey)
}
return fmt.Sprintf("aws_access_key_id=%s;aws_secret_access_key=%s;token=%s", c.AccessKey, c.SecretKey, c.SessionToken)
}

func (c *RedshiftConnectionDetails) URLString() string {
Expand Down