From 541bda3af8e4e8eb74e5ecb9b7d0032583492b09 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 28 Apr 2020 10:22:29 +0200 Subject: [PATCH] Remove ALB related options to be defined on phase 2 Signed-off-by: Nicolas De Loof --- ecs/cmd/main/main.go | 8 +++----- ecs/pkg/amazon/down.go | 2 +- ecs/pkg/compose/api.go | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ecs/cmd/main/main.go b/ecs/cmd/main/main.go index 70468704e..85802552f 100644 --- a/ecs/cmd/main/main.go +++ b/ecs/cmd/main/main.go @@ -131,8 +131,7 @@ func UpCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOptions) } type downOptions struct { - KeepLoadBalancer bool - DeleteCluster bool + DeleteCluster bool } func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOptions) *cobra.Command { @@ -149,11 +148,11 @@ func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOption if err != nil { return err } - return client.ComposeDown(&project.Name, opts.KeepLoadBalancer, opts.DeleteCluster) + return client.ComposeDown(project.Name, opts.DeleteCluster) } // project names passed as parameters for _, name := range args { - err := client.ComposeDown(&name, opts.KeepLoadBalancer, opts.DeleteCluster) + err := client.ComposeDown(name, opts.DeleteCluster) if err != nil { return err } @@ -161,7 +160,6 @@ func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOption return nil }, } - cmd.Flags().BoolVar(&opts.KeepLoadBalancer, "keep-load-balancer", false, "Keep Load Balancer for further use") cmd.Flags().BoolVar(&opts.DeleteCluster, "delete-cluster", false, "Delete cluster") return cmd } diff --git a/ecs/pkg/amazon/down.go b/ecs/pkg/amazon/down.go index 185572315..5c52e9286 100644 --- a/ecs/pkg/amazon/down.go +++ b/ecs/pkg/amazon/down.go @@ -4,7 +4,7 @@ import ( "fmt" ) -func (c *client) ComposeDown(projectName *string, keepLoadBalancer, deleteCluster bool) error { +func (c *client) ComposeDown(projectName string, deleteCluster bool) error { err := c.api.DeleteStack(projectName) if err != nil { return err diff --git a/ecs/pkg/compose/api.go b/ecs/pkg/compose/api.go index b30750824..d2e2b1a2d 100644 --- a/ecs/pkg/compose/api.go +++ b/ecs/pkg/compose/api.go @@ -3,7 +3,7 @@ package compose import "github.com/awslabs/goformation/v4/cloudformation" type API interface { - Convert(project *Project, loadBalancerArn *string) (*cloudformation.Template, error) - ComposeUp(project *Project, loadBalancerArn *string) error - ComposeDown(projectName *string, keepLoadBalancer, deleteCluster bool) error + Convert(project *Project) (*cloudformation.Template, error) + ComposeUp(project *Project) error + ComposeDown(projectName string, deleteCluster bool) error }