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

Merge branch 'master' of gitlab.com:geeks-accelerator/oss/saas-starter-kit into issue8/datadog-lambda-func

Browse Source
This commit is contained in:
Lee Brown
2019-08-12 13:03:49 -08:00
parent 7cf95bb35e 064cebd2ce
commit 7e89d679db
25 changed files with 152 additions and 3589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/devops/cmd/cicd/deploy_service.go
View File

@ -66,7 +66,7 @@ type ServiceDeployFlags struct {
DockerFile string `validate:"omitempty" example:"./cmd/web-api/Dockerfile"`
EnableLambdaVPC bool `validate:"omitempty" example:"false"`
EnableEcsElb bool `validate:"omitempty" example:"false"`
IsLambda bool `validate:"omitempty" example:"false"`
IsLambda bool `validate:"omitempty" example:"false"`
StaticFilesS3Enable bool `validate:"omitempty" example:"false"`
StaticFilesImgResizeEnable bool `validate:"omitempty" example:"false"`
@ -130,6 +130,8 @@ type deployEcsServiceRequest struct {
VpcPublic *ec2.CreateVpcInput
VpcPublicSubnets []*ec2.CreateSubnetInput
EnableLambdaVPC bool `validate:"omitempty"`
IsLambda bool `validate:"omitempty"`
RecreateService bool `validate:"omitempty"`
SDNamepsace *servicediscovery.CreatePrivateDnsNamespaceInput
@ -189,7 +191,7 @@ func NewServiceDeployRequest(log *log.Logger, flags ServiceDeployFlags) (*servic
S3BucketPrivateName: flags.S3BucketPrivateName,
S3BucketPublicName: flags.S3BucketPublicName,
IsLambda: flags.IsLambda,
IsLambda: flags.IsLambda,
EnableLambdaVPC: flags.EnableLambdaVPC,
EnableEcsElb: flags.EnableEcsElb,
RecreateService: flags.RecreateService,
@ -436,7 +438,7 @@ func NewServiceDeployRequest(log *log.Logger, flags ServiceDeployFlags) (*servic
if req.IsLambda {
} else {
} else {
}
@ -856,12 +858,30 @@ func NewServiceDeployRequest(log *log.Logger, flags ServiceDeployFlags) (*servic
log.Printf("\t%s\tDefaults set.", tests.Success)
}
r, err := regexp.Compile(`^(\d+)`)
if err != nil {
return nil, errors.WithStack(err)
}
// Workaround for domains that start with a numeric value like 8north.com
// Validation fails with error: failed on the 'fqdn' tag
origServiceHostPrimary := req.ServiceHostPrimary
matches := r.FindAllString(req.ServiceHostPrimary, -1)
if len(matches) > 0 {
for _, m := range matches {
req.ServiceHostPrimary = strings.Replace(req.ServiceHostPrimary, m, "X", -1)
}
}
log.Println("\tValidate request.")
errs := validator.New().Struct(req)
if errs != nil {
return nil, errs
}
// Reset the primary domain after validation is completed.
req.ServiceHostPrimary = origServiceHostPrimary
log.Printf("\t%s\tNew request generated.", tests.Success)
}