Allow getting S3 credentials from environment variables

secrets_manager/secrets_manager.go

@@ -51,15 +51,23 @@ func GetDatabaseCredentials(secretID string, isDebug bool) (DatabaseCredentials,
 }
 
 func GetS3UploadCredentialsProvider(secretID string, isDebug bool) (credentials.StaticCredentialsProvider, error) {
-	secret, _ := GetSecret(secretID, isDebug)
 	var secretValue S3UploadCredentials
+	if secretID != "" {
+		secret, _ := GetSecret(secretID, isDebug)
 		err := struct_utils.UnmarshalJSON([]byte(secret), &secretValue)
 		if err != nil {
 			return credentials.StaticCredentialsProvider{}, err
 		}
+	}
+
+	// Attempt to get credentials from the environment variables if not set in the secret
+	if secretValue.AccessKeyID == "" && secretValue.SecretKey == "" {
+		secretValue.AccessKeyID = os.Getenv("AWS_ACCESS_KEY")
+		secretValue.SecretKey = os.Getenv("AWS_SECRET_KEY")
+	}
 
 	if secretValue.AccessKeyID == "" || secretValue.SecretKey == "" {
-		return credentials.StaticCredentialsProvider{}, err
+		return credentials.StaticCredentialsProvider{}, nil
 	}
 
 	return credentials.NewStaticCredentialsProvider(secretValue.AccessKeyID, secretValue.SecretKey, ""), nil