diff --git a/build/cicd/internal/config/config.go b/build/cicd/internal/config/config.go index dc01787..becaf87 100644 --- a/build/cicd/internal/config/config.go +++ b/build/cicd/internal/config/config.go @@ -117,15 +117,14 @@ func (cfgCtx *ConfigContext) Config(log *log.Logger) (*devdeploy.Config, error) // their name is calculated with the go.mod path. Since the name-scope of AWS resources is region/global scope, // it will fail to create appropriate resources for the account of the forked user. if cfg.ProjectName == "saas-starter-kit" { - remoteUser := gitRemoteUser( modDetails.ProjectRoot) + remoteUser := gitRemoteUser(modDetails.ProjectRoot) // Its a true fork from the origin repo. - if remoteUser != "saas-starter-kit" && remoteUser != "geeks-accelerator" { + if remoteUser != "saas-starter-kit" && remoteUser != "geeks-accelerator" { // Replace the prefix 'saas' with the parent directory name, hopefully the gitlab group/username. cfg.ProjectName = filepath.Base(filepath.Dir(cfg.ProjectRoot)) + "-starter-kit" - - log.Println("switching project name to ", cfg.ProjectName ) + log.Println("switching project name to ", cfg.ProjectName) } } @@ -612,6 +611,6 @@ func gitRemoteUser(projectRoot string) string { } remoteUser := strings.Split(remoteUrl, "/")[0] - + return remoteUser } diff --git a/cmd/web-api/tests/tests_test.go b/cmd/web-api/tests/tests_test.go index f968787..4defad9 100644 --- a/cmd/web-api/tests/tests_test.go +++ b/cmd/web-api/tests/tests_test.go @@ -5,11 +5,6 @@ import ( "context" "encoding/json" "fmt" - "geeks-accelerator/oss/saas-starter-kit/internal/account/account_preference" - "geeks-accelerator/oss/saas-starter-kit/internal/platform/notify" - "geeks-accelerator/oss/saas-starter-kit/internal/project" - "geeks-accelerator/oss/saas-starter-kit/internal/project_route" - "geeks-accelerator/oss/saas-starter-kit/internal/user_account/invite" "io" "io/ioutil" "net/http" @@ -21,14 +16,19 @@ import ( "geeks-accelerator/oss/saas-starter-kit/cmd/web-api/handlers" "geeks-accelerator/oss/saas-starter-kit/internal/account" + "geeks-accelerator/oss/saas-starter-kit/internal/account/account_preference" "geeks-accelerator/oss/saas-starter-kit/internal/platform/auth" + "geeks-accelerator/oss/saas-starter-kit/internal/platform/notify" "geeks-accelerator/oss/saas-starter-kit/internal/platform/tests" "geeks-accelerator/oss/saas-starter-kit/internal/platform/web" "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext" "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror" + "geeks-accelerator/oss/saas-starter-kit/internal/project" + "geeks-accelerator/oss/saas-starter-kit/internal/project_route" "geeks-accelerator/oss/saas-starter-kit/internal/signup" "geeks-accelerator/oss/saas-starter-kit/internal/user" "geeks-accelerator/oss/saas-starter-kit/internal/user_account" + "geeks-accelerator/oss/saas-starter-kit/internal/user_account/invite" "geeks-accelerator/oss/saas-starter-kit/internal/user_auth" "github.com/google/go-cmp/cmp" "github.com/iancoleman/strcase" diff --git a/go.mod b/go.mod index 2ebd20e..2222237 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,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.8 + gitlab.com/geeks-accelerator/oss/devops v1.0.9 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect diff --git a/go.sum b/go.sum index f7d6239..3588f89 100644 --- a/go.sum +++ b/go.sum @@ -216,6 +216,8 @@ gitlab.com/geeks-accelerator/oss/devops v1.0.7 h1:ZlQufuVnRN3DwJ0I5c5KA5edhQs7Os gitlab.com/geeks-accelerator/oss/devops v1.0.7/go.mod h1:JEl0T87/zftowrIzY1D+rhDMhG0AxnghuZB+VzEWuqM= gitlab.com/geeks-accelerator/oss/devops v1.0.8 h1:ql2Ii6CuW+k9X0SM0sVSzwYWDdiVdoX2xuGg9ADlj+Y= gitlab.com/geeks-accelerator/oss/devops v1.0.8/go.mod h1:JEl0T87/zftowrIzY1D+rhDMhG0AxnghuZB+VzEWuqM= +gitlab.com/geeks-accelerator/oss/devops v1.0.9 h1:LUfFWY/bvQKpRTvt1VNEghmMjFNah28Tk0wC8e5wc6Y= +gitlab.com/geeks-accelerator/oss/devops v1.0.9/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=