Skip to content

Commit c729432

Browse files
jkayanijkayani
committed
refactor: Move conditional to VerboseToStdErr()
1 parent 28e6fb1 commit c729432

17 files changed

+78
-181
lines changed

Diff for: ‎cmd/generate.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ func NewGenerateCommand() *cobra.Command {
9494
return err
9595
}
9696
} else {
97-
if viper.GetBool("verboseOutput") {
98-
utils.VerboseToStdErr("skipping %s.%s because %s annotation is present", manifest.GetNamespace(), manifest.GetName(), types.AVPIgnoreAnnotation)
99-
}
97+
utils.VerboseToStdErr("skipping %s.%s because %s annotation is present", manifest.GetNamespace(), manifest.GetName(), types.AVPIgnoreAnnotation)
10098
}
10199

102100
output, err := template.ToYAML()

Diff for: ‎pkg/auth/vault/approle.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
66
"github.com/hashicorp/vault/api"
7-
"github.com/spf13/viper"
87
)
98

109
const (
@@ -39,23 +38,18 @@ func (a *AppRoleAuth) Authenticate(vaultClient *api.Client) error {
3938
"secret_id": a.SecretID,
4039
}
4140

42-
if viper.GetBool("verboseOutput") {
43-
utils.VerboseToStdErr("Hashicorp Vault authenticating with role ID %s and secret ID %s", a.RoleID, a.SecretID)
44-
}
41+
utils.VerboseToStdErr("Hashicorp Vault authenticating with role ID %s and secret ID %s", a.RoleID, a.SecretID)
4542
data, err := vaultClient.Logical().Write(fmt.Sprintf("%s/login", a.MountPath), payload)
4643
if err != nil {
4744
return err
4845
}
49-
if viper.GetBool("verboseOutput") {
50-
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
51-
}
46+
47+
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
5248

5349
// If we cannot write the Vault token, we'll just have to login next time. Nothing showstopping.
5450
err = utils.SetToken(vaultClient, data.Auth.ClientToken)
5551
if err != nil {
56-
if viper.GetBool("verboseOutput") {
57-
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
58-
}
52+
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
5953
}
6054

6155
return nil

Diff for: ‎pkg/auth/vault/github.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
77
"github.com/hashicorp/vault/api"
8-
"github.com/spf13/viper"
98
)
109

1110
const (
@@ -37,23 +36,18 @@ func (g *GithubAuth) Authenticate(vaultClient *api.Client) error {
3736
"token": g.AccessToken,
3837
}
3938

40-
if viper.GetBool("verboseOutput") {
41-
utils.VerboseToStdErr("Hashicorp Vault authenticating with Github token %s", g.AccessToken)
42-
}
39+
utils.VerboseToStdErr("Hashicorp Vault authenticating with Github token %s", g.AccessToken)
4340
data, err := vaultClient.Logical().Write(fmt.Sprintf("%s/login", g.MountPath), payload)
4441
if err != nil {
4542
return err
4643
}
47-
if viper.GetBool("verboseOutput") {
48-
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
49-
}
44+
45+
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
5046

5147
// If we cannot write the Vault token, we'll just have to login next time. Nothing showstopping.
5248
err = utils.SetToken(vaultClient, data.Auth.ClientToken)
5349
if err != nil {
54-
if viper.GetBool("verboseOutput") {
55-
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
56-
}
50+
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
5751
}
5852

5953
return nil

Diff for: ‎pkg/auth/vault/kubernetes.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
1010
"github.com/hashicorp/vault/api"
11-
"github.com/spf13/viper"
1211
)
1312

