Skip to content

Encode RDS credential to base64 and decode in SampleApp #244

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 2 commits into from
Sep 23, 2024
Merged

Encode RDS credential to base64 and decode in SampleApp #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7850418
Encode RDS credential to base64 and decode in SampleApp
jerry-shao Sep 15, 2024
3a9d73b
Merge branch 'main' into fix-credential
jerry-shao Sep 20, 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/java-eks-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,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 @@ -245,7 +250,7 @@ jobs:
-var="sample_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='account_id=${{ env.ACCOUNT_ID }}' \
|| deployment_failed=$?
Expand Down
6 changes: 5 additions & 1 deletion sample-apps/springboot/src/main/java/com/amazon/sampleapp/FrontendServiceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.tomcat.util.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -170,11 +172,13 @@ public String asyncService() {
@ResponseBody
public String mysql() {
logger.info("mysql received");
final String rdsMySQLClusterPassword = new String(new Base64().decode(System.getenv("RDS_MYSQL_CLUSTER_PASSWORD").getBytes()));

try {
Connection connection = DriverManager.getConnection(
System.getenv().get("RDS_MYSQL_CLUSTER_CONNECTION_URL"),
System.getenv().get("RDS_MYSQL_CLUSTER_USERNAME"),
System.getenv().get("RDS_MYSQL_CLUSTER_PASSWORD"));
rdsMySQLClusterPassword);
Statement statement = connection.createStatement();
statement.executeQuery("SELECT * FROM tables LIMIT 1;");
} catch (SQLException e) {
Expand Down