diff --git a/README.md b/README.md index d71a6f3..3bb6c95 100644 --- a/README.md +++ b/README.md @@ -502,7 +502,7 @@ environment docker-compose file without "sample" prepending the file name. Navigate to the root of the project. Copy `configs/sample.env_docker_compose` to `.env_docker_compose`. ```bash -$ cd $GOPATH/src/geeks-accelerator/oss/saas-starter-kit +$ cd ./saas-starter-kit $ cp configs/sample.env_docker_compose configs/.env_docker_compose ``` diff --git a/build/cicd/internal/config/config.go b/build/cicd/internal/config/config.go index ea02205..8de318e 100644 --- a/build/cicd/internal/config/config.go +++ b/build/cicd/internal/config/config.go @@ -189,7 +189,7 @@ func NewConfig(log *log.Logger, targetEnv Env, awsCredentials devdeploy.AwsCrede LocationConstraint: &cfg.AwsCredentials.Region, LifecycleRules: []*s3.LifecycleRule{bucketLifecycleTempRule}, CORSRules: []*s3.CORSRule{ - &s3.CORSRule{ + { // Headers that are specified in the Access-Control-Request-Headers header. // These headers are allowed in a preflight OPTIONS request. In response to // any preflight OPTIONS request, Amazon S3 returns any requested headers that @@ -348,7 +348,7 @@ func NewConfig(log *log.Logger, targetEnv Env, awsCredentials devdeploy.AwsCrede AutoMinorVersionUpgrade: aws.Bool(true), SnapshotRetentionLimit: aws.Int64(7), ParameterNameValues: []devdeploy.AwsElasticCacheParameter{ - devdeploy.AwsElasticCacheParameter{ + { ParameterName: "maxmemory-policy", ParameterValue: "allkeys-lru", }, diff --git a/build/cicd/internal/config/service.go b/build/cicd/internal/config/service.go index 7ab72a3..43f2d85 100644 --- a/build/cicd/internal/config/service.go +++ b/build/cicd/internal/config/service.go @@ -273,7 +273,7 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de // Define the target group for service to receive HTTP traffic from the load balancer. srv.AwsElbLoadBalancer.TargetGroups = []*devdeploy.AwsElbTargetGroup{ - &devdeploy.AwsElbTargetGroup{ + { Name: fmt.Sprintf("%s-http", ctx.Name), Port: 80, Protocol: "HTTP", @@ -439,10 +439,10 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de Image: aws.String(srv.ReleaseImage), Essential: aws.Bool(true), PortMappings: []*ecs.PortMapping{ - &ecs.PortMapping{ + { ContainerPort: aws.Int64(8125), }, - &ecs.PortMapping{ + { ContainerPort: aws.Int64(8126), }, }, @@ -529,7 +529,7 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de }, }, PortMappings: []*ecs.PortMapping{ - &ecs.PortMapping{ + { HostPort: aws.Int64(80), Protocol: aws.String("tcp"), ContainerPort: aws.Int64(80), @@ -549,7 +549,7 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de StartPeriod: aws.Int64(60), }, Ulimits: []*ecs.Ulimit{ - &ecs.Ulimit{ + { Name: aws.String("nofile"), SoftLimit: aws.Int64(987654), HardLimit: aws.Int64(999999), @@ -646,7 +646,7 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de }, }, PortMappings: []*ecs.PortMapping{ - &ecs.PortMapping{ + { HostPort: aws.Int64(80), Protocol: aws.String("tcp"), ContainerPort: aws.Int64(80), @@ -666,7 +666,7 @@ func NewService(log *log.Logger, serviceName string, cfg *devdeploy.Config) (*de StartPeriod: aws.Int64(60), }, Ulimits: []*ecs.Ulimit{ - &ecs.Ulimit{ + { Name: aws.String("nofile"), SoftLimit: aws.Int64(987654), HardLimit: aws.Int64(999999), diff --git a/cmd/web-app/handlers/checklists.go b/cmd/web-app/handlers/checklists.go index 1c1ac7d..91dbbf6 100644 --- a/cmd/web-app/handlers/checklists.go +++ b/cmd/web-app/handlers/checklists.go @@ -60,11 +60,11 @@ func (h *Checklists) Index(ctx context.Context, w http.ResponseWriter, r *http.R } fields := []datatable.DisplayField{ - datatable.DisplayField{Field: "id", Title: "ID", Visible: false, Searchable: true, Orderable: true, Filterable: false}, - datatable.DisplayField{Field: "name", Title: "Checklist", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "filter Name"}, - datatable.DisplayField{Field: "status", Title: "Status", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "All Statuses", FilterItems: statusFilterItems}, - datatable.DisplayField{Field: "updated_at", Title: "Last Updated", Visible: true, Searchable: true, Orderable: true, Filterable: false}, - datatable.DisplayField{Field: "created_at", Title: "Created", Visible: true, Searchable: true, Orderable: true, Filterable: false}, + {Field: "id", Title: "ID", Visible: false, Searchable: true, Orderable: true, Filterable: false}, + {Field: "name", Title: "Checklist", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "filter Name"}, + {Field: "status", Title: "Status", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "All Statuses", FilterItems: statusFilterItems}, + {Field: "updated_at", Title: "Last Updated", Visible: true, Searchable: true, Orderable: true, Filterable: false}, + {Field: "created_at", Title: "Created", Visible: true, Searchable: true, Orderable: true, Filterable: false}, } mapFunc := func(q *checklist.Checklist, cols []datatable.DisplayField) (resp []datatable.ColumnValue, err error) { diff --git a/cmd/web-app/handlers/users.go b/cmd/web-app/handlers/users.go index 9e2a646..3a0f0b3 100644 --- a/cmd/web-app/handlers/users.go +++ b/cmd/web-app/handlers/users.go @@ -90,11 +90,11 @@ func (h *Users) Index(ctx context.Context, w http.ResponseWriter, r *http.Reques } fields := []datatable.DisplayField{ - datatable.DisplayField{Field: "id", Title: "ID", Visible: false, Searchable: true, Orderable: true, Filterable: false}, - datatable.DisplayField{Field: "name", Title: "User", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "filter Name"}, - datatable.DisplayField{Field: "status", Title: "Status", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "All Statuses", FilterItems: statusFilterItems}, - datatable.DisplayField{Field: "updated_at", Title: "Last Updated", Visible: true, Searchable: true, Orderable: true, Filterable: false}, - datatable.DisplayField{Field: "created_at", Title: "Created", Visible: true, Searchable: true, Orderable: true, Filterable: false}, + {Field: "id", Title: "ID", Visible: false, Searchable: true, Orderable: true, Filterable: false}, + {Field: "name", Title: "User", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "filter Name"}, + {Field: "status", Title: "Status", Visible: true, Searchable: true, Orderable: true, Filterable: true, FilterPlaceholder: "All Statuses", FilterItems: statusFilterItems}, + {Field: "updated_at", Title: "Last Updated", Visible: true, Searchable: true, Orderable: true, Filterable: false}, + {Field: "created_at", Title: "Created", Visible: true, Searchable: true, Orderable: true, Filterable: false}, } mapFunc := func(q *user_account.User, cols []datatable.DisplayField) (resp []datatable.ColumnValue, err error) { diff --git a/internal/user_account/user_account_test.go b/internal/user_account/user_account_test.go index eb88466..c9e4f4d 100644 --- a/internal/user_account/user_account_test.go +++ b/internal/user_account/user_account_test.go @@ -615,7 +615,7 @@ func TestCrud(t *testing.T) { t.Fatalf("\t%s\tVerify update user account failed.", tests.Failed) } else if tt.findErr == nil { var expected UserAccounts = []*UserAccount{ - &UserAccount{ + { //ID: ua.ID, UserID: ua.UserID, AccountID: ua.AccountID, @@ -657,7 +657,7 @@ func TestCrud(t *testing.T) { } var expected UserAccounts = []*UserAccount{ - &UserAccount{ + { //ID: ua.ID, UserID: ua.UserID, AccountID: ua.AccountID, diff --git a/internal/user_auth/auth_test.go b/internal/user_auth/auth_test.go index e7fb61a..a616b88 100644 --- a/internal/user_auth/auth_test.go +++ b/internal/user_auth/auth_test.go @@ -317,10 +317,10 @@ func TestSwitchAccount(t *testing.T) { // Test all the combinations there the user has access to all three accounts. if true { for _, roles := range [][]user_account.UserAccountRole{ - []user_account.UserAccountRole{user_account.UserAccountRole_Admin, user_account.UserAccountRole_Admin, user_account.UserAccountRole_Admin}, - []user_account.UserAccountRole{user_account.UserAccountRole_User, user_account.UserAccountRole_User, user_account.UserAccountRole_User}, - []user_account.UserAccountRole{user_account.UserAccountRole_Admin, user_account.UserAccountRole_User, user_account.UserAccountRole_Admin}, - []user_account.UserAccountRole{user_account.UserAccountRole_User, user_account.UserAccountRole_Admin, user_account.UserAccountRole_User}, + {user_account.UserAccountRole_Admin, user_account.UserAccountRole_Admin, user_account.UserAccountRole_Admin}, + {user_account.UserAccountRole_User, user_account.UserAccountRole_User, user_account.UserAccountRole_User}, + {user_account.UserAccountRole_Admin, user_account.UserAccountRole_User, user_account.UserAccountRole_Admin}, + {user_account.UserAccountRole_User, user_account.UserAccountRole_Admin, user_account.UserAccountRole_User}, } { // Create a new user for testing. usrAcc, err := user_account.MockUserAccount(ctx, test.MasterDB, now, roles[0])