1413
const (
@@ -55,23 +54,18 @@ func (k *K8sAuth) Authenticate(vaultClient *api.Client) error {
5554
kubeAuthPath = k.MountPath
5655
}
5756

58-
if viper.GetBool("verboseOutput") {
59-
utils.VerboseToStdErr("Hashicorp Vault authenticating with Vault role %s using Kubernetes service account token %s read from %s", k.Role, serviceAccountFile, token)
60-
}
57+
utils.VerboseToStdErr("Hashicorp Vault authenticating with Vault role %s using Kubernetes service account token %s read from %s", k.Role, serviceAccountFile, token)
6158
data, err := vaultClient.Logical().Write(fmt.Sprintf("%s/login", kubeAuthPath), payload)
6259
if err != nil {
6360
return err
6461
}
65-
if viper.GetBool("verboseOutput") {
66-
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
67-
}
62+
63+
utils.VerboseToStdErr("Hashicorp Vault authentication response: %v", data)
6864

6965
// If we cannot write the Vault token, we'll just have to login next time. Nothing showstopping.
7066
err = utils.SetToken(vaultClient, data.Auth.ClientToken)
7167
if err != nil {
72-
if viper.GetBool("verboseOutput") {
73-
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
74-
}
68+
utils.VerboseToStdErr("Hashicorp Vault cannot cache token for future runs: %v", err)
7569
}
7670

7771
return nil

Diff for: ‎pkg/backends/awssecretsmanager.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/aws/aws-sdk-go/aws"
99
"github.com/aws/aws-sdk-go/service/secretsmanager"
1010
"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
11-
"github.com/spf13/viper"
1211
)
1312

1413
// AWSSecretsManager is a struct for working with a AWS Secrets Manager backend
@@ -38,16 +37,13 @@ func (a *AWSSecretsManager) GetSecrets(path string, version string, annotations
3837
input.SetVersionId(version)
3938
}
4039

41-
if viper.GetBool("verboseOutput") {
42-
utils.VerboseToStdErr("AWS Secrets Manager getting secret %s at version %s", path, version)
43-
}
40+
utils.VerboseToStdErr("AWS Secrets Manager getting secret %s at version %s", path, version)
4441
result, err := a.Client.GetSecretValue(input)
4542
if err != nil {
4643
return nil, err
4744
}
48-
if viper.GetBool("verboseOutput") {
49-
utils.VerboseToStdErr("AWS Secrets Manager get secret response %v", result)
50-
}
45+
46+
utils.VerboseToStdErr("AWS Secrets Manager get secret response %v", result)
5147

5248
var dat map[string]interface{}
5349

Diff for: ‎pkg/backends/azurekeyvault.go

+13-25
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"github.com/Azure/azure-sdk-for-go/profiles/latest/keyvault/keyvault"
77
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
8-
"github.com/spf13/viper"
98
"path"
109
"strings"
1110
"time"
@@ -38,31 +37,25 @@ func (a *AzureKeyVault) GetSecrets(kvpath string, version string, _ map[string]s
3837

3938
data := make(map[string]interface{})
4039

41-
if viper.GetBool("verboseOutput") {
42-
utils.VerboseToStdErr("Azure Key Vault listing secrets in vault %v", kvpath)
43-
}
40+
utils.VerboseToStdErr("Azure Key Vault listing secrets in vault %v", kvpath)
4441
secretList, err := a.Client.GetSecretsComplete(ctx, kvpath, nil)
4542
if err != nil {
4643
return nil, err
4744
}
48-
if viper.GetBool("verboseOutput") {
49-
utils.VerboseToStdErr("Azure Key Vault list secrets response %v", secretList)
50-
}
45+
46+
utils.VerboseToStdErr("Azure Key Vault list secrets response %v", secretList)
5147
// Gather all secrets in Key Vault
5248

5349
for ; secretList.NotDone(); secretList.NextWithContext(ctx) {
5450
secret := path.Base(*secretList.Value().ID)
5551
if version == "" {
56-
if viper.GetBool("verboseOutput") {
57-
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s", secret, kvpath)
58-
}
52+
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s", secret, kvpath)
5953
secretResp, err := a.Client.GetSecret(ctx, kvpath, secret, "")
6054
if err != nil {
6155
return nil, err
6256
}
63-
if viper.GetBool("verboseOutput") {
64-
utils.VerboseToStdErr("Azure Key Vault get unversioned secret response %v", secretResp)
65-
}
57+
58+
utils.VerboseToStdErr("Azure Key Vault get unversioned secret response %v", secretResp)
6659
data[secret] = *secretResp.Value
6760
continue
6861
}
@@ -77,16 +70,13 @@ func (a *AzureKeyVault) GetSecrets(kvpath string, version string, _ map[string]s
7770
}
7871
// Secret version matched given version
7972
if strings.Contains(*secretVersion.ID, version) {
80-
if viper.GetBool("verboseOutput") {
81-
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s at version %s", secret, kvpath, version)
82-
}
73+
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s at version %s", secret, kvpath, version)
8374
secretResp, err := a.Client.GetSecret(ctx, kvpath, secret, version)
8475
if err != nil {
8576
return nil, err
8677
}
87-
if viper.GetBool("verboseOutput") {
88-
utils.VerboseToStdErr("Azure Key Vault get versioned secret response %v", secretResp)
89-
}
78+
79+
utils.VerboseToStdErr("Azure Key Vault get versioned secret response %v", secretResp)
9080
data[secret] = *secretResp.Value
9181
}
9282
}
@@ -101,18 +91,16 @@ func (a *AzureKeyVault) GetSecrets(kvpath string, version string, _ map[string]s
10191
func (a *AzureKeyVault) GetIndividualSecret(kvpath, secret, version string, annotations map[string]string) (interface{}, error) {
10292
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
10393
defer cancel()
104-
if viper.GetBool("verboseOutput") {
105-
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s at version %s", secret, kvpath, version)
106-
}
94+
95+
utils.VerboseToStdErr("Azure Key Vault getting secret %s from vault %s at version %s", secret, kvpath, version)
10796

10897
kvpath = fmt.Sprintf("https://%s.vault.azure.net", kvpath)
10998
data, err := a.Client.GetSecret(ctx, kvpath, secret, version)
11099
if err != nil {
111100
return nil, err
112101
}
113-
if viper.GetBool("verboseOutput") {
114-
utils.VerboseToStdErr("Azure Key Vault get versioned secret response %v", data)
115-
}
102+
103+
utils.VerboseToStdErr("Azure Key Vault get versioned secret response %v", data)
116104

117105
return *data.Value, nil
118106
}

Diff for: ‎pkg/backends/gcpsecretmanager.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/argoproj-labs/argocd-vault-plugin/pkg/types"
99
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
1010
"github.com/googleapis/gax-go/v2"
11-
"github.com/spf13/viper"
1211
secretmanagerpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
1312
)
1413

@@ -52,16 +51,13 @@ func (a *GCPSecretManager) GetSecrets(path string, version string, annotations m
5251
Name: fmt.Sprintf("%s/versions/%s", path, version),
5352
}
5453

55-
if viper.GetBool("verboseOutput") {
56-
utils.VerboseToStdErr("GCP Secret Manager accessing secret at path %s at version %v", path, version)
57-
}
54+
utils.VerboseToStdErr("GCP Secret Manager accessing secret at path %s at version %v", path, version)
5855
result, err := a.Client.AccessSecretVersion(a.Context, req)
5956
if err != nil {
6057
return nil, fmt.Errorf("Could not find secret: %v", err)
6158
}
62-
if viper.GetBool("verboseOutput") {
63-
utils.VerboseToStdErr("GCP Secret Manager access secret version response %v", result)
64-
}
59+
60+
utils.VerboseToStdErr("GCP Secret Manager access secret version response %v", result)
6561

6662
data := make(map[string]interface{})
6763

Diff for: ‎pkg/backends/ibmsecretsmanager.go

+7-23
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
ibmsm "github.com/IBM/secrets-manager-go-sdk/secretsmanagerv1"
1010
"github.com/argoproj-labs/argocd-vault-plugin/pkg/types"
1111
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
12-
"github.com/spf13/viper"
1312
)
1413

