CICD Integration tests: new shares for pre-existing datasets

backend/dataall/core/environment/cdk/environment_stack.py

@@ -697,7 +697,7 @@ def create_integration_tests_role(self):
                 ],
                 effect=iam.Effect.ALLOW,
                 resources=[
-                    f'arn:aws:iam::{self.account}:role/dataall-test-*',
+                    f'arn:aws:iam::{self.account}:role/dataall-test*',
                     f'arn:aws:iam::{self.account}:role/dataall-session*',
                 ],
             ),

tests_new/integration_tests/aws_clients/athena.py

@@ -29,9 +29,19 @@ def list_work_groups(self):
         result = self._client.list_work_groups()
         return [x['Name'] for x in result['WorkGroups']]
 
-    def get_env_work_group(self, env_name):
+    def get_work_group(self, env_name, group):
         workgroups = self.list_work_groups()
+        group_snakify = group.lower().replace('-', '_')
+        env_name_snakify = env_name.lower().replace('-', '_')
+        default_workgroup = 'primary'
+        env_workgroup, group_workgroup = None, None
         for workgroup in workgroups:
-            if env_name in workgroup:
-                return workgroup
-        return workgroups[0] if workgroups else None
+            if env_name_snakify in workgroup:
+                env_workgroup = workgroup
+            if group_snakify in workgroup:
+                group_workgroup = workgroup
+        if group_workgroup:
+            return group_workgroup
+        elif env_workgroup:
+            return env_workgroup
+        return default_workgroup

tests_new/integration_tests/aws_clients/iam.py

@@ -66,7 +66,7 @@ def put_consumption_role_policy(self, role_name):
                                         "Version": "2012-10-17",
                                         "Statement": [
                                             {
-                                                "Sid": "VisualEditor0",
+                                                "Sid": "TestPolicyDoc",
                                                 "Effect": "Allow",
                                                 "Action": [
                                                     "s3:*",

tests_new/integration_tests/conftest.py

@@ -108,6 +108,12 @@ def user5(userdata):
     yield userdata['testUser5']
 
 
+@pytest.fixture(scope='session', autouse=True)
+def user6(userdata):
+    # Existing user with name and password
+    yield userdata['testUser6']
+
+
 @pytest.fixture(scope='session', autouse=True)
 def group1():
     # Existing Cognito group with name testGroup1
@@ -143,6 +149,13 @@ def group5():
     yield 'testGroup5'
 
 
+@pytest.fixture(scope='session', autouse=True)
+def group6():
+    # Existing Cognito group with name testGroup5
+    # Add user5
+    yield 'testGroup6'
+
+
 @pytest.fixture(scope='session')
 def client1(user1) -> Client:
     yield Client(user1.username, user1.password)
@@ -168,6 +181,11 @@ def client5(user5) -> Client:
     yield Client(user5.username, user5.password)
 
 
+@pytest.fixture(scope='session')
+def client6(user6) -> Client:
+    yield Client(user6.username, user6.password)
+
+
 @pytest.fixture(scope='session')
 def clientTenant(userTenant) -> Client:
     yield Client(userTenant.username, userTenant.password)

tests_new/integration_tests/core/environment/global_conftest.py

@@ -1,7 +1,7 @@
+import pytest
 import logging
 from contextlib import contextmanager
 
-import pytest
 from assertpy import assert_that
 
 from integration_tests.aws_clients.sts import STSClient
@@ -13,7 +13,11 @@
     list_environments,
     invite_group_on_env,
 )
-from integration_tests.core.organizations.queries import create_organization
+from integration_tests.core.organizations.queries import (
+    create_organization,
+    list_organizations,
+    invite_team_to_organization,
+)
 from integration_tests.core.stack.utils import check_stack_ready
 from tests_new.integration_tests.aws_clients.s3 import S3Client
 from tests_new.integration_tests.core.environment.utils import update_env_stack
@@ -192,8 +196,29 @@ def persistent_env1(client1, group1, testdata):
 
 
 @pytest.fixture(scope='session')
-def persistent_cross_acc_env_1(client5, group5, testdata):
+def persistent_cross_acc_env_1(client5, group5, client6, group6, testdata):
     with get_or_create_persistent_env('persistent_cross_acc_env_1', client5, group5, testdata) as env:
+        orgs = [org.organizationUri for org in list_organizations(client6).nodes]
+        envs = [org.environmentUri for org in list_environments(client6).nodes]
+        if env.organization.organizationUri not in orgs:
+            invite_team_to_organization(client5, env.organization.organizationUri, group6)
+        if env.environmentUri not in envs:
+            invite_group_on_env(
+                client5,
+                env.environmentUri,
+                group6,
+                [
+                    'UPDATE_ENVIRONMENT',
+                    'GET_ENVIRONMENT',
+                    'ADD_ENVIRONMENT_CONSUMPTION_ROLES',
+                    'LIST_ENVIRONMENT_CONSUMPTION_ROLES',
+                    'LIST_ENVIRONMENT_GROUPS',
+                    'CREDENTIALS_ENVIRONMENT',
+                    'CREATE_SHARE_OBJECT',
+                    'LIST_ENVIRONMENT_SHARED_WITH_OBJECTS',
+                ],
+            )
+            update_env_stack(client5, env)
         yield env