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

fixing deploy script

Browse Source
This commit is contained in:
Lee Brown
2019-08-13 17:08:19 -08:00
parent 56f7fb08b9
commit 09b4ff8171
6 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,15 +12,15 @@ import (
"testing"
"time"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/docker"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
"geeks-accelerator/oss/saas-starter-kit/internal/schema"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/kelseyhightower/envconfig"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/docker"
"geeks-accelerator/oss/saas-starter-kit/internal/schema"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/jmoiron/sqlx"
"github.com/kelseyhightower/envconfig"
)
// Success and failure markers.
@ -48,15 +48,14 @@ func New() *Test {
log := log.New(os.Stdout, "TEST : ", log.LstdFlags|log.Lmicroseconds|log.Lshortfile)
// =========================================================================
// Configuration
var cfg struct {
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"`
UseRole bool `envconfig:"AWS_USE_ROLE"`
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"`
UseRole bool `envconfig:"AWS_USE_ROLE"`
}
}
@ -65,7 +64,6 @@ func New() *Test {
log.Fatalf("startup : Parsing Config : %+v", err)
}
// AWS access keys are required, if roles are enabled, remove any placeholders.
if cfg.Aws.UseRole {
cfg.Aws.AccessKeyID = ""
@ -97,7 +95,6 @@ func New() *Test {
log.Printf("startup : Config : %v\n", string(cfgJSON))
}
// ============================================================
// Init AWS Session
var awsSession *session.Session
@ -118,7 +115,6 @@ func New() *Test {
log.Printf("startup : AWS : Using static credentials\n")
}
// ============================================================
// Startup Postgres container

2
internal/platform/web/request.go
View File

@ -16,7 +16,7 @@ import (
// Headers
const (
HeaderAccept = "Accept"
HeaderAccept = "Accept"
HeaderUpgrade = "Upgrade"
HeaderXForwardedFor = "X-Forwarded-For"
HeaderXForwardedProto = "X-Forwarded-Proto"