1514
var IBMPath, _ = regexp.Compile(`ibmcloud/(?P<type>.+)/secrets/groups/(?P<groupId>.+)`)
@@ -122,9 +121,7 @@ func (i *IBMSecretsManager) getSecretVersionedOrNot(secret *ibmsm.SecretResource
122121
return nil, fmt.Errorf("Could not retrieve secret %s after %d retries, statuscode %d", *secret.ID, types.IBMMaxRetries, httpResponse.GetStatusCode())
123122
}
124123

125-
if viper.GetBool("verboseOutput") {
126-
utils.VerboseToStdErr("IBM Cloud Secrets Manager get versioned secret %s HTTP response: %v", *secret.ID, httpResponse)
127-
}
124+
utils.VerboseToStdErr("IBM Cloud Secrets Manager get versioned secret %s HTTP response: %v", *secret.ID, httpResponse)
128125

129126
result = (secretVersion.Resources[0].(*ibmsm.SecretVersion)).SecretData.(map[string]interface{})
130127
} else {
@@ -139,9 +136,7 @@ func (i *IBMSecretsManager) getSecretVersionedOrNot(secret *ibmsm.SecretResource
139136
return nil, fmt.Errorf("Could not retrieve secret %s after %d retries, statuscode %d", *secret.ID, types.IBMMaxRetries, httpResponse.GetStatusCode())
140137
}
141138

142-
if viper.GetBool("verboseOutput") {
143-
utils.VerboseToStdErr("IBM Cloud Secrets Manager get unversioned secret %s HTTP response: %v", *secret.ID, httpResponse)
144-
}
139+
utils.VerboseToStdErr("IBM Cloud Secrets Manager get unversioned secret %s HTTP response: %v", *secret.ID, httpResponse)
145140

146141
// APIKey secrets don't come from `SecretData`
147142
if *secret.SecretType == types.IBMIAMCredentialsType {
@@ -181,15 +176,10 @@ func (i *IBMSecretsManager) getSecret(secret *ibmsm.SecretResource, version stri
181176

182177
// Bypass the cache when explicit version is requested
183178
if cacheResult != nil && version == "" {
184-
if viper.GetBool("verboseOutput") {
185-
utils.VerboseToStdErr("IBM Cloud Secrets Manager get secret: cache hit for %s of type %s from group %s", secretName, secretType, groupId)
186-
}
179+
utils.VerboseToStdErr("IBM Cloud Secrets Manager get secret: cache hit for %s of type %s from group %s", secretName, secretType, groupId)
187180
result["payload"] = cacheResult
188181
} else {
189-
190-
if viper.GetBool("verboseOutput") {
191-
utils.VerboseToStdErr("IBM Cloud Secrets Manager get secret: getting secret %s of type %s from group %s", secretName, secretType, groupId)
192-
}
182+
utils.VerboseToStdErr("IBM Cloud Secrets Manager get secret: getting secret %s of type %s from group %s", secretName, secretType, groupId)
193183
secretData, err := i.getSecretVersionedOrNot(secret, version)
194184
var payload interface{}
195185
if err != nil {
@@ -227,17 +217,13 @@ func (i *IBMSecretsManager) listSecretsInGroup(groupId, secretType string) (map[
227217
ckey := cacheKey{groupId, secretType}
228218
cachedData := i.listAllSecretsCache[ckey]
229219
if cachedData != nil {
230-
if viper.GetBool("verboseOutput") {
231-
utils.VerboseToStdErr("IBM Cloud Secrets Manager list secrets in group: cache hit group %s", groupId)
232-
}
220+
utils.VerboseToStdErr("IBM Cloud Secrets Manager list secrets in group: cache hit group %s", groupId)
233221
return cachedData, nil
234222
}
235223

236224
var offset int64 = 0
237225
for {
238-
if viper.GetBool("verboseOutput") {
239-
utils.VerboseToStdErr("IBM Cloud Secrets Manager listing secrets of from group %s starting at offset %d", groupId, offset)
240-
}
226+
utils.VerboseToStdErr("IBM Cloud Secrets Manager listing secrets of from group %s starting at offset %d", groupId, offset)
241227
res, details, err := i.Client.ListAllSecrets(&ibmsm.ListAllSecretsOptions{
242228
Groups: []string{groupId},
243229
Offset: &offset,
@@ -249,9 +235,7 @@ func (i *IBMSecretsManager) listSecretsInGroup(groupId, secretType string) (map[
249235
return nil, fmt.Errorf("Could not list secrets for secret group %s: %d\n%s", groupId, details.GetStatusCode(), details.String())
250236
}
251237

252-
if viper.GetBool("verboseOutput") {
253-
utils.VerboseToStdErr("IBM Cloud Secrets Manager list secrets in group HTTP response: %v", details)
254-
}
238+
utils.VerboseToStdErr("IBM Cloud Secrets Manager list secrets in group HTTP response: %v", details)
255239

256240
for _, secret := range res.Resources {
257241
name := *(secret.(*ibmsm.SecretResource).Name)

Diff for: ‎pkg/backends/localsecretmanager.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55

66
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
7-
"github.com/spf13/viper"
87
"k8s.io/apimachinery/pkg/util/yaml"
98
)
109

@@ -30,14 +29,10 @@ func (a *LocalSecretManager) Login() error {
3029

3130
// GetSecrets gets secrets using decrypt function and returns the formatted data
3231
func (a *LocalSecretManager) GetSecrets(path string, version string, annotations map[string]string) (map[string]interface{}, error) {
33-
34-
if viper.GetBool("verboseOutput") {
35-
utils.VerboseToStdErr("Local secret manager getting secret %s at version %s", path, version)
36-
}
32+
utils.VerboseToStdErr("Local secret manager getting secret %s at version %s", path, version)
3733
cleartext, err := a.Decrypt(path, "yaml")
38-
if viper.GetBool("verboseOutput") {
39-
utils.VerboseToStdErr("Local secret manager get secret response: %v", cleartext)
40-
}
34+
35+
utils.VerboseToStdErr("Local secret manager get secret response: %v", cleartext)
4136

4237
var dat map[string]interface{}
4338

Diff for: ‎pkg/backends/onepasswordconnect.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"github.com/1Password/connect-sdk-go/connect"
77
"github.com/argoproj-labs/argocd-vault-plugin/pkg/utils"
8-
"github.com/spf13/viper"
98
)
109

1110
// OnePassword is a struct for working with a 1Password Connect backend
@@ -32,16 +31,13 @@ func (a *OnePasswordConnect) GetSecrets(path string, version string, annotations
3231
vaultUUID := splits[1]
3332
itemUUID := splits[3]
3433

35-
if viper.GetBool("verboseOutput") {
36-
utils.VerboseToStdErr("OnePassword Connect getting item %s from vault %s", itemUUID, vaultUUID)
37-
}
34+
utils.VerboseToStdErr("OnePassword Connect getting item %s from vault %s", itemUUID, vaultUUID)
3835
result, err := a.Client.GetItem(itemUUID, vaultUUID)
3936
if err != nil {
4037
return nil, err
4138
}
42-
if viper.GetBool("verboseOutput") {
43-
utils.VerboseToStdErr("OnePassword Connect get secret response: %v", result)
44-
}
39+
40+
utils.VerboseToStdErr("OnePassword Connect get secret response: %v", result)
4541

4642
data := make(map[string]interface{})
4743

0 commit comments

Comments
 (0)