From b291ec42439cf037c492e85fe3b589c3627b8499 Mon Sep 17 00:00:00 2001 From: graham jenson Date: Fri, 20 Mar 2020 13:45:09 -0700 Subject: [PATCH] removing changes --- deployer/handlers.go | 7 +++---- deployer/models/release_resources.go | 2 +- deployer/models/release_resources_test.go | 2 +- deployer/models/service.go | 6 ++---- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/deployer/handlers.go b/deployer/handlers.go index 47ee737..78a82bf 100644 --- a/deployer/handlers.go +++ b/deployer/handlers.go @@ -4,11 +4,10 @@ import ( "context" "fmt" - "github.com/coinbase/step/errors" - "github.com/coinbase/step/utils/to" - "github.com/coinbase/odin/aws" "github.com/coinbase/odin/deployer/models" + "github.com/coinbase/step/errors" + "github.com/coinbase/step/utils/to" ) // DeployHandler function type @@ -91,7 +90,7 @@ func ValidateResources(awsc aws.Clients) DeployHandler { } } - release.UpdateWithResources(resources, awsc.ALBClient(release.AwsRegion, release.AwsAccountID, assumedRole)) + release.UpdateWithResources(resources) return release, nil } diff --git a/deployer/models/release_resources.go b/deployer/models/release_resources.go index 53ea4a3..8d265c5 100644 --- a/deployer/models/release_resources.go +++ b/deployer/models/release_resources.go @@ -111,7 +111,7 @@ func (release *Release) ValidateResources(resources *ReleaseResources) error { } // UpdateWithResources returns -func (release *Release) UpdateWithResources(resources *ReleaseResources, albc aws.ALBAPI) { +func (release *Release) UpdateWithResources(resources *ReleaseResources) { // Assign PreDesiredCapacity // Assign ServiceResourceName diff --git a/deployer/models/release_resources_test.go b/deployer/models/release_resources_test.go index dcc1942..b14ffb1 100644 --- a/deployer/models/release_resources_test.go +++ b/deployer/models/release_resources_test.go @@ -43,7 +43,7 @@ func Test_Release_UpdateWithResources_Works(t *testing.T) { sm, err := r.FetchResources(awsc.ASG, awsc.EC2, awsc.ELB, awsc.ALB, awsc.IAM, awsc.SNS) assert.NoError(t, err) - r.UpdateWithResources(sm, awsc.ALB) + r.UpdateWithResources(sm) } func Test_Release_FetchResources_Stores_WaitForDetach(t *testing.T) { diff --git a/deployer/models/service.go b/deployer/models/service.go index eaebfd8..4913b9e 100644 --- a/deployer/models/service.go +++ b/deployer/models/service.go @@ -7,10 +7,6 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface" - - "github.com/coinbase/step/utils/is" - "github.com/coinbase/step/utils/to" - "github.com/coinbase/odin/aws" "github.com/coinbase/odin/aws/alb" "github.com/coinbase/odin/aws/asg" @@ -19,6 +15,8 @@ import ( "github.com/coinbase/odin/aws/lc" "github.com/coinbase/odin/aws/pg" "github.com/coinbase/odin/aws/sg" + "github.com/coinbase/step/utils/is" + "github.com/coinbase/step/utils/to" ) // HealthReport is built to make log lines like: