From dbfa2f9944fa725cd176ba6e46307d2105465daf Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Tue, 23 Jun 2020 12:54:51 +0200 Subject: [PATCH] Improve cmd messages --- cmd/tk/check.go | 12 ++++++------ cmd/tk/create_source_git.go | 10 +++++----- cmd/tk/export_source_git.go | 6 +++--- cmd/tk/get_source_git.go | 2 +- cmd/tk/sync_source_git.go | 2 +- cmd/tk/utils.go | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/tk/check.go b/cmd/tk/check.go index a3db5d61..735656e8 100644 --- a/cmd/tk/check.go +++ b/cmd/tk/check.go @@ -122,35 +122,35 @@ func kubectlCheck(ctx context.Context, version string) bool { func kubernetesCheck(version string) bool { cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfig) if err != nil { - logFailure("kubernetes client initialization failed: %s", err.Error()) + logFailure("Kubernetes client initialization failed: %s", err.Error()) return false } client, err := kubernetes.NewForConfig(cfg) if err != nil { - logFailure("kubernetes client initialization failed: %s", err.Error()) + logFailure("Kubernetes client initialization failed: %s", err.Error()) return false } ver, err := client.Discovery().ServerVersion() if err != nil { - logFailure("kubernetes API call failed %s", err.Error()) + logFailure("Kubernetes API call failed: %s", err.Error()) return false } v, err := semver.ParseTolerant(ver.String()) if err != nil { - logFailure("kubernetes version can't be determined") + logFailure("Kubernetes version can't be determined") return false } rng, _ := semver.ParseRange(version) if !rng(v) { - logFailure("kubernetes version must be %s", version) + logFailure("Kubernetes version must be %s", version) return false } - logSuccess("kubernetes %s %s", v.String(), version) + logSuccess("Kubernetes %s %s", v.String(), version) return true } diff --git a/cmd/tk/create_source_git.go b/cmd/tk/create_source_git.go index a6db3617..501cbf70 100644 --- a/cmd/tk/create_source_git.go +++ b/cmd/tk/create_source_git.go @@ -258,7 +258,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error { } if gitRepository.Status.Artifact != nil { - logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision) + logSuccess("fetched revision: %s", gitRepository.Status.Artifact.Revision) } else { return fmt.Errorf("git sync failed, artifact not found") } @@ -268,7 +268,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error { func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) { var keyGen ssh.KeyPairGenerator - switch sourceGitKeyAlgorithm.String() { + switch algorithm := sourceGitKeyAlgorithm.String(); algorithm { case "rsa": keyGen = ssh.NewRSAGenerator(int(sourceGitRSABits)) case "ecdsa": @@ -276,11 +276,11 @@ func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) { case "ed25519": keyGen = ssh.NewEd25519Generator() default: - return nil, fmt.Errorf("unsupported public key algorithm '%s'", sourceGitKeyAlgorithm.String()) + return nil, fmt.Errorf("unsupported public key algorithm: %s", algorithm) } pair, err := keyGen.Generate() if err != nil { - return nil, fmt.Errorf("key pair generation failed: %w", err) + return nil, fmt.Errorf("key pair generation failed, error: %w", err) } return pair, nil } @@ -292,7 +292,7 @@ func scanHostKey(ctx context.Context, url *url.URL) ([]byte, error) { } hostKey, err := ssh.ScanHostKey(host, 30*time.Second) if err != nil { - return nil, fmt.Errorf("SSH key scan for host '%s' failed: %w", host, err) + return nil, fmt.Errorf("SSH key scan for host %s failed, error: %w", host, err) } return hostKey, nil } diff --git a/cmd/tk/export_source_git.go b/cmd/tk/export_source_git.go index e9fd7f26..b8d38e99 100644 --- a/cmd/tk/export_source_git.go +++ b/cmd/tk/export_source_git.go @@ -125,16 +125,16 @@ func exportGit(source sourcev1.GitRepository) error { return nil } -func exportGitCredentials(ctx context.Context, kubeClinet client.Client, source sourcev1.GitRepository) error { +func exportGitCredentials(ctx context.Context, kubeClient client.Client, source sourcev1.GitRepository) error { if source.Spec.SecretRef != nil { namespacedName := types.NamespacedName{ Namespace: source.Namespace, Name: source.Spec.SecretRef.Name, } var cred corev1.Secret - err := kubeClinet.Get(ctx, namespacedName, &cred) + err := kubeClient.Get(ctx, namespacedName, &cred) if err != nil { - return fmt.Errorf("get secret failed: %w", err) + return fmt.Errorf("failed to retrieve secret %s, error: %w", namespacedName.Name, err) } exported := corev1.Secret{ diff --git a/cmd/tk/get_source_git.go b/cmd/tk/get_source_git.go index 9de4236d..b3a04fcc 100644 --- a/cmd/tk/get_source_git.go +++ b/cmd/tk/get_source_git.go @@ -62,7 +62,7 @@ func getSourceGitCmdRun(cmd *cobra.Command, args []string) error { for _, condition := range source.Status.Conditions { if condition.Type == sourcev1.ReadyCondition { if condition.Status != corev1.ConditionFalse { - logSuccess("%s last fetched revision %s", source.GetName(), source.Status.Artifact.Revision) + logSuccess("%s last fetched revision: %s", source.GetName(), source.Status.Artifact.Revision) } else { logFailure("%s %s", source.GetName(), condition.Message) } diff --git a/cmd/tk/sync_source_git.go b/cmd/tk/sync_source_git.go index 4950699b..efa0678a 100644 --- a/cmd/tk/sync_source_git.go +++ b/cmd/tk/sync_source_git.go @@ -93,7 +93,7 @@ func syncSourceGitCmdRun(cmd *cobra.Command, args []string) error { } if gitRepository.Status.Artifact != nil { - logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision) + logSuccess("fetched revision: %s", gitRepository.Status.Artifact.Revision) } else { return fmt.Errorf("git sync failed, artifact not found") } diff --git a/cmd/tk/utils.go b/cmd/tk/utils.go index 0183a456..433bcbac 100644 --- a/cmd/tk/utils.go +++ b/cmd/tk/utils.go @@ -111,7 +111,7 @@ func (*Utils) execTemplate(obj interface{}, tmpl, filename string) error { func (*Utils) kubeClient(config string) (client.Client, error) { cfg, err := clientcmd.BuildConfigFromFlags("", config) if err != nil { - return nil, fmt.Errorf("kubernetes client initialization failed: %w", err) + return nil, fmt.Errorf("Kubernetes client initialization failed: %w", err) } scheme := runtime.NewScheme() @@ -123,7 +123,7 @@ func (*Utils) kubeClient(config string) (client.Client, error) { Scheme: scheme, }) if err != nil { - return nil, fmt.Errorf("kubernetes client initialization failed: %w", err) + return nil, fmt.Errorf("Kubernetes client initialization failed: %w", err) } return kubeClient, nil