basebuilder/abra
0
0
Fork 0
forked from toolshed/abra
Code Pull Requests Activity

refactor: use cli context vs creating new one

Browse Source
This commit is contained in:
Roxie Gibson
2021-09-16 11:17:56 +01:00
parent a74a8bc21b
commit 0a1c73bf00
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/app/cp.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"os"
"strings"
@ -75,7 +74,6 @@ var appCpCommand = &cli.Command{
logrus.Fatal(err)
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -83,7 +81,7 @@ var appCpCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}
@ -107,11 +105,11 @@ var appCpCommand = &cli.Command{
}
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
if err := cl.CopyToContainer(ctx, container.ID, dstPath, content, copyOpts); err != nil {
if err := cl.CopyToContainer(c.Context, container.ID, dstPath, content, copyOpts); err != nil {
logrus.Fatal(err)
}
} else {
content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath)
content, _, err := cl.CopyFromContainer(c.Context, container.ID, srcPath)
if err != nil {
logrus.Fatal(err)
}

17
cli/app/logs.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"io"
"os"
@ -18,12 +17,11 @@ import (
)
// stackLogs lists logs for all stack services
func stackLogs(stackName string, client *dockerClient.Client) {
ctx := context.Background()
func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
filters := filters.NewArgs()
filters.Add("name", stackName)
serviceOpts := types.ServiceListOptions{Filters: filters}
services, err := client.ServiceList(ctx, serviceOpts)
services, err := client.ServiceList(c.Context, serviceOpts)
if err != nil {
logrus.Fatal(err)
}
@ -40,7 +38,7 @@ func stackLogs(stackName string, client *dockerClient.Client) {
Tail: "20",
Timestamps: true,
}
logs, err := client.ServiceLogs(ctx, s, logOpts)
logs, err := client.ServiceLogs(c.Context, s, logOpts)
if err != nil {
logrus.Fatal(err)
}
@ -65,7 +63,6 @@ var appLogsCommand = &cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -73,8 +70,12 @@ var appLogsCommand = &cli.Command{
serviceName := c.Args().Get(1)
if serviceName == "" {
<<<<<<< HEAD
logrus.Debug("tailing logs for all app services")
stackLogs(app.StackName(), cl)
=======
stackLogs(c, app.StackName(), cl)
>>>>>>> bcaf285 (refactor: use cli context vs creating new one)
}
logrus.Debugf("tailing logs for '%s'", serviceName)
@ -82,7 +83,7 @@ var appLogsCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", service)
serviceOpts := types.ServiceListOptions{Filters: filters}
services, err := cl.ServiceList(ctx, serviceOpts)
services, err := cl.ServiceList(c.Context, serviceOpts)
if err != nil {
logrus.Fatal(err)
}
@ -98,7 +99,7 @@ var appLogsCommand = &cli.Command{
Tail: "20",
Timestamps: true,
}
logs, err := cl.ServiceLogs(ctx, services[0].ID, logOpts)
logs, err := cl.ServiceLogs(c.Context, services[0].ID, logOpts)
if err != nil {
logrus.Fatal(err)
}

4
cli/app/ps.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"strings"
@ -23,7 +22,6 @@ var appPsCommand = &cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -32,7 +30,7 @@ var appPsCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", app.StackName())
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}

10
cli/app/remove.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"os"
@ -54,7 +53,6 @@ var appRemoveCommand = &cli.Command{
logrus.Fatal(err)
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -72,7 +70,7 @@ var appRemoveCommand = &cli.Command{
fs := filters.NewArgs()
fs.Add("name", app.Name)
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: fs})
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: fs})
if err != nil {
logrus.Fatal(err)
}
@ -99,7 +97,7 @@ var appRemoveCommand = &cli.Command{
}
for _, name := range secretNamesToRemove {
err := cl.SecretRemove(ctx, secrets[name])
err := cl.SecretRemove(c.Context, secrets[name])
if err != nil {
logrus.Fatal(err)
}
@ -109,7 +107,7 @@ var appRemoveCommand = &cli.Command{
logrus.Info("no secrets to remove")
}
volumeListOKBody, err := cl.VolumeList(ctx, fs)
volumeListOKBody, err := cl.VolumeList(c.Context, fs)
volumeList := volumeListOKBody.Volumes
if err != nil {
logrus.Fatal(err)
@ -134,7 +132,7 @@ var appRemoveCommand = &cli.Command{
}
}
for _, vol := range removeVols {
err := cl.VolumeRemove(ctx, vol, internal.Force) // last argument is for force removing
err := cl.VolumeRemove(c.Context, vol, internal.Force) // last argument is for force removing
if err != nil {
logrus.Fatal(err)
}

4
cli/app/run.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"errors"
"fmt"
@ -50,7 +49,6 @@ var appRunCommand = &cli.Command{
internal.ShowSubcommandHelpAndError(c, errors.New("no <args> provided?"))
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -60,7 +58,7 @@ var appRunCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName))
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}

11
cli/app/secret.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"errors"
"fmt"
"os"
@ -144,7 +143,6 @@ var appSecretRmCommand = &cli.Command{
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -152,7 +150,7 @@ var appSecretRmCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", app.StackName())
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}
@ -162,7 +160,7 @@ var appSecretRmCommand = &cli.Command{
secretName := cont.Spec.Annotations.Name
parsed := secret.ParseGeneratedSecretName(secretName, app)
if allSecrets {
if err := cl.SecretRemove(ctx, secretName); err != nil {
if err := cl.SecretRemove(c.Context, secretName); err != nil {
logrus.Fatal(err)
}
if internal.Pass {
@ -172,7 +170,7 @@ var appSecretRmCommand = &cli.Command{
}
} else {
if parsed == secretToRm {
if err := cl.SecretRemove(ctx, secretName); err != nil {
if err := cl.SecretRemove(c.Context, secretName); err != nil {
logrus.Fatal(err)
}
if internal.Pass {
@ -199,7 +197,6 @@ var appSecretLsCommand = &cli.Command{
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
table := abraFormatter.CreateTable(tableCol)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -207,7 +204,7 @@ var appSecretLsCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", app.StackName())
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}

4
cli/app/undeploy.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"coopcloud.tech/abra/cli/internal"
@ -24,14 +23,13 @@ volumes as eligiblef or pruning once undeployed.
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
}
rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
if err := stack.RunRemove(ctx, cl, rmOpts); err != nil {
if err := stack.RunRemove(c.Context, cl, rmOpts); err != nil {
logrus.Fatal(err)
}

9
cli/app/volume.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
abraFormatter "coopcloud.tech/abra/cli/formatter"
@ -20,8 +19,7 @@ var appVolumeListCommand = &cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
volumeList, err := client.GetVolumes(ctx, app.Server, app.Name)
volumeList, err := client.GetVolumes(c.Context, app.Server, app.Name)
if err != nil {
logrus.Fatal(err)
}
@ -53,8 +51,7 @@ var appVolumeRemoveCommand = &cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
volumeList, err := client.GetVolumes(ctx, app.Server, app.Name)
volumeList, err := client.GetVolumes(c.Context, app.Server, app.Name)
if err != nil {
logrus.Fatal(err)
}
@ -74,7 +71,7 @@ var appVolumeRemoveCommand = &cli.Command{
volumesToRemove = volumeNames
}
err = client.RemoveVolumes(ctx, app.Server, volumesToRemove, internal.Force)
err = client.RemoveVolumes(c.Context, app.Server, volumesToRemove, internal.Force)
if err != nil {
logrus.Fatal(err)
}