kopia/repository/config/aws.go: Set session.Options profile from config

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
vmware-tanzu · Oct 20, 2023 · 01cc1bd · 01cc1bd
1 parent 5c4fdfe
commit 01cc1bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/changelogs/unreleased/6997-kaovilai b/changelogs/unreleased/6997-kaovilai
@@ -0,0 +1 @@
+Fix unified repository (kopia) s3 credentials profile selection
diff --git a/pkg/apis/velero/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/velero/v2alpha1/zz_generated.deepcopy.go
diff --git a/pkg/repository/config/aws.go b/pkg/repository/config/aws.go
@@ -64,7 +64,7 @@ func GetS3ResticEnvVars(config map[string]string) (map[string]string, error) {
 		result[awsSecretKeyEnvVar] = creds.SecretAccessKey
 		result[awsSessTokenEnvVar] = creds.SessionToken
 		result[awsCredentialsFileEnvVar] = ""
-		result[awsProfileEnvVar] = ""
+		result[awsProfileEnvVar] = "" // profile is not needed since we have the credentials from profile via GetS3Credentials
 		result[awsConfigFileEnvVar] = ""
 	}
 
@@ -87,6 +87,7 @@ func GetS3Credentials(config map[string]string) (*credentials.Value, error) {
 		opts.SharedConfigFiles = append(opts.SharedConfigFiles, credentialsFile)
 		opts.SharedConfigState = session.SharedConfigEnable
 	}
+	opts.Profile = config[awsProfileKey]
 
 	sess, err := session.NewSessionWithOptions(opts)
 	if err != nil {