go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-06-17 00:17:59 +02:00
Code Issues Releases Activity

Change AWS_REGION to AWS_DEFAULT_REGION

Browse Source
This commit is contained in:
Lee Brown
2019-08-26 04:07:19 -08:00
parent e756362c15
commit 965f42ef18
12 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -452,13 +452,13 @@ out.
```
$ AWS_ACCESS_KEY_ID=
$ AWS_SECRET_ACCESS_KEY=
AWS_REGION=us-east-1
AWS_DEFAULT_REGION=us-east-1
$ AWS_USE_ROLE=false
$ DD_API_KEY=
```
In your new copy of the example docker-compose file ".env_docker_compose", set the AWS configs by updating the following
environment variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and AWS_REGION. Remember to remove the $ before the
environment variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and AWS_DEFAULT_REGION. Remember to remove the $ before the
variable name.
As noted in the Local Installation section, the project is integrated with Datadog for observability. You can specify

4
build/cicd/README.md
View File

@ -285,7 +285,7 @@ These can also be passed into _cicd_ as command line options.
```bash
export AWS_ACCESS_KEY_ID=XXXXXXXXX
export AWS_SECRET_ACCESS_KEY=XXXXXXXXX
export AWS_REGION="us-west-2"
export AWS_DEFAULT_REGION="us-west-2"
export AWS_USE_ROLE=false
```
@ -311,7 +311,7 @@ $ cicd [global options] command [command options] [arguments...]
`--aws-secret-key value`
* AWS Region - optional, can be set via env variable `AWS_REGION`
* AWS Region - optional, can be set via env variable `AWS_DEFAULT_REGION`
`--aws-region value`

2
build/cicd/internal/config/service.go
View File

