Skip to content

Commit 59b897c

Browse files
author
Jeel Mehta
committed
Merge branch 'main' into Python_SigV4_logs_release_testing
2 parents 97be0aa + 6c5020d commit 59b897c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
run: |
102102
if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then
103103
# Get cloudwatch agent staging file if triggered by cw-a repo
104-
echo GET_CW_AGENT_MSI_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/packaging/${{ github.sha }}/amazon-cloudwatch-agent.msi ./cw-agent.msi" >> $GITHUB_ENV
104+
echo GET_CW_AGENT_MSI_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/packaging/${{ github.sha }}/amazon-cloudwatch-agent.msi ./amazon-cloudwatch-agent.msi" >> $GITHUB_ENV
105105
else
106106
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
107107
fi

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ def aws_sdk_call(request):
5656
testing_id = request.GET.get('testingId', None)
5757
if testing_id is not None:
5858
bucket_name += "-" + testing_id
59-
6059
logger.warning("This is a custom log for validation testing")
61-
6260
s3_client = boto3.client("s3")
6361
try:
6462
s3_client.get_bucket_location(

0 commit comments

Comments
 (0)