codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: filtering requires case-by-case handling

Browse Source 
See https://github.com/moby/moby/issues/32985.
This commit is contained in:
decentral1se
2022-03-30 16:11:52 +02:00
parent e8e41850b5
commit 323f4467c8
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/logs.go
View File

@ -30,7 +30,7 @@ var logOpts = types.ContainerLogsOptions{
// stackLogs lists logs for all stack services
func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) {
filters, err := app.Filters()
filters, err := app.Filters(true, false)
if err != nil {
logrus.Fatal(err)
}

2
cli/app/ps.go
View File

@ -66,7 +66,7 @@ var appPsCommand = cli.Command{
// showPSOutput renders ps output.
func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
filters, err := app.Filters()
filters, err := app.Filters(true, true)
if err != nil {
logrus.Fatal(err)
}

7
cli/app/remove.go
View File

@ -65,7 +65,7 @@ var appRemoveCommand = cli.Command{
logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
}
fs, err := app.Filters()
fs, err := app.Filters(false, false)
if err != nil {
logrus.Fatal(err)
}
@ -114,6 +114,11 @@ var appRemoveCommand = cli.Command{
logrus.Info("no secrets to remove")
}
fs, err = app.Filters(false, true)
if err != nil {
logrus.Fatal(err)
}
volumeListOKBody, err := cl.VolumeList(context.Background(), fs)
volumeList := volumeListOKBody.Volumes
if err != nil {

4
cli/app/secret.go
View File

@ -216,7 +216,7 @@ Example:
logrus.Fatal(err)
}
filters, err := app.Filters()
filters, err := app.Filters(false, false)
if err != nil {
logrus.Fatal(err)
}
@ -293,7 +293,7 @@ var appSecretLsCommand = cli.Command{
logrus.Fatal(err)
}
filters, err := app.Filters()
filters, err := app.Filters(false, false)
if err != nil {
logrus.Fatal(err)
}

4
cli/app/volume.go
View File

@ -26,7 +26,7 @@ var appVolumeListCommand = cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
filters, err := app.Filters()
filters, err := app.Filters(false, true)
if err != nil {
logrus.Fatal(err)
}
@ -80,7 +80,7 @@ Passing "--force/-f" will select all volumes for removal. Be careful.
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
filters, err := app.Filters()
filters, err := app.Filters(false, true)
if err != nil {
logrus.Fatal(err)
}