Merge branch 'main' into java-sample-app-version

Author: harrryr

.github/workflows/dotnet-ec2-windows-test.yml

@@ -94,7 +94,7 @@ jobs:
             echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-autoinstrumentation-dotnet-staging/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }}; Expand-Archive -Path /${{ env.ADOT_DISTRO_NAME }} -DestinationPath ./dotnet-distro" >> $GITHUB_ENV
           else
             # After Release will switch to latest tag instead of hard code version for canary purpose
-            echo GET_ADOT_DISTRO_COMMAND="wget -O ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/latest/download/aws-distro-opentelemetry-dotnet-instrumentation-windows.zip; Expand-Archive -Path ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip -DestinationPath ./dotnet-distro -Force" >> $GITHUB_ENV
+            echo GET_ADOT_DISTRO_COMMAND="curl.exe -L -o ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/latest/download/aws-distro-opentelemetry-dotnet-instrumentation-windows.zip --retry 5 --retry-all-errors --retry-delay 5; Expand-Archive -Path ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip -DestinationPath ./dotnet-distro -Force" >> $GITHUB_ENV
           fi
 
       - name: Set Get CW Agent command environment variable
@@ -103,7 +103,7 @@ jobs:
             # Get cloudwatch agent staging file if triggered by cw-a repo
             echo GET_CW_AGENT_MSI_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/amazon-cloudwatch-agent.msi ./cw-agent.msi" >> $GITHUB_ENV
           else
-            echo GET_CW_AGENT_MSI_COMMAND= "wget -O ./amazon-cloudwatch-agent.msi https://amazoncloudwatch-agent.s3.amazonaws.com/windows/amd64/latest/amazon-cloudwatch-agent.msi" >> $GITHUB_ENV
+            echo GET_CW_AGENT_MSI_COMMAND= "curl.exe -L -o ./amazon-cloudwatch-agent.msi https://amazoncloudwatch-agent.s3.amazonaws.com/windows/amd64/latest/amazon-cloudwatch-agent.msi --retry 5 --retry-all-errors --retry-delay 5" >> $GITHUB_ENV
           fi
 
       - name: Set up terraform
@@ -173,8 +173,8 @@ jobs:
       - name: Get SSM outputs
         working-directory: terraform/dotnet/ec2/windows
         run: |
-          echo "FRONTEND_SSM_ASSOCIATION_ID=$(terraform output frontend_script_association_id)" >> $GITHUB_ENV
-          echo "REMOTE_SSM_ASSOCIATION__ID=$(terraform output remote_script_association_id)" >> $GITHUB_ENV
+          echo "FRONTEND_DOCUMENT_NAME=$(terraform output frontend_document_name)" >> $GITHUB_ENV
+          echo "REMOTE_DOCUMENT_NAME=$(terraform output remote_document_name)" >> $GITHUB_ENV
 
       - name: Get the sample app endpoint
         working-directory: terraform/dotnet/ec2/windows
@@ -220,35 +220,54 @@ jobs:
           check_instance_ready ${{ env.MAIN_SERVICE_INSTANCE_ID }}
           check_instance_ready ${{ env.REMOTE_SERVICE_INSTANCE_ID }}
           
