From 0a28f0485740a20c29274d2f80b47a0f9117650a Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Fri, 2 Apr 2021 00:47:51 +0000 Subject: [PATCH] Don't print the deployment state at the end of each command Signed-off-by: Solomon Hykes --- cmd/dagger/cmd/common/common.go | 8 ++++++-- cmd/dagger/cmd/compute.go | 2 +- cmd/dagger/cmd/new.go | 2 +- cmd/dagger/cmd/up.go | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/dagger/cmd/common/common.go b/cmd/dagger/cmd/common/common.go index 2aeb7fe0..34218167 100644 --- a/cmd/dagger/cmd/common/common.go +++ b/cmd/dagger/cmd/common/common.go @@ -58,7 +58,9 @@ func GetCurrentDeploymentState(ctx context.Context, store *dagger.Store) *dagger return st } -func DeploymentUp(ctx context.Context, deployment *dagger.Deployment) { +// Re-compute a deployment (equivalent to `dagger up`). +// If printOutput is true, print the JSON-encoded computed state to standard output +func DeploymentUp(ctx context.Context, deployment *dagger.Deployment, printOutput bool) { lg := log.Ctx(ctx) c, err := dagger.NewClient(ctx, "") @@ -72,5 +74,7 @@ func DeploymentUp(ctx context.Context, deployment *dagger.Deployment) { if err != nil { lg.Fatal().Err(err).Msg("failed to up deployment") } - fmt.Println(output.JSON()) + if printOutput { + fmt.Println(output.JSON()) + } } diff --git a/cmd/dagger/cmd/compute.go b/cmd/dagger/cmd/compute.go index 32a7a5e9..8c4681d1 100644 --- a/cmd/dagger/cmd/compute.go +++ b/cmd/dagger/cmd/compute.go @@ -132,7 +132,7 @@ var computeCmd = &cobra.Command{ lg.Fatal().Err(err).Msg("unable to initialize deployment") } - common.DeploymentUp(ctx, deployment) + common.DeploymentUp(ctx, deployment, true) }, } diff --git a/cmd/dagger/cmd/new.go b/cmd/dagger/cmd/new.go index 9bfc86b2..e0abf58a 100644 --- a/cmd/dagger/cmd/new.go +++ b/cmd/dagger/cmd/new.go @@ -70,7 +70,7 @@ var newCmd = &cobra.Command{ } if viper.GetBool("up") { - common.DeploymentUp(ctx, deployment) + common.DeploymentUp(ctx, deployment, false) } }, } diff --git a/cmd/dagger/cmd/up.go b/cmd/dagger/cmd/up.go index fdf43f57..6afe7c69 100644 --- a/cmd/dagger/cmd/up.go +++ b/cmd/dagger/cmd/up.go @@ -31,7 +31,7 @@ var upCmd = &cobra.Command{ deployment := common.GetCurrentDeployment(ctx, store) // TODO: Implement options: --no-cache - common.DeploymentUp(ctx, deployment) + common.DeploymentUp(ctx, deployment, false) }, }