From 4929729a590bd48e719fc853b2891be9de3d29e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yang=20Gang=20=28=E6=88=90=E9=83=BD=29?= Date: Tue, 12 Sep 2023 14:43:28 +0800 Subject: [PATCH] code clean for repository (#6768) Signed-off-by: yanggang --- pkg/repository/backup_repo_op.go | 4 ++-- pkg/repository/config/aws.go | 2 +- pkg/repository/config/gcp.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/repository/backup_repo_op.go b/pkg/repository/backup_repo_op.go index 7025349a97..ff253e6038 100644 --- a/pkg/repository/backup_repo_op.go +++ b/pkg/repository/backup_repo_op.go @@ -107,9 +107,9 @@ func NewBackupRepository(namespace string, key BackupRepositoryKey) *velerov1api } func isBackupRepositoryNotFoundError(err error) bool { - return (err == errBackupRepoNotFound) + return err == errBackupRepoNotFound } func isBackupRepositoryNotProvisionedError(err error) bool { - return (err == errBackupRepoNotProvisioned) + return err == errBackupRepoNotProvisioned } diff --git a/pkg/repository/config/aws.go b/pkg/repository/config/aws.go index c3a3f4dd8b..cc4e14f598 100644 --- a/pkg/repository/config/aws.go +++ b/pkg/repository/config/aws.go @@ -81,7 +81,7 @@ func GetS3Credentials(config map[string]string) (*credentials.Value, error) { opts := session.Options{} credentialsFile := config[CredentialsFileKey] if credentialsFile == "" { - credentialsFile = os.Getenv("AWS_SHARED_CREDENTIALS_FILE") + credentialsFile = os.Getenv(awsCredentialsFileEnvVar) } if credentialsFile != "" { opts.SharedConfigFiles = append(opts.SharedConfigFiles, credentialsFile) diff --git a/pkg/repository/config/gcp.go b/pkg/repository/config/gcp.go index 5be4670ec6..8beb8a016c 100644 --- a/pkg/repository/config/gcp.go +++ b/pkg/repository/config/gcp.go @@ -42,5 +42,5 @@ func GetGCPCredentials(config map[string]string) string { if credentialsFile, ok := config[CredentialsFileKey]; ok { return credentialsFile } - return os.Getenv("GOOGLE_APPLICATION_CREDENTIALS") + return os.Getenv(gcpCredentialsFileEnvVar) }