diff --git a/cli/recipe/upgrade.go b/cli/recipe/upgrade.go index 2daf3258..f6011b62 100644 --- a/cli/recipe/upgrade.go +++ b/cli/recipe/upgrade.go @@ -332,9 +332,9 @@ You may invoke this command in "wizard" mode and be prompted for input: } for _, upgrade := range upgradeList { - log.Infof("can upgrade service: %s, image: %s, tag: %s ::\n", upgrade.Service, upgrade.Image, upgrade.Tag) + log.Infof("can upgrade service: %s, image: %s, tag: %s ::", upgrade.Service, upgrade.Image, upgrade.Tag) for _, utag := range upgrade.UpgradeTags { - log.Infof(" %s\n", utag) + log.Infof(" %s", utag) } } } diff --git a/pkg/upstream/stack/remove.go b/pkg/upstream/stack/remove.go index 81584ba4..3a201cdd 100644 --- a/pkg/upstream/stack/remove.go +++ b/pkg/upstream/stack/remove.go @@ -87,7 +87,7 @@ func removeServices( var hasError bool sort.Slice(services, sortServiceByName(services)) for _, service := range services { - log.Infof("removing service %s\n", service.Spec.Name) + log.Infof("removing service %s", service.Spec.Name) if err := client.ServiceRemove(ctx, service.ID); err != nil { hasError = true log.Fatalf("failed to remove service %s: %s", service.ID, err) @@ -103,7 +103,7 @@ func removeNetworks( ) bool { var hasError bool for _, network := range networks { - log.Infof("removing network %s\n", network.Name) + log.Infof("removing network %s", network.Name) if err := client.NetworkRemove(ctx, network.ID); err != nil { hasError = true log.Fatalf("failed to remove network %s: %s", network.ID, err) @@ -119,7 +119,7 @@ func removeSecrets( ) bool { var hasError bool for _, secret := range secrets { - log.Infof("Removing secret %s\n", secret.Spec.Name) + log.Infof("removing secret %s", secret.Spec.Name) if err := client.SecretRemove(ctx, secret.ID); err != nil { hasError = true log.Fatalf("Failed to remove secret %s: %s", secret.ID, err) @@ -135,7 +135,7 @@ func removeConfigs( ) bool { var hasError bool for _, config := range configs { - log.Infof("removing config %s\n", config.Spec.Name) + log.Infof("removing config %s", config.Spec.Name) if err := client.ConfigRemove(ctx, config.ID); err != nil { hasError = true log.Fatalf("failed to remove config %s: %s", config.ID, err) diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go index 007adea7..b864ecca 100644 --- a/pkg/upstream/stack/stack.go +++ b/pkg/upstream/stack/stack.go @@ -131,7 +131,7 @@ func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string) func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, services map[string]struct{}) { oldServices, err := GetStackServices(ctx, cl, namespace.Name()) if err != nil { - log.Infof("failed to list services: %s\n", err) + log.Infof("failed to list services: %s", err) } pruneServices := []swarm.Service{} @@ -215,7 +215,7 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co log.Infof("waiting for %s to deploy... please hold 🤚", appName) if err := waitOnServices(ctx, cl, serviceIDs, appName); err == nil { - log.Infof("Successfully deployed %s", appName) + log.Infof("successfully deployed %s", appName) } return err } @@ -265,7 +265,7 @@ func createSecrets(ctx context.Context, cl *dockerClient.Client, secrets []swarm } case dockerClient.IsErrNotFound(err): // secret does not exist, then we create a new one. - log.Infof("Creating secret %s\n", secretSpec.Name) + log.Infof("creating secret %s", secretSpec.Name) if _, err := cl.SecretCreate(ctx, secretSpec); err != nil { return errors.Wrapf(err, "failed to create secret %s", secretSpec.Name) } @@ -287,7 +287,7 @@ func createConfigs(ctx context.Context, cl *dockerClient.Client, configs []swarm } case dockerClient.IsErrNotFound(err): // config does not exist, then we create a new one. - log.Infof("creating config %s\n", configSpec.Name) + log.Infof("creating config %s", configSpec.Name) if _, err := cl.ConfigCreate(ctx, configSpec); err != nil { return errors.Wrapf(err, "failed to create config %s", configSpec.Name) } @@ -318,7 +318,7 @@ func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace conv createOpts.Driver = defaultNetworkDriver } - log.Infof("creating network %s\n", name) + log.Infof("creating network %s", name) if _, err := cl.NetworkCreate(ctx, name, createOpts); err != nil { return errors.Wrapf(err, "failed to create network %s", name) } @@ -355,7 +355,7 @@ func deployServices( ) if service, exists := existingServiceMap[name]; exists { - log.Infof("Updating service %s (id: %s)\n", name, service.ID) + log.Infof("updating service %s (id: %s)", name, service.ID) updateOpts := types.ServiceUpdateOptions{EncodedRegistryAuth: encodedAuth} @@ -399,7 +399,7 @@ func deployServices( serviceIDs = append(serviceIDs, service.ID) } else { - log.Infof("creating service %s\n", name) + log.Infof("creating service %s", name) createOpts := types.ServiceCreateOptions{EncodedRegistryAuth: encodedAuth}