add IaaS parameter to self-update pipeline

Signed-off-by: Colin Simmons <colin.simmons@engineerbetter.com>
EngineerBetter · Apr 15, 2019 · 68d1d53 · 68d1d53
1 parent 7ef8de1
commit 68d1d53
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 44 deletions.
diff --git a/fly/aws_pipeline.go b/fly/aws_pipeline.go
@@ -11,15 +11,16 @@ type AWSPipeline struct {
 	PipelineTemplateParams
 	AWSAccessKeyID     string
 	AWSSecretAccessKey string
-	credsGetter AWSCredsGetter
+	credsGetter        AWSCredsGetter
 }
 
 // NewAWSPipeline return AWSPipeline
 func NewAWSPipeline(getter AWSCredsGetter) Pipeline {
 	return AWSPipeline{credsGetter: getter}
 }
 
-type AWSCredsGetter = func()(string, string, error)
+type AWSCredsGetter = func() (string, string, error)
+
 var getCredsFromSession = func() (string, string, error) {
 	sess, err := session.NewSession()
 	if err != nil {
@@ -35,7 +36,7 @@ var getCredsFromSession = func() (string, string, error) {
 }
 
 //BuildPipelineParams builds params for AWS control-tower self update pipeline
-func (a AWSPipeline) BuildPipelineParams(deployment, namespace, region, domain string) (Pipeline, error) {
+func (a AWSPipeline) BuildPipelineParams(deployment, namespace, region, domain, iaas string) (Pipeline, error) {
 	accessKeyID, secretAccessKey, err := a.credsGetter()
 	if err != nil {
 		return nil, err
@@ -44,10 +45,11 @@ func (a AWSPipeline) BuildPipelineParams(deployment, namespace, region, domain s
 	return AWSPipeline{
 		PipelineTemplateParams: PipelineTemplateParams{
 			ControlTowerVersion: ControlTowerVersion,
-			Deployment:         strings.TrimPrefix(deployment, "control-tower-"),
-			Domain:             domain,
-			Namespace:          namespace,
-			Region:             region,
+			Deployment:          strings.TrimPrefix(deployment, "control-tower-"),
+			Domain:              domain,
+			Namespace:           namespace,
+			Region:              region,
+			IaaS:                iaas,
 		},
 		AWSAccessKeyID:     accessKeyID,
 		AWSSecretAccessKey: secretAccessKey,
@@ -71,12 +73,13 @@ jobs:
     trigger: true
   - task: update
     params:
-      AWS_REGION: "{{ .Region }}"
-      DEPLOYMENT: "{{ .Deployment }}"
       AWS_ACCESS_KEY_ID: "{{ .AWSAccessKeyID }}"
+      AWS_REGION: "{{ .Region }}"
       AWS_SECRET_ACCESS_KEY: "{{ .AWSSecretAccessKey }}"
+      DEPLOYMENT: "{{ .Deployment }}"
+      IAAS: "{{ .IaaS }}"
+      NAMESPACE: "{{ .Namespace }}"
       SELF_UPDATE: true
-      NAMESPACE: {{ .Namespace }}
     config:
       platform: linux
       image_resource:
@@ -105,12 +108,13 @@ jobs:
     trigger: true
   - task: update
     params:
-      AWS_REGION: "{{ .Region }}"
-      DEPLOYMENT: "{{ .Deployment }}"
       AWS_ACCESS_KEY_ID: "{{ .AWSAccessKeyID }}"
+      AWS_REGION: "{{ .Region }}"
       AWS_SECRET_ACCESS_KEY: "{{ .AWSSecretAccessKey }}"
+      DEPLOYMENT: "{{ .Deployment }}"
+      IAAS: "{{ .IaaS }}"
+      NAMESPACE: "{{ .Namespace }}"
       SELF_UPDATE: true
-      NAMESPACE: {{ .Namespace }}
     config:
       platform: linux
       image_resource:

diff --git a/fly/aws_pipeline_test.go b/fly/aws_pipeline_test.go
@@ -31,12 +31,13 @@ jobs:
     trigger: true
   - task: update
     params:
-      AWS_REGION: "eu-west-1"
-      DEPLOYMENT: "my-deployment"
       AWS_ACCESS_KEY_ID: "access-key"
+      AWS_REGION: "eu-west-1"
       AWS_SECRET_ACCESS_KEY: "secret-key"
+      DEPLOYMENT: "my-deployment"
+      IAAS: "AWS"
+      NAMESPACE: "prod"
       SELF_UPDATE: true
-      NAMESPACE: prod
     config:
       platform: linux
       image_resource:
@@ -65,12 +66,13 @@ jobs:
     trigger: true
   - task: update
     params:
-      AWS_REGION: "eu-west-1"
-      DEPLOYMENT: "my-deployment"
       AWS_ACCESS_KEY_ID: "access-key"
+      AWS_REGION: "eu-west-1"
       AWS_SECRET_ACCESS_KEY: "secret-key"
+      DEPLOYMENT: "my-deployment"
+      IAAS: "AWS"
+      NAMESPACE: "prod"
       SELF_UPDATE: true
-      NAMESPACE: prod
     config:
       platform: linux
       image_resource:
@@ -110,7 +112,7 @@ jobs:
 
 			pipeline := NewAWSPipeline(fakeCredsGetter)
 
-			params, err := pipeline.BuildPipelineParams("my-deployment", "prod", "eu-west-1", "ci.engineerbetter.com")
+			params, err := pipeline.BuildPipelineParams("my-deployment", "prod", "eu-west-1", "ci.engineerbetter.com", "AWS")
 			Expect(err).ToNot(HaveOccurred())
 
 			yamlBytes, err := util.RenderTemplate("self-update pipeline", pipeline.GetConfigTemplate(), params)

diff --git a/fly/fly.go b/fly/fly.go
@@ -206,7 +206,7 @@ func (client *Client) writePipelineConfig(pipelinePath string, config config.Con
 	}
 	defer fileHandler.Close()
 
-	params, err := client.pipeline.BuildPipelineParams(config.GetDeployment(), config.GetNamespace(), config.GetRegion(), config.GetDomain())
+	params, err := client.pipeline.BuildPipelineParams(config.GetDeployment(), config.GetNamespace(), config.GetRegion(), config.GetDomain(), config.GetIAAS())
 	if err != nil {
 		return err
 	}

diff --git a/fly/gcp_pipeline.go b/fly/gcp_pipeline.go
@@ -23,14 +23,15 @@ func NewGCPPipeline(credsPath string) (Pipeline, error) {
 }
 
 //BuildPipelineParams builds params for AWS control-tower self update pipeline
-func (a GCPPipeline) BuildPipelineParams(deployment, namespace, region, domain string) (Pipeline, error) {
+func (a GCPPipeline) BuildPipelineParams(deployment, namespace, region, domain, iaas string) (Pipeline, error) {
 	return GCPPipeline{
 		PipelineTemplateParams: PipelineTemplateParams{
 			ControlTowerVersion: ControlTowerVersion,
-			Deployment:         strings.TrimPrefix(deployment, "control-tower-"),
-			Domain:             domain,
-			Namespace:          namespace,
-			Region:             region,
+			Deployment:          strings.TrimPrefix(deployment, "control-tower-"),
+			Domain:              domain,
+			Namespace:           namespace,
+			Region:              region,
+			IaaS:                iaas,
 		},
 		GCPCreds: a.GCPCreds,
 	}, nil
@@ -63,10 +64,10 @@ jobs:
     params:
       AWS_REGION: "{{ .Region }}"
       DEPLOYMENT: "{{ .Deployment }}"
-      IAAS: GCP
-      SELF_UPDATE: true
-      NAMESPACE: {{ .Namespace }}
       GCPCreds: '{{ .GCPCreds }}'
+      IAAS: "{{ .IaaS }}"
+      NAMESPACE: "{{ .Namespace }}"
+      SELF_UPDATE: true
     config:
       platform: linux
       image_resource:
@@ -98,10 +99,10 @@ jobs:
     params:
       AWS_REGION: "{{ .Region }}"
       DEPLOYMENT: "{{ .Deployment }}"
-      IAAS: GCP
-      SELF_UPDATE: true
-      NAMESPACE: "{{ .Namespace }}"
       GCPCreds: '{{ .GCPCreds }}'
+      IAAS: "{{ .IaaS }}"
+      NAMESPACE: "{{ .Namespace }}"
+      SELF_UPDATE: true
     config:
       platform: linux
       image_resource:

diff --git a/fly/gcp_pipeline_test.go b/fly/gcp_pipeline_test.go
@@ -36,10 +36,10 @@ jobs:
     params:
       AWS_REGION: "europe-west1"
       DEPLOYMENT: "my-deployment"
-      IAAS: GCP
-      SELF_UPDATE: true
-      NAMESPACE: prod
       GCPCreds: 'creds-content'
+      IAAS: "GCP"
+      NAMESPACE: "prod"
+      SELF_UPDATE: true
     config:
       platform: linux
       image_resource:
@@ -71,10 +71,10 @@ jobs:
     params:
       AWS_REGION: "europe-west1"
       DEPLOYMENT: "my-deployment"
-      IAAS: GCP
-      SELF_UPDATE: true
-      NAMESPACE: "prod"
       GCPCreds: 'creds-content'
+      IAAS: "GCP"
+      NAMESPACE: "prod"
+      SELF_UPDATE: true
     config:
       platform: linux
       image_resource:
@@ -121,7 +121,7 @@ jobs:
 			pipeline, err := NewGCPPipeline(tempFile.Name())
 			Expect(err).ToNot(HaveOccurred())
 
-			params, err := pipeline.BuildPipelineParams("my-deployment", "prod", "europe-west1", "ci.engineerbetter.com")
+			params, err := pipeline.BuildPipelineParams("my-deployment", "prod", "europe-west1", "ci.engineerbetter.com", "GCP")
 			Expect(err).ToNot(HaveOccurred())
 
 			yamlBytes, err := util.RenderTemplate("self-update pipeline", pipeline.GetConfigTemplate(), params)

diff --git a/fly/pipeline.go b/fly/pipeline.go
@@ -2,16 +2,17 @@ package fly
 
 // Pipeline is interface for self update pipeline
 type Pipeline interface {
-	BuildPipelineParams(deployment, namespace, region, domain string) (Pipeline, error)
+	BuildPipelineParams(deployment, namespace, region, domain, iaas string) (Pipeline, error)
 	GetConfigTemplate() string
 }
 
 type PipelineTemplateParams struct {
 	ControlTowerVersion string
-	Deployment         string
-	Domain             string
-	Namespace          string
-	Region             string
+	Deployment          string
+	Domain              string
+	Namespace           string
+	Region              string
+	IaaS                string
 }
 
 const selfUpdateResources = `