tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-20 12:14:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove ALB related options to be defined on phase 2

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-04-28 10:22:29 +02:00
parent 096c800c1b
commit 541bda3af8
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ecs/cmd/main/main.go
View File

@ -131,8 +131,7 @@ func UpCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOptions)
} }
type downOptions struct { type downOptions struct {
KeepLoadBalancer bool DeleteCluster bool
DeleteCluster bool
} }
func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOptions) *cobra.Command { func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOptions) *cobra.Command {
@ -149,11 +148,11 @@ func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOption
if err != nil { if err != nil {
return err return err
} }
return client.ComposeDown(&project.Name, opts.KeepLoadBalancer, opts.DeleteCluster) return client.ComposeDown(project.Name, opts.DeleteCluster)
} }
// project names passed as parameters // project names passed as parameters
for _, name := range args { for _, name := range args {
err := client.ComposeDown(&name, opts.KeepLoadBalancer, opts.DeleteCluster) err := client.ComposeDown(name, opts.DeleteCluster)
if err != nil { if err != nil {
return err return err
} }
@ -161,7 +160,6 @@ func DownCommand(clusteropts *clusterOptions, projectOpts *compose.ProjectOption
return nil 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") cmd.Flags().BoolVar(&opts.DeleteCluster, "delete-cluster", false, "Delete cluster")
return cmd return cmd
} }

2
ecs/pkg/amazon/down.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "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) err := c.api.DeleteStack(projectName)
if err != nil { if err != nil {
return err return err

6
ecs/pkg/compose/api.go
View File

@ -3,7 +3,7 @@ package compose
import "github.com/awslabs/goformation/v4/cloudformation" import "github.com/awslabs/goformation/v4/cloudformation"
type API interface { type API interface {
Convert(project *Project, loadBalancerArn *string) (*cloudformation.Template, error) Convert(project *Project) (*cloudformation.Template, error)
ComposeUp(project *Project, loadBalancerArn *string) error ComposeUp(project *Project) error
ComposeDown(projectName *string, keepLoadBalancer, deleteCluster bool) error ComposeDown(projectName string, deleteCluster bool) error
} }