Merge branch 'develop' into develop

Author: hanwen-cluster

cookbooks/aws-parallelcluster-environment/templates/directory_service/update_directory_service_password.sh.erb

@@ -27,9 +27,8 @@ echo "[INFO] Reading password from AWS: ${SECRET_ARN}"
 service=$(echo "${SECRET_ARN}" | cut -d ':' -f 3)
 resource=$(echo "${SECRET_ARN}" | cut -d ':' -f 6-)
 if [ "$service" == "secretsmanager" ]; then
-  secret_name=$(echo "$resource" | cut -d ':' -f 2)
-  echo "[INFO] Reading password as a secret from AWS Secrets Manager: ${secret_name}"
-  password_from_secret_store=$(aws secretsmanager get-secret-value --secret-id "${secret_name}" --region "${REGION}" --query "SecretString" --output text)
+  echo "[INFO] Reading password as a secret from AWS Secrets Manager: ${SECRET_ARN}"
+  password_from_secret_store=$(aws secretsmanager get-secret-value --secret-id "${SECRET_ARN}" --region "${REGION}" --query "SecretString" --output text)
 elif [ "$service" == "ssm" ]; then
   parameter_name=$(echo "$resource" | cut -d '/' -f 2)
   echo "[INFO] Reading password as a parameter from AWS SSM: ${SECRET_ARN}"