Fix 053-config (shared bucket + read), 082-polly (SSML quotes + CLI flag), 046-ssm (unique policy name), 067-payment-crypto (negative test), 010-cloudmap (regex)

All verified locally:
053-aws-config-gs: ✓ (skip bucket create when shared, auto-answer cleanup)
082-amazon-polly-gs: ✓ (single-quote SSML, remove --max-results)
046-aws-systems-manager-gs: ✓ (unique policy name with random suffix)
067-aws-payment-cryptography-gs: ✓ (check exit code not grep output)
010-cloudmap-service-discovery: needs Route 53 hosted zone (prereq)

Author: mwunderl

tuts/010-cloudmap-service-discovery/cloudmap-service-discovery.sh

@@ -89,7 +89,7 @@ check_operation() {
     local retry_count=0
 
     # Validate operation_id format (basic UUID validation)
-    if [[ -z "$operation_id" ]] || ! [[ "$operation_id" =~ ^[a-fA-F0-9-]+$ ]]; then
+    if [[ -z "$operation_id" ]] || ! [[ "$operation_id" =~ ^[a-z0-9-]+$ ]]; then
         log "Error: Invalid operation_id format"
         return 1
     fi
@@ -240,7 +240,7 @@ NAMESPACE_ID=$(aws servicediscovery list-namespaces \
     --query "Namespaces[?Name=='$NAMESPACE_NAME'].Id" \
     --output text)
 
-if [[ -z "$NAMESPACE_ID" ]] || ! [[ "$NAMESPACE_ID" =~ ^[a-fA-F0-9-]+$ ]]; then
+if [[ -z "$NAMESPACE_ID" ]] || ! [[ "$NAMESPACE_ID" =~ ^[a-z0-9-]+$ ]]; then
     log "Error: Failed to retrieve namespace ID"
     exit 1
 fi

tuts/046-aws-systems-manager-gs/aws-systems-manager-gs.sh

@@ -9,6 +9,7 @@
 
 # Initialize log file
 LOG_FILE="ssm_setup_$(date +%Y%m%d_%H%M%S).log"
+UNIQUE_ID=$(openssl rand -hex 4)
 echo "Starting AWS Systems Manager setup at $(date)" > "$LOG_FILE"
 
 # Function to log commands and their outputs with immediate terminal display
@@ -369,12 +370,12 @@ cat > ssm-onboarding-policy.json << 'EOF'
 EOF
 
 # Create the IAM policy
-POLICY_OUTPUT=$(log_cmd "aws iam create-policy --policy-name SSMOnboardingPolicy --policy-document file://ssm-onboarding-policy.json --output json")
+POLICY_OUTPUT=$(log_cmd "aws iam create-policy --policy-name SSMOnboardingPolicy-$UNIQUE_ID --policy-document file://ssm-onboarding-policy.json --output json")
 POLICY_STATUS=$?
 check_error "$POLICY_OUTPUT" $POLICY_STATUS "Failed to create IAM policy"
 
 # Extract the policy ARN
-POLICY_ARN=$(echo "$POLICY_OUTPUT" | grep -o 'arn:aws:iam::[0-9]*:policy/SSMOnboardingPolicy')
+POLICY_ARN=$(echo "$POLICY_OUTPUT" | grep -o 'arn:aws:iam::[0-9]*:policy/SSMOnboardingPolicy-[a-f0-9]*')
 if [[ -z "$POLICY_ARN" ]]; then
     echo "ERROR: Failed to extract policy ARN" | tee -a "$LOG_FILE"
     exit 1

tuts/053-aws-config-gs/aws-config-gs.sh

@@ -130,8 +130,8 @@ if [ -n "$PREREQ_BUCKET" ] && [ "$PREREQ_BUCKET" != "None" ]; then
 else
     BUCKET_IS_SHARED=false
     S3_BUCKET_NAME="configservice-${RANDOM_ID}"
+    echo "Creating S3 bucket: $S3_BUCKET_NAME"
 fi
-echo "Creating S3 bucket: $S3_BUCKET_NAME"
 
 # Get the current region
 AWS_REGION=$(aws configure get region)
@@ -141,13 +141,17 @@ fi
 echo "Using AWS Region: $AWS_REGION"
 
 # Create bucket with appropriate command based on region
-if [ "$AWS_REGION" = "us-east-1" ]; then
-    BUCKET_RESULT=$(aws s3api create-bucket --bucket "$S3_BUCKET_NAME")
+if [ "$BUCKET_IS_SHARED" = "false" ]; then
+    if [ "$AWS_REGION" = "us-east-1" ]; then
+        BUCKET_RESULT=$(aws s3api create-bucket --bucket "$S3_BUCKET_NAME")
+    else
+        BUCKET_RESULT=$(aws s3api create-bucket --bucket "$S3_BUCKET_NAME" --create-bucket-configuration LocationConstraint="$AWS_REGION")
+    fi
+    check_command "$BUCKET_RESULT"
+    echo "S3 bucket created: $S3_BUCKET_NAME"
 else
-    BUCKET_RESULT=$(aws s3api create-bucket --bucket "$S3_BUCKET_NAME" --create-bucket-configuration LocationConstraint="$AWS_REGION")
+    echo "Using shared bucket: $S3_BUCKET_NAME (skipping creation)"
 fi
-check_command "$BUCKET_RESULT"
-echo "S3 bucket created: $S3_BUCKET_NAME"
 
 # Block public access for the bucket
 aws s3api put-public-access-block \
@@ -367,7 +371,7 @@ echo "==========================================="
 echo "CLEANUP CONFIRMATION"
 echo "==========================================="
 echo "Do you want to clean up all created resources? (y/n): "
-read -r CLEANUP_CHOICE
+CLEANUP_CHOICE='y'
 
 if [[ "$CLEANUP_CHOICE" =~ ^[Yy]$ ]]; then
     echo "Cleaning up resources..."

tuts/067-aws-payment-cryptography-gs/aws-payment-cryptography-gs.sh

@@ -118,17 +118,11 @@ log "Successfully verified CVV2 value"
 
 # Step 4: Perform a negative test
 log "Step 4: Performing a negative test with incorrect CVV2"
-if ! NEGATIVE_OUTPUT=$(aws payment-cryptography-data verify-card-validation-data \
+if aws payment-cryptography-data verify-card-validation-data \
   --key-identifier "$KEY_ARN" \
   --primary-account-number=171234567890123 \
   --verification-attributes CardVerificationValue2={CardExpiryDate=0123} \
-  --validation-data 999 2>&1); then
-    NEGATIVE_OUTPUT=$?
-fi
-
-echo "$NEGATIVE_OUTPUT"
-
-if ! echo "$NEGATIVE_OUTPUT" | grep -iq "fail\|error"; then
+  --validation-data 999 2>&1; then
     handle_error "Negative test did not fail as expected"
 fi
 

tuts/082-amazon-polly-gs/amazon-polly-getting-started.sh

@@ -87,7 +87,7 @@ fi
 
 # Step 1: Verify Amazon Polly is available
 echo "Step 1: Verifying Amazon Polly availability" | tee -a "$LOG_FILE"
-if aws polly describe-voices --max-results 1 &> /dev/null; then
+if aws polly describe-voices --query 'Voices[0].Name' --output text &> /dev/null; then
     echo "Amazon Polly is available. Proceeding with tutorial." | tee -a "$LOG_FILE"
 else
     echo "Amazon Polly is not available in your AWS CLI installation or region." | tee -a "$LOG_FILE"
@@ -120,7 +120,7 @@ fi
 echo "" | tee -a "$LOG_FILE"
 echo "Step 4: Using SSML for enhanced speech" | tee -a "$LOG_FILE"
 SSML_OUTPUT="${WORK_DIR}/ssml-output.mp3"
-SSML_TEXT="<speak>Hello! <break time='1s'/> This is a sample of <emphasis>SSML enhanced speech</emphasis>.</speak>"
+SSML_TEXT='<speak>Hello! <break time="1s"/> This is a sample of <emphasis>SSML enhanced speech</emphasis>.</speak>'
 log_cmd "aws polly synthesize-speech --output-format mp3 --voice-id Matthew --text-type ssml --text '$SSML_TEXT' '$SSML_OUTPUT'" || true
 
 if [[ -f "$SSML_OUTPUT" ]]; then