diff --git a/cmd/web-api/main.go b/cmd/web-api/main.go index 8c00008..bf73d2b 100644 --- a/cmd/web-api/main.go +++ b/cmd/web-api/main.go @@ -247,6 +247,9 @@ func main() { // configuration is provided. This is useful for taking advantage of // EC2/ECS instance roles. awsSession = session.Must(session.NewSession()) + if cfg.Aws.Region != "" { + awsSession.Config.WithRegion(cfg.Aws.Region) + } log.Printf("main : AWS : Using role.\n") diff --git a/cmd/web-app/main.go b/cmd/web-app/main.go index 46d448b..d7fc3dc 100644 --- a/cmd/web-app/main.go +++ b/cmd/web-app/main.go @@ -238,6 +238,9 @@ func main() { // configuration is provided. This is useful for taking advantage of // EC2/ECS instance roles. awsSession = session.Must(session.NewSession()) + if cfg.Aws.Region != "" { + awsSession.Config.WithRegion(cfg.Aws.Region) + } log.Printf("main : AWS : Using role.\n") diff --git a/tools/devops/cmd/deploy/models.go b/tools/devops/cmd/deploy/models.go index b917eeb..a71b397 100644 --- a/tools/devops/cmd/deploy/models.go +++ b/tools/devops/cmd/deploy/models.go @@ -183,7 +183,12 @@ func (creds awsCredentials) Session() *session.Session { // Get an AWS session from an implicit source if no explicit // configuration is provided. This is useful for taking advantage of // EC2/ECS instance roles. - return session.Must(session.NewSession()) + sess := session.Must(session.NewSession()) + if creds.Region != "" { + sess.Config.WithRegion(creds.Region) + } + + return sess } return session.New( diff --git a/tools/devops/cmd/deploy/service_deploy.go b/tools/devops/cmd/deploy/service_deploy.go index cbc5b5f..e25ec54 100644 --- a/tools/devops/cmd/deploy/service_deploy.go +++ b/tools/devops/cmd/deploy/service_deploy.go @@ -726,7 +726,7 @@ func NewServiceDeployRequest(log *log.Logger, flags ServiceDeployFlags) (*servic // RDS settings for a Postgres database Instance. Could defined different settings by env. req.DBInstance = &rds.CreateDBInstanceInput{ - DBInstanceIdentifier: aws.String(req.ProjectName + "-" + req.Env + "-01"), + DBInstanceIdentifier: aws.String(req.ProjectName + "-" + req.Env), DBName: aws.String("shared"), Engine: aws.String("postgres"), MasterUsername: aws.String("god"), diff --git a/tools/schema/cmd/migrate.go b/tools/schema/cmd/migrate.go new file mode 100644 index 0000000..1d619dd --- /dev/null +++ b/tools/schema/cmd/migrate.go @@ -0,0 +1 @@ +package cmd diff --git a/tools/schema/cmd/models.go b/tools/schema/cmd/models.go new file mode 100644 index 0000000..5006951 --- /dev/null +++ b/tools/schema/cmd/models.go @@ -0,0 +1,12 @@ +package cmd + +// DB mimics the general info needed for services used to define placeholders. +type DB struct { + Host string + User string + Pass string + Database string + Driver string + DisableTLS bool +} + diff --git a/tools/schema/main.go b/tools/schema/main.go index 920bd37..642194b 100644 --- a/tools/schema/main.go +++ b/tools/schema/main.go @@ -57,6 +57,18 @@ func main() { return // We displayed help. } + + /* + // + DBInstanceIdentifier: aws.String(req.ProjectName + "-" + req.Env), + + + Secret ID used to store the DB username and password across deploys. + dbSecretId := filepath.Join(req.ProjectName, req.Env, *req.DBInstance.DBInstanceIdentifier) + + */ + + // ========================================================================= // Log App Info