Skip to content

Commit

Permalink
[autofix.ci] apply automated fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
autofix-ci[bot] authored Feb 6, 2025
1 parent dfab44d commit 6e490f9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions pkg/store/google_secret_manager_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *GSMStore) Set(stack string, component string, key string, value interfa
},
}

log.Debug("creating/updating Google Secret Manager secret",
log.Debug("creating/updating Google Secret Manager secret",
"project", s.projectID,
"secret_id", secretID,
"stack", stack,
Expand All @@ -147,21 +147,21 @@ func (s *GSMStore) Set(stack string, component string, key string, value interfa
if err != nil {
// Ignore error if secret already exists
if !strings.Contains(err.Error(), "already exists") {
log.Debug("failed to create secret",
log.Debug("failed to create secret",
"project", s.projectID,
"secret_id", secretID,
"error", err)
return fmt.Errorf("failed to create secret: %w", err)
}
log.Debug("secret already exists",
log.Debug("secret already exists",
"project", s.projectID,
"secret_id", secretID)
// If the secret already exists, construct the name manually
secret = &secretmanagerpb.Secret{
Name: fmt.Sprintf("projects/%s/secrets/%s", s.projectID, secretID),
}
} else {
log.Debug("successfully created secret",
log.Debug("successfully created secret",
"name", secret.GetName())
}

Expand All @@ -173,18 +173,18 @@ func (s *GSMStore) Set(stack string, component string, key string, value interfa
},
}

log.Debug("adding new version to secret",
log.Debug("adding new version to secret",
"name", secret.GetName())

_, err = s.client.AddSecretVersion(ctx, addVersionReq)
if err != nil {
log.Debug("failed to add version to secret",
log.Debug("failed to add version to secret",
"name", secret.GetName(),
"error", err)
return fmt.Errorf("failed to add secret version: %w", err)
}

log.Debug("successfully added new version to secret",
log.Debug("successfully added new version to secret",
"name", secret.GetName())
return nil
}
Expand All @@ -211,8 +211,8 @@ func (s *GSMStore) Get(stack string, component string, key string) (interface{},

// Build the resource name for the latest version
name := fmt.Sprintf("projects/%s/secrets/%s/versions/latest", s.projectID, secretID)
log.Debug("accessing Google Secret Manager secret",

log.Debug("accessing Google Secret Manager secret",
"name", name,
"project", s.projectID,
"secret_id", secretID,
Expand All @@ -225,13 +225,13 @@ func (s *GSMStore) Get(stack string, component string, key string) (interface{},
Name: name,
})
if err != nil {
log.Debug("failed to access secret",
log.Debug("failed to access secret",
"name", name,
"error", err)
return nil, fmt.Errorf("failed to access secret version: %w", err)
}

log.Debug("successfully accessed secret",
log.Debug("successfully accessed secret",
"name", name)
return string(result.Payload.Data), nil
}
}
2 changes: 1 addition & 1 deletion pkg/store/google_secret_manager_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -426,4 +426,4 @@ func TestNewGSMStore(t *testing.T) {
t.Skip("GOOGLE_APPLICATION_CREDENTIALS not set")
}
})
}
}

0 comments on commit 6e490f9

Please sign in to comment.