@ -174,7 +174,7 @@ func NewServiceContext(serviceName Service, cfg *devdeploy.Config) (*ServiceCont
return []*ecs.KeyValuePair{
ecsKeyValuePair(devdeploy.ENV_KEY_ECS_CLUSTER, srv.AwsEcsCluster.ClusterName),
ecsKeyValuePair(devdeploy.ENV_KEY_ECS_SERVICE, srv.AwsEcsService.ServiceName),
ecsKeyValuePair("AWS_REGION", cfg.AwsCredentials.Region),
ecsKeyValuePair("AWS_DEFAULT_REGION", cfg.AwsCredentials.Region),
ecsKeyValuePair("AWS_USE_ROLE", "true"),
ecsKeyValuePair("AWSLOGS_GROUP", srv.AwsCloudWatchLogGroup.LogGroupName),
ecsKeyValuePair("ECS_ENABLE_CONTAINER_METADATA", "true"),

19
build/cicd/main.go
View File

@ -55,7 +55,7 @@ func main() {
cli.StringFlag{
Name: "aws-region",
Usage: "AWS Region",
EnvVar: "AWS_REGION",
EnvVar: "AWS_DEFAULT_REGION",
Destination: &awsCredentials.Region,
},
cli.BoolFlag{
@ -158,6 +158,23 @@ func main() {
Aliases: []string{"d"},
Usage: "deploy a service or function",
Subcommands: []cli.Command{
{
Name: "infrastructure",
Aliases: []string{"infra"},
Usage: "deploy infrastructure for target environment",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "dry-run",
Usage: "print out the deploy details",
},
},
Action: func(c *cli.Context) error {
targetEnv := c.GlobalString("env")
dryRun := c.Bool("dry-run")
return config.DeployInfrastructureForTargetEnv(log, awsCredentials, targetEnv, dryRun)
},
},
{
Name: "service",
Usage: "deploy a service",

4
cmd/web-api/ecs-task-definition.json
View File

@ -12,7 +12,7 @@
"logDriver": "awslogs",
"options": {
"awslogs-group": "{AWS_LOGS_GROUP}",
"awslogs-region": "{AWS_REGION}",
"awslogs-region": "{AWS_DEFAULT_REGION}",
"awslogs-stream-prefix": "ecs"
}
},
@ -27,7 +27,7 @@
"memoryReservation": 128,
"volumesFrom": [],
"environment": [
{"name": "AWS_REGION", "value": "{AWS_REGION}"},
{"name": "AWS_DEFAULT_REGION", "value": "{AWS_DEFAULT_REGION}"},
{"name": "AWS_USE_ROLE", "value": "true"},
{"name": "AWSLOGS_GROUP", "value": "{AWS_LOGS_GROUP}"},
{"name": "ECS_CLUSTER", "value": "{ECS_CLUSTER}"},

2
cmd/web-api/main.go
View File

@ -135,7 +135,7 @@ func main() {
Aws struct {
AccessKeyID string `envconfig:"AWS_ACCESS_KEY_ID"` // WEB_API_AWS_AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY_ID
SecretAccessKey string `envconfig:"AWS_SECRET_ACCESS_KEY" json:"-"` // don't print
Region string `default:"us-west-2" envconfig:"AWS_REGION"`
Region string `default:"us-west-2" envconfig:"AWS_DEFAULT_REGION"`
S3BucketPrivate string `envconfig:"S3_BUCKET_PRIVATE"`
S3BucketPublic string `envconfig:"S3_BUCKET_PUBLIC"`
SecretsManagerConfigPrefix string `default:"" envconfig:"SECRETS_MANAGER_CONFIG_PREFIX"`

4
cmd/web-app/ecs-task-definition.json
View File

@ -12,7 +12,7 @@
"logDriver": "awslogs",
"options": {
"awslogs-group": "{AWS_LOGS_GROUP}",
"awslogs-region": "{AWS_REGION}",
"awslogs-region": "{AWS_DEFAULT_REGION}",
"awslogs-stream-prefix": "ecs"
}
},
@ -27,7 +27,7 @@
"memoryReservation": 128,
"volumesFrom": [],
"environment": [
{"name": "AWS_REGION", "value": "{AWS_REGION}"},
{"name": "AWS_DEFAULT_REGION", "value": "{AWS_DEFAULT_REGION}"},
{"name": "AWS_USE_ROLE", "value": "true"},
{"name": "AWSLOGS_GROUP", "value": "{AWS_LOGS_GROUP}"},
{"name": "ECS_CLUSTER", "value": "{ECS_CLUSTER}"},

2
cmd/web-app/main.go
View File

@ -138,7 +138,7 @@ func main() {
Aws struct {
AccessKeyID string `envconfig:"AWS_ACCESS_KEY_ID"` // WEB_API_AWS_AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY_ID
SecretAccessKey string `envconfig:"AWS_SECRET_ACCESS_KEY" json:"-"` // don't print
Region string `default:"us-west-2" envconfig:"AWS_REGION"`
Region string `default:"us-west-2" envconfig:"AWS_DEFAULT_REGION"`
S3BucketPrivate string `envconfig:"S3_BUCKET_PRIVATE"`
S3BucketPublic string `envconfig:"S3_BUCKET_PUBLIC"`
SecretsManagerConfigPrefix string `default:"" envconfig:"SECRETS_MANAGER_CONFIG_PREFIX"`

2
configs/sample.env_docker_compose
View File

@ -1,6 +1,6 @@
#AWS_ACCESS_KEY_ID=
#AWS_SECRET_ACCESS_KEY=
#AWS_REGION=us-west-2
#AWS_DEFAULT_REGION=us-west-2
#AWS_USE_ROLE=false
#DD_API_KEY=
#WEB_APP_AWS_S3_BUCKET_PRIVATE=

2
go.mod
View File

@ -41,7 +41,7 @@ require (
github.com/tinylib/msgp v1.1.0 // indirect
github.com/urfave/cli v1.21.0
github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
gitlab.com/geeks-accelerator/oss/devops v1.0.11
gitlab.com/geeks-accelerator/oss/devops v1.0.13
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
golang.org/x/tools v0.0.0-20190807223507-b346f7fd45de // indirect

2
go.sum
View File

@ -217,6 +217,8 @@ github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryB
github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
gitlab.com/geeks-accelerator/oss/devops v1.0.11 h1:ojSvv4bSOZSyGjFMvpbJyREVfdN1A9O3CrOyTkNtb9c=
gitlab.com/geeks-accelerator/oss/devops v1.0.11/go.mod h1:xr+rhNSDXrEh0A6bkBPnfMiRIou3OiPZK0oD5h9GAAM=
gitlab.com/geeks-accelerator/oss/devops v1.0.13 h1:Wnf+vXPP8Ps4tSVdbk/vgl1rHaAELIPE3OYBAzvroG8=
gitlab.com/geeks-accelerator/oss/devops v1.0.13/go.mod h1:xr+rhNSDXrEh0A6bkBPnfMiRIou3OiPZK0oD5h9GAAM=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

2
internal/platform/tests/main.go
View File

@ -54,7 +54,7 @@ func New() *Test {
Aws struct {
AccessKeyID string `envconfig:"AWS_ACCESS_KEY_ID"` // WEB_API_AWS_AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY_ID
SecretAccessKey string `envconfig:"AWS_SECRET_ACCESS_KEY" json:"-"` // don't print
Region string `default:"us-west-2" envconfig:"AWS_REGION"`
Region string `default:"us-west-2" envconfig:"AWS_DEFAULT_REGION"`
UseRole bool `envconfig:"AWS_USE_ROLE"`
}
}