From dcea96579c6293a77b43a0c0536102113b29e233 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 30 Aug 2022 12:28:40 -0500 Subject: [PATCH] PRDONE-94: updated to set dotenv variables as system properties --- .../rdbms/jdbc/ConnectionManagerTest.java | 13 +++++----- .../sampleapp/SampleMetaDataProvider.java | 26 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/jdbc/ConnectionManagerTest.java b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/jdbc/ConnectionManagerTest.java index 715e4358..8a9ce4a9 100644 --- a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/jdbc/ConnectionManagerTest.java +++ b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/jdbc/ConnectionManagerTest.java @@ -104,15 +104,16 @@ class ConnectionManagerTest private RDBMSBackendMetaData getAuroraBacked() { Dotenv dotenv = Dotenv.configure() + .systemProperties() .ignoreIfMissing() .load(); return new RDBMSBackendMetaData() .withName("aurora-test") - .withVendor(dotenv.get("RDBMS_VENDOR")) - .withHostName(dotenv.get("RDBMS_HOSTNAME")) - .withPort(Integer.valueOf(Objects.requireNonNull(dotenv.get("RDBMS_PORT")))) - .withDatabaseName(dotenv.get("RDBMS_DATABASE_NAME")) - .withUsername(dotenv.get("RDBMS_USERNAME")) - .withPassword(dotenv.get("RDBMS_PASSWORD")); + .withVendor(System.getProperty("RDBMS_VENDOR")) + .withHostName(System.getProperty("RDBMS_HOSTNAME")) + .withPort(Integer.valueOf(Objects.requireNonNull(System.getProperty("RDBMS_PORT")))) + .withDatabaseName(System.getProperty("RDBMS_DATABASE_NAME")) + .withUsername(System.getProperty("RDBMS_USERNAME")) + .withPassword(System.getProperty("RDBMS_PASSWORD")); } } diff --git a/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java b/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java index fd48661d..d024c0a8 100644 --- a/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java +++ b/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java @@ -137,12 +137,13 @@ public class SampleMetaDataProvider Dotenv dotenv = Dotenv.configure() .ignoreIfMissing() + .systemProperties() .load(); QWidgetMetaDataInterface quickSightChartMetaData = new QuickSightChartMetaData() - .withAccountId(dotenv.get("QUICKSIGHT_ACCCOUNT_ID")) - .withAccessKey(dotenv.get("QUICKSIGHT_ACCESS_KEY")) - .withSecretKey(dotenv.get("QUICKSIGHT_SECRET_KEY")) - .withUserArn(dotenv.get("QUICKSIGHT_USER_ARN")) + .withAccountId(System.getProperty("QUICKSIGHT_ACCCOUNT_ID")) + .withAccessKey(System.getProperty("QUICKSIGHT_ACCESS_KEY")) + .withSecretKey(System.getProperty("QUICKSIGHT_SECRET_KEY")) + .withUserArn(System.getProperty("QUICKSIGHT_USER_ARN")) .withDashboardId("9e452e78-8509-4c81-bb7f-967abfc356da") .withRegion(Regions.US_EAST_2.getName()) .withName(QuickSightChartRenderer.class.getSimpleName()) @@ -212,15 +213,18 @@ public class SampleMetaDataProvider { if(USE_MYSQL) { - Dotenv dotenv = Dotenv.configure().load(); + Dotenv dotenv = Dotenv.configure() + .ignoreIfMissing() + .systemProperties() + .load(); return new RDBMSBackendMetaData() .withName(RDBMS_BACKEND_NAME) - .withVendor(dotenv.get("RDBMS_VENDOR")) - .withHostName(dotenv.get("RDBMS_HOSTNAME")) - .withPort(Integer.valueOf(Objects.requireNonNull(dotenv.get("RDBMS_PORT")))) - .withDatabaseName(dotenv.get("RDBMS_DATABASE_NAME")) - .withUsername(dotenv.get("RDBMS_USERNAME")) - .withPassword(dotenv.get("RDBMS_PASSWORD")); + .withVendor(System.getProperty("RDBMS_VENDOR")) + .withHostName(System.getProperty("RDBMS_HOSTNAME")) + .withPort(Integer.valueOf(Objects.requireNonNull(System.getProperty("RDBMS_PORT")))) + .withDatabaseName(System.getProperty("RDBMS_DATABASE_NAME")) + .withUsername(System.getProperty("RDBMS_USERNAME")) + .withPassword(System.getProperty("RDBMS_PASSWORD")); } else {