1
0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-10 22:41:25 +02:00

Completed removing example-project directory and moving all files back a

a directory
This commit is contained in:
Lee Brown
2019-07-13 12:16:28 -08:00
parent bcf022aa18
commit 6117a813f2
66 changed files with 263 additions and 237 deletions

View File

@@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"
"geeks-accelerator/oss/saas-starter-kit/example-project/internal/schema"
"geeks-accelerator/oss/saas-starter-kit/example-project/tools/truss/internal/goparse"
"geeks-accelerator/oss/saas-starter-kit/internal/schema"
"geeks-accelerator/oss/saas-starter-kit/tools/truss/internal/goparse"
"github.com/dustin/go-humanize/english"
"github.com/fatih/camelcase"
"github.com/jmoiron/sqlx"

View File

@@ -4,7 +4,7 @@ import (
"log"
"strings"
"geeks-accelerator/oss/saas-starter-kit/example-project/tools/truss/internal/goparse"
"geeks-accelerator/oss/saas-starter-kit/tools/truss/internal/goparse"
"github.com/fatih/structtag"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"

View File

@@ -13,7 +13,7 @@ import (
"strings"
"text/template"
"geeks-accelerator/oss/saas-starter-kit/example-project/tools/truss/internal/goparse"
"geeks-accelerator/oss/saas-starter-kit/tools/truss/internal/goparse"
"github.com/dustin/go-humanize/english"
"github.com/fatih/camelcase"
"github.com/iancoleman/strcase"

View File

@@ -18,8 +18,8 @@ import (
"strings"
"time"
"geeks-accelerator/oss/saas-starter-kit/example-project/internal/platform/tests"
"geeks-accelerator/oss/saas-starter-kit/example-project/tools/truss/internal/retry"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/tests"
"geeks-accelerator/oss/saas-starter-kit/tools/truss/internal/retry"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/acm"
@@ -2569,6 +2569,7 @@ func ServiceDeploy(log *log.Logger, req *serviceDeployRequest) error {
"{DATADOG_ESSENTIAL}": "true",
"{HTTP_HOST}": "0.0.0.0:80",
"{HTTPS_HOST}": "", // Not enabled by default
"{HTTPS_ENABLED}": "false",
"{APP_PROJECT}": req.ProjectName,
"{APP_BASE_URL}": "", // Not set by default, requires a hostname to be defined.
@@ -2605,9 +2606,14 @@ func ServiceDeploy(log *log.Logger, req *serviceDeployRequest) error {
placeholders["{DATADOG_ESSENTIAL}"] = "false"
}
// When there is no Elastic Load Balancer, we need to terminate HTTPS on the app.
if req.EnableHTTPS && !req.EnableEcsElb {
placeholders["{HTTPS_HOST}"] = "0.0.0.0:443"
// For HTTPS support.
if req.EnableHTTPS {
placeholders["{HTTPS_ENABLED}"] = "true"
// When there is no Elastic Load Balancer, we need to terminate HTTPS on the app.
if !req.EnableEcsElb {
placeholders["{HTTPS_HOST}"] = "0.0.0.0:443"
}
}
// When a domain name if defined for the service, set the App Base URL. Default to HTTPS if enabled.