chore: refactor DeviceConfiguration to remove kernel as a class varia…

…ble (#1609)
aws-greengrass · Apr 25, 2024 · 54207c3 · 54207c3
1 parent 33e688a
commit 54207c3
Show file tree

Hide file tree

Showing 16 changed files with 494 additions and 553 deletions.
diff --git a/src/integrationtests/java/com/aws/greengrass/integrationtests/e2e/BaseE2ETestCase.java b/src/integrationtests/java/com/aws/greengrass/integrationtests/e2e/BaseE2ETestCase.java
@@ -239,7 +239,7 @@ public static void setDefaultRunWithUser(Kernel kernel) {
         if (Platform.getInstance() instanceof DarwinPlatform) {
             user = System.getProperty("user.name");
         }
-        new DeviceConfiguration(kernel).getRunWithDefaultPosixUser().dflt(user);
+        new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine()).getRunWithDefaultPosixUser().dflt(user);
     }
 
     protected void initKernel()

diff --git a/...m/aws/greengrass/integrationtests/status/ComponentStatusChangeFleetStatusServiceTest.java b/...m/aws/greengrass/integrationtests/status/ComponentStatusChangeFleetStatusServiceTest.java
@@ -87,7 +87,7 @@ void afterEach() {
     @Test
     void GIVEN_one_component_errored_and_recovered_THEN_fss_should_send_recovery_message() throws Exception {
         statusChange = new CountDownLatch(2);
-        deviceConfiguration = new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
+        deviceConfiguration = new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
                 "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath", "certFilePath", "caFilePath",
                 "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);
@@ -122,7 +122,7 @@ void GIVEN_one_component_errored_and_recovered_THEN_fss_should_send_recovery_mes
     @Test
     void GIVEN_two_components_errored_and_recovered_THEN_fss_should_send_only_one_recovery_message() throws Exception {
         statusChange  = new CountDownLatch(3);
-        deviceConfiguration = new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
+        deviceConfiguration = new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
                 "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath", "certFilePath", "caFilePath",
                 "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);
@@ -161,7 +161,7 @@ void GIVEN_two_components_errored_and_recovered_THEN_fss_should_send_only_one_re
     @Test
     void GIVEN_three_components_errored_and_recovered_THEN_fss_should_send_only_one_recovery_message_and_one_errored_message_should_contain_recovery_message() throws Exception {
         statusChange  = new CountDownLatch(4);
-        deviceConfiguration = new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
+        deviceConfiguration = new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
                 "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath", "certFilePath", "caFilePath",
                 "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);

diff --git a/...iontests/java/com/aws/greengrass/integrationtests/status/EventFleetStatusServiceTest.java b/...iontests/java/com/aws/greengrass/integrationtests/status/EventFleetStatusServiceTest.java
@@ -207,7 +207,7 @@ void setupKernel(ExtensionContext context) throws Exception {
         });
         // set required instances from context
         deviceConfiguration =
-                new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com", "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath",
+                new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com", "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath",
                         "certFilePath", "caFilePath", "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);
         // pre-load contents to package store

diff --git a/...iontests/java/com/aws/greengrass/integrationtests/status/FleetStatusServiceSetupTest.java b/...iontests/java/com/aws/greengrass/integrationtests/status/FleetStatusServiceSetupTest.java
@@ -91,7 +91,7 @@ void afterEach() {
     @Test
     void GIVEN_kernel_launches_THEN_thing_details_and_components_terminal_states_uploaded_to_cloud_3s_after_launch_message()
             throws Exception {
-        deviceConfiguration = new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
+        deviceConfiguration = new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com",
                 "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath", "certFilePath", "caFilePath",
                 "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);

diff --git a/...tests/java/com/aws/greengrass/integrationtests/status/PeriodicFleetStatusServiceTest.java b/...tests/java/com/aws/greengrass/integrationtests/status/PeriodicFleetStatusServiceTest.java
@@ -128,7 +128,7 @@ void setupKernel(ExtensionContext context) throws Exception {
         });
         // set required instances from context
         deviceConfiguration =
-                new DeviceConfiguration(kernel, "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com", "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath",
+                new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), "ThingName", "xxxxxx-ats.iot.us-east-1.amazonaws.com", "xxxxxx.credentials.iot.us-east-1.amazonaws.com", "privKeyFilePath",
                         "certFilePath", "caFilePath", "us-east-1", "roleAliasName");
         kernel.getContext().put(DeviceConfiguration.class, deviceConfiguration);
         kernel.launch();

diff --git a/...tegrationtests/java/com/aws/greengrass/integrationtests/telemetry/TelemetryAgentTest.java b/...tegrationtests/java/com/aws/greengrass/integrationtests/telemetry/TelemetryAgentTest.java
@@ -108,7 +108,7 @@ void GIVEN_kernel_running_with_telemetry_config_WHEN_launch_THEN_metrics_are_pub
         ConfigPlatformResolver.initKernelWithMultiPlatformConfig(kernel, this.getClass().getResource("config.yaml"));
         kernel.getContext().put(MqttClient.class, mqttClient);
         kernel.getContext().put(DeviceConfiguration.class,
-                new DeviceConfiguration(kernel, MOCK_THING_NAME, "us-east-1", "us-east-1", "mock", "mock", "mock", "us-east-1",
+                new DeviceConfiguration(kernel.getConfig(), kernel.getKernelCommandLine(), MOCK_THING_NAME, "us-east-1", "us-east-1", "mock", "mock", "mock", "us-east-1",
                         "mock"));
 
         //WHEN