Skip to content

[Python/EKS] Fix credential interpolation issue in Enablement Canary Test #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 24, 2024
Merged

[Python/EKS] Fix credential interpolation issue in Enablement Canary Test #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ce8f2bf
Revert "Enhance Logs E2E test and bump up MySQL library to 8.4 (#221)"
jerry-shao Sep 12, 2024
66f2f3a
Merge branch 'aws-observability:main' into source
jerry-shao Sep 15, 2024
89dd8af
Merge branch 'aws-observability:main' into source
jerry-shao Sep 23, 2024
45413d5
Enhance Logs E2E test and bump up MySQL library to 8.4 (#221)
ektabj Sep 11, 2024
e8f726d
Merge branch 'aws-observability:main' into source
jerry-shao Sep 24, 2024
4fe46d1
Merge branch 'source' of https://github.com/jerry-shao/aws-applicatio…
jerry-shao Sep 24, 2024
e0e3419
Allow workflow run in forked repo
jerry-shao Sep 24, 2024
493fde2
Adding a step to convert credential to base64
jerry-shao Sep 24, 2024
7806d8e
Update Python Sample App to decode password
jerry-shao Sep 24, 2024
f0fd904
Remove changes require for local testing
jerry-shao Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/python-eks-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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=$?
Expand Down
7 changes: 6 additions & 1 deletion sample-apps/python/django_frontend_service/frontend_service_app/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
## SPDX-License-Identifier: Apache-2.0
import logging
import os
import base64
import threading
import time

Expand Down Expand Up @@ -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:
Expand Down