Merge Conflict

Author: harrryr

.github/workflows/application-signals-python-e2e-ec2-asg-test.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: aws-observability/aws-application-signals-test-framework
-          ref: ga-python
+          ref: add-ec2-platform-for-python-ga
 
       - name: Set CW Agent RPM environment variable
         run: echo GET_CW_AGENT_RPM_COMMAND="aws s3api get-object --bucket private-cloudwatch-agent-apm-beta --key linux_amd64/amazon-cloudwatch-agent.rpm cw-agent.rpm" >> $GITHUB_ENV

terraform/python/ec2/asg/main.tf

@@ -43,15 +43,6 @@ resource "aws_key_pair" "aws_ssh_key" {
   public_key = tls_private_key.ssh_key.public_key_openssh
 }
 
-# resource "aws_key_pair" "aws_ssh_key" {
-#   key_name   = "myKey"
-#   public_key = tls_private_key.ssh_key.public_key_openssh
-#
-#   provisioner "local-exec" { # Create a "myKey.pem" to your computer!!
-#     command = "echo '${tls_private_key.ssh_key.private_key_pem}' > ./myKey.pem"
-#   }
-# }
-
 locals {
   ssh_key_name        = aws_key_pair.aws_ssh_key.key_name
   private_key_content = tls_private_key.ssh_key.private_key_pem