-          # Allow up to 10 min for SSM Document to run
-          max_attempts=60
-          attempt=0
-
-          check_status() {
-            local association_id=$1
+          main_command_id=$(aws ssm send-command \
+              --instance-ids "${{ env.MAIN_SERVICE_INSTANCE_ID }}" \
+              --document-name "${{ env.FRONTEND_DOCUMENT_NAME }}" \
+              --query "Command.CommandId" \
+              --output text)
+          
+          remote_command_id=$(aws ssm send-command \
+              --instance-ids "${{ env.REMOTE_SERVICE_INSTANCE_ID }}" \
+              --document-name "${{ env.REMOTE_DOCUMENT_NAME }}" \
+              --query "Command.CommandId" \
+              --output text)
+          
+          watch_command() {
+            local command_id=$1
+            local max_attempts=20  # 10 minutes timeout with 30 seconds interval
+            local attempt=0
+            local interval=30
 
             while [[ $attempt -lt $max_attempts ]]; do
-              aws ssm describe-association --association-id $association_id
-              local status=$(aws ssm describe-association --association-id $association_id --query "AssociationDescription.Overview.AssociationStatusAggregatedCount.Success" --output text)
-              echo "Attempt $((attempt + 1))/$max_attempts: Current status of SSM Association $association_id: $status"
-              if [[ "$status" == "1" ]]; then
-                echo "SSM Association $association_id succeeded."
+              status=$(aws ssm list-command-invocations \
+                --command-id "$command_id" \
+                --details \
+                --query "CommandInvocations[0].Status" \
+                --output text)
+
+              echo "Attempt $((attempt + 1))/$max_attempts: Current status of command $command_id: $status"
+
+              if [[ "$status" == "Success" || "$status" == "Failed" ]]; then
+                echo "SSM Command $command_id completed with status: $status"
+                if [[ "$status" == "Failed" ]]; then
+                  exit 1
+                fi
                 break
               else
-                echo "Waiting for SSM Association $association_id to succeed..."
+                echo "Waiting for SSM Command $command_id to complete..."
                 sleep $interval
                 attempt=$((attempt + 1))
               fi
             done
 
             if [[ $attempt -ge $max_attempts ]]; then
-              echo "Max attempts reached: SSM Association $association_id did not succeed after $max_attempts attempts."
+              echo "Timeout reached: SSM Command $command_id did not complete within 10 minutes."
               exit 1
             fi
           }
           
-          check_status ${{ env.FRONTEND_SSM_ASSOCIATION_ID }}
-          check_status ${{ env.REMOTE_SSM_ASSOCIATION__ID }}
+          watch_command $main_command_id
+          watch_command $remote_command_id
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew == 'failure'

.github/workflows/python-eks-test.yml

@@ -208,6 +208,11 @@ jobs:
             RDS_MYSQL_CLUSTER_SECRETS, ${{env.RDS_MYSQL_CLUSTER_CREDENTIAL_SECRET_NAME}}
           parse-json-secrets: true
 
+      - name: Convert RDS database credentials to base64
+        continue-on-error: true
+        run: |
+          echo "RDS_MYSQL_CLUSTER_SECRETS_PASSWORD_BASE64=$(echo -n '${{env.RDS_MYSQL_CLUSTER_SECRETS_PASSWORD}}' | base64)" >> $GITHUB_ENV
+
       - name: Initiate Terraform
         uses: ./.github/workflows/actions/execute_and_retry
         with:
@@ -246,7 +251,7 @@ jobs:
               -var='python_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}' \
               -var='rds_mysql_cluster_endpoint=${{env.RDS_MYSQL_CLUSTER_ENDPOINT}}' \
               -var='rds_mysql_cluster_username=${{env.RDS_MYSQL_CLUSTER_SECRETS_USERNAME}}' \
-              -var='rds_mysql_cluster_password=${{env.RDS_MYSQL_CLUSTER_SECRETS_PASSWORD}}' \
+              -var='rds_mysql_cluster_password=${{env.RDS_MYSQL_CLUSTER_SECRETS_PASSWORD_BASE64}}' \
               -var='rds_mysql_cluster_database=information_schema' \
               -var='account_id=${{ env.ACCOUNT_ID }}' \
             || deployment_failed=$?

sample-apps/dotnet/dotnet-ec2-win-main-setup.ps1

@@ -15,7 +15,7 @@ $ProgressPreference = 'SilentlyContinue'
 
 # Install Dotnet
 Write-Host "Installing Dotnet" | %{ "{0:HH:mm:ss:fff}: {1}" -f (Get-Date), $_ }
-wget -O dotnet-install.ps1 https://dot.net/v1/dotnet-install.ps1
+curl.exe -L -o dotnet-install.ps1 https://dot.net/v1/dotnet-install.ps1 --retry 5 --retry-all-errors --retry-delay 5
 .\dotnet-install.ps1 -Version 8.0.302
 
 # Install and start Cloudwatch Agent

sample-apps/dotnet/dotnet-ec2-win-remote-setup.ps1

@@ -13,7 +13,7 @@ $ProgressPreference = 'SilentlyContinue'
 
 # Install Dotnet
 Write-Host "Installing Dotnet" | %{ "{0:HH:mm:ss:fff}: {1}" -f (Get-Date), $_ }
-wget -O dotnet-install.ps1 https://dot.net/v1/dotnet-install.ps1
+curl.exe -L -o dotnet-install.ps1 https://dot.net/v1/dotnet-install.ps1 --retry 5 --retry-all-errors --retry-delay 5
 .\dotnet-install.ps1 -Version 8.0.302
 
 # Install and start Cloudwatch Agent

sample-apps/python/django_frontend_service/frontend_service_app/views.py

@@ -2,6 +2,7 @@
 ## SPDX-License-Identifier: Apache-2.0
 import logging
 import os
+import base64
 import threading
 import time
 
@@ -110,10 +111,14 @@ def get_xray_trace_id():
 
 def mysql(request):
     logger.info("mysql received")
+
+    encoded_password = os.environ["RDS_MYSQL_CLUSTER_PASSWORD"]
+    decoded_password = base64.b64decode(encoded_password).decode('utf-8')
+
     try:
         connection = pymysql.connect(host=os.environ["RDS_MYSQL_CLUSTER_ENDPOINT"],
                                      user=os.environ["RDS_MYSQL_CLUSTER_USERNAME"],
-                                     password=os.environ["RDS_MYSQL_CLUSTER_PASSWORD"],
+                                     password=decoded_password,
                                      database=os.environ["RDS_MYSQL_CLUSTER_DATABASE"])
         with connection:
             with connection.cursor() as cursor:

terraform/dotnet/ec2/windows/main.tf

@@ -172,17 +172,6 @@ resource "aws_ssm_document" "main_service_setup" {
   DOC
 }
 
-# Create SSM Association for main service instance
-resource "aws_ssm_association" "main_service_association" {
-  name = aws_ssm_document.main_service_setup.name
-  targets {
-    key    = "InstanceIds"
-    values = [aws_instance.main_service_instance.id]
-  }
-
-  depends_on = [aws_instance.main_service_instance]
-}
-
 # Create SSM Document for remote service setup
 resource "aws_ssm_document" "remote_service_setup" {
   name          = "remote_service_setup_${var.test_id}"
@@ -208,14 +197,4 @@ resource "aws_ssm_document" "remote_service_setup" {
     ]
   }
   DOC
-}
-
-# Create SSM Association for remote service instance
-resource "aws_ssm_association" "remote_service_association" {
-  name = aws_ssm_document.remote_service_setup.name
-  targets {
-    key    = "InstanceIds"
-    values = [aws_instance.remote_service_instance.id]
-  }
-  depends_on = [aws_instance.remote_service_instance]
 }

terraform/dotnet/ec2/windows/output.tf

@@ -29,10 +29,10 @@ output "ec2_instance_ami" {
   value = data.aws_ami.ami.id
 }
 
-output "frontend_script_association_id" {
-  value = aws_ssm_association.main_service_association.id
+output "frontend_document_name" {
+  value = aws_ssm_document.main_service_setup.name
 }
 
-output "remote_script_association_id" {
-  value = aws_ssm_association.remote_service_association.id
+output "remote_document_name" {
+  value = aws_ssm_document.remote_service_setup.name
 }