Sfoglia il codice sorgente

Remove ALB related options to be defined on phase 2

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 5 anni fa
parent
commit
541bda3af8
3 ha cambiato i file con 7 aggiunte e 9 eliminazioni
  1. 3 5
      ecs/cmd/main/main.go
  2. 1 1
      ecs/pkg/amazon/down.go
  3. 3 3
      ecs/pkg/compose/api.go

+ 3 - 5
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
 }

+ 1 - 1
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

+ 3 - 3
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
 }