fix: create default user+group before provisioning (#1541)

src/integrationtests/java/com/aws/greengrass/integrationtests/componentmanager/plugins/docker/DockerImageArtifactDownload01Test.java

@@ -52,7 +52,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class DockerImageArtifactDownload01Test extends BaseITCase {
 
     private final PlatformResolver platformResolver = new PlatformResolver(null);

src/integrationtests/java/com/aws/greengrass/integrationtests/componentmanager/plugins/docker/DockerImageArtifactDownloadTest.java

@@ -52,7 +52,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class DockerImageArtifactDownloadTest extends BaseITCase {
 
     private final PlatformResolver platformResolver = new PlatformResolver(null);

src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/ServiceDependencyLifecycleTest.java

@@ -53,7 +53,7 @@
 import static org.mockito.Mockito.when;
 import static software.amazon.awssdk.services.greengrassv2.model.DeploymentComponentUpdatePolicyAction.NOTIFY_COMPONENTS;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ServiceDependencyLifecycleTest extends BaseITCase {
     private static final String CustomerApp = "CustomerApp";
     private static final String HardDependency = "HardDependency";

src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/UnloadableServiceIntegTest.java

@@ -32,7 +32,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class UnloadableServiceIntegTest extends BaseITCase {
 
     private Kernel kernel;

src/main/java/com/aws/greengrass/easysetup/GreengrassSetup.java

@@ -311,6 +311,7 @@ void performSetup() throws IOException, DeviceConfigurationException, URISyntaxE
         }
 
         DeviceConfiguration deviceConfiguration = kernel.getContext().get(DeviceConfiguration.class);
+        setComponentDefaultUserAndGroup(deviceConfiguration);
         if (needProvisioning) {
             if (Utils.isEmpty(awsRegion)) {
                 awsRegion = Coerce.toString(deviceConfiguration.getAWSRegion());
@@ -324,9 +325,6 @@ void performSetup() throws IOException, DeviceConfigurationException, URISyntaxE
             provision(kernel);
         }
 
-        // Attempt this only after config file and Nucleus args have been parsed
-        setComponentDefaultUserAndGroup(deviceConfiguration);
-
         if (setupSystemService) {
             kernel.getContext().get(KernelLifecycle.class).softShutdown(30);
             boolean ok = kernel.getContext().get(SystemServiceUtilsFactory.class).getInstance()

src/test/java/com/aws/greengrass/authorization/AuthorizationHandlerTest.java

@@ -46,7 +46,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class AuthorizationHandlerTest {
 
     @Mock

src/test/java/com/aws/greengrass/authorization/AuthorizationIPCAgentTest.java

@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class AuthorizationIPCAgentTest {
     private static final String TEST_TOKEN = "token";
     @Mock

src/test/java/com/aws/greengrass/authorization/AuthorizationPolicyParserTest.java

@@ -40,7 +40,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class AuthorizationPolicyParserTest {
 
     private final static String TEST_COMPONENT = "testComponent";

src/test/java/com/aws/greengrass/builtin/services/configstore/ConfigStoreIPCEventStreamAgentTest.java

@@ -72,7 +72,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 @SuppressWarnings("PMD.CloseResource")
 class ConfigStoreIPCEventStreamAgentTest {
     private static final String TEST_COMPONENT_A = "Component_A";

src/test/java/com/aws/greengrass/builtin/services/lifecycle/LifecycleIPCEventStreamAgentTest.java

@@ -65,7 +65,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class LifecycleIPCEventStreamAgentTest {
 
     private static final String TEST_SERVICE = "TestService";

src/test/java/com/aws/greengrass/builtin/services/mqttproxy/MqttProxyIPCAgentTest.java

@@ -54,7 +54,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class MqttProxyIPCAgentTest {
     private static final String TEST_SERVICE = "TestService";
     private static final String TEST_TOPIC = "TestTopic";

src/test/java/com/aws/greengrass/builtin/services/pubsub/PubSubIPCEventStreamAgentTest.java

@@ -65,7 +65,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class PubSubIPCEventStreamAgentTest {
     private static final String TEST_SERVICE = "TestService";
     private static final String TEST_TOPIC = "TestTopic";

src/test/java/com/aws/greengrass/builtin/services/telemetry/ComponentMetricIPCEventStreamAgentTest.java

@@ -50,7 +50,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class ComponentMetricIPCEventStreamAgentTest {
     private static final String VALID_TEST_COMPONENT = "aws.greengrass.testcomponent";
     private static final String STREAM_MANAGER_COMPONENT = "aws.greengrass.StreamManager";

src/test/java/com/aws/greengrass/componentmanager/ClientConfigurationUtilsTest.java

@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ClientConfigurationUtilsTest {
     @Mock
     private SecurityService securityService;

src/test/java/com/aws/greengrass/componentmanager/ComponentManagerTest.java

@@ -99,7 +99,7 @@
 import static org.mockito.Mockito.when;
 
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ComponentManagerTest {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();

src/test/java/com/aws/greengrass/componentmanager/ComponentServiceHelperTest.java

@@ -52,7 +52,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ComponentServiceHelperTest {
 
     private static final Semver v1_0_0 = new Semver("1.0.0");

src/test/java/com/aws/greengrass/componentmanager/ComponentStoreTest.java

@@ -71,7 +71,7 @@
  * files from its test resource folder if it needs to mock some recipe/artifact. It doesn't and shouldn't use or assume
  * any static folder directly as package store. The package store folder is deleted after each test.
  */
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ComponentStoreTest {
     private static final String MONITORING_SERVICE_PKG_NAME = "MonitoringService";
     private static final Semver MONITORING_SERVICE_PKG_VERSION = new Semver("1.0.0", Semver.SemverType.NPM);

src/test/java/com/aws/greengrass/componentmanager/DependencyResolverTest.java

@@ -66,7 +66,7 @@
 import static org.mockito.Mockito.when;
 import static software.amazon.awssdk.services.greengrassv2.model.DeploymentComponentUpdatePolicyAction.NOTIFY_COMPONENTS;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DependencyResolverTest {
 
     private static final Semver v1_5_0 = new Semver("1.5.0");

src/test/java/com/aws/greengrass/componentmanager/KernelConfigResolverTest.java

@@ -77,7 +77,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 @SuppressWarnings("PMD.ExcessiveClassLength")
 class KernelConfigResolverTest {
     private static final String LIFECYCLE_INSTALL_KEY = "install";

src/test/java/com/aws/greengrass/componentmanager/builtins/ArtifactDownloaderFactoryTest.java

@@ -38,7 +38,7 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ArtifactDownloaderFactoryTest {
 
     Path testDir = Paths.get("foo");

src/test/java/com/aws/greengrass/componentmanager/builtins/ArtifactDownloaderTest.java

@@ -53,7 +53,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ArtifactDownloaderTest {
 
     private static final String LOCAL_FILE_NAME = "artifact.txt";

src/test/java/com/aws/greengrass/componentmanager/builtins/GreengrassRepositoryDownloaderTest.java

@@ -64,7 +64,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class GreengrassRepositoryDownloaderTest {
     private static final String SHA256 = "SHA-256";
     private static final String TEST_ARN = "arn";

src/test/java/com/aws/greengrass/componentmanager/builtins/S3DownloaderTest.java

@@ -61,7 +61,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class S3DownloaderTest {
 
     private static final String VALID_ARTIFACT_URI = "s3://eg-artifacts/ComponentWithS3Artifacts-1.0.0/artifact.txt";

src/test/java/com/aws/greengrass/componentmanager/plugins/docker/DockerImageArtifactParserTest.java

@@ -17,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class DockerImageArtifactParserTest {
 
     @Test

src/test/java/com/aws/greengrass/componentmanager/plugins/docker/DockerImageDownloaderTest.java

@@ -68,7 +68,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class DockerImageDownloaderTest {
     private static ComponentIdentifier TEST_COMPONENT_ID =
             new ComponentIdentifier("test.container.component", new Semver("1.0.0"));

src/test/java/com/aws/greengrass/componentmanager/plugins/docker/EcrAccessorTest.java

@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class EcrAccessorTest {
     @Mock
     private EcrClient ecrClient;

src/test/java/com/aws/greengrass/deployment/DeploymentConfigMergerTest.java

@@ -78,7 +78,7 @@
 import static software.amazon.awssdk.services.greengrassv2.model.DeploymentComponentUpdatePolicyAction.SKIP_NOTIFY_COMPONENTS;
 
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentConfigMergerTest {
 
     private final Logger logger = LogManager.getLogger(this.getClass());

src/test/java/com/aws/greengrass/deployment/DeploymentDirectoryManagerTest.java

@@ -43,7 +43,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentDirectoryManagerTest {
     private static final String mockArn = "arn:aws:greengrass:us-east-1:12345678910:configuration:thinggroup/group1:1";
     private static final String expectedDirectoryName =

src/test/java/com/aws/greengrass/deployment/DeploymentDocumentDownloaderTest.java

@@ -62,7 +62,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentDocumentDownloaderTest {
     private static final String THING_NAME = "myThing";
     private static final String DEPLOYMENT_ID = "deploymentId";

src/test/java/com/aws/greengrass/deployment/DeploymentQueueTest.java

@@ -23,7 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 public class DeploymentQueueTest {
     private static final DeploymentDocument TEST_DEPLOYMENT_DOCUMENT = new DeploymentDocument();
     private static final String TEST_DEPLOYMENT_ID_1 = "deployment-1";

src/test/java/com/aws/greengrass/deployment/DeploymentServiceTest.java

@@ -92,7 +92,7 @@
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings({"PMD.LooseCoupling", "PMD.TestClassWithoutTestCases"})
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentServiceTest extends GGServiceTestUtil {
 
     private static final String TEST_JOB_ID_1 = "TEST_JOB_1";

src/test/java/com/aws/greengrass/deployment/DeploymentTaskTest.java

@@ -60,7 +60,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentTaskTest {
 
     private static final String COMPONENT_2_ROOT_PACKAGE_NAME = "component2";

src/test/java/com/aws/greengrass/deployment/DeviceConfigurationTest.java

@@ -73,7 +73,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeviceConfigurationTest {
     @Mock
     Kernel mockKernel;

src/test/java/com/aws/greengrass/deployment/DynamicComponentConfigurationValidatorTest.java

@@ -54,7 +54,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DynamicComponentConfigurationValidatorTest {
     private static final String DEFAULT_EXISTING_SERVICE_VERSION = "1.0.0";
     private static final long DEFAULT_EXISTING_NODE_MOD_TIME = 10;

src/test/java/com/aws/greengrass/deployment/IotJobsHelperTest.java

@@ -75,7 +75,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class IotJobsHelperTest {
 
     private static final String TEST_THING_NAME = "TEST_THING";

src/test/java/com/aws/greengrass/deployment/KernelUpdateDeploymentTaskTest.java

@@ -49,7 +49,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class KernelUpdateDeploymentTaskTest {
     private static final Logger logger = LogManager.getLogger(KernelUpdateDeploymentTaskTest.class);
 

src/test/java/com/aws/greengrass/deployment/ThingGroupHelperTest.java

@@ -30,7 +30,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class ThingGroupHelperTest {
     @Mock
     private DeviceConfiguration deviceConfiguration;

src/test/java/com/aws/greengrass/deployment/activator/DeploymentActivatorFactoryTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentActivatorFactoryTest {
     @Mock
     Kernel kernel;

src/test/java/com/aws/greengrass/deployment/activator/KernelUpdateActivatorTest.java

@@ -54,7 +54,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class KernelUpdateActivatorTest {
     @Mock
     Kernel kernel;

src/test/java/com/aws/greengrass/deployment/bootstrap/BootstrapManagerTest.java

@@ -71,7 +71,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class BootstrapManagerTest {
     private static final String componentA = "componentA";
     private static final String componentB = "componentB";

src/test/java/com/aws/greengrass/deployment/errorcode/DeploymentErrorCodeUtilsTest.java

@@ -54,7 +54,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeploymentErrorCodeUtilsTest {
 
     @Mock

src/test/java/com/aws/greengrass/easysetup/DeviceProvisioningHelperTest.java

@@ -79,7 +79,7 @@
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("PMD.CouplingBetweenObjects")
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class DeviceProvisioningHelperTest {
     private static final String TEST_REGION = "us-east-1";
 

src/test/java/com/aws/greengrass/easysetup/GreengrassSetupTest.java

@@ -53,7 +53,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, GGExtension.class})
+@ExtendWith({GGExtension.class, MockitoExtension.class})
 class GreengrassSetupTest {
     @Mock
     private DeviceProvisioningHelper deviceProvisioningHelper;