Move test, fix older test

localstack · Feb 29, 2024 · 2713d24 · 2713d24
1 parent 194db31
commit 2713d24
Show file tree

Hide file tree

Showing 2 changed files with 119 additions and 117 deletions.
diff --git a/tests/test_ecr/test_ecr_boto3.py b/tests/test_ecr/test_ecr_boto3.py
@@ -2756,116 +2756,3 @@ def test_ecr_image_digest():
     # then
     assert put_response["image"]["imageId"]["imageDigest"] == digest
     assert describe_response["imageDetails"][0]["imageDigest"] == digest
-
-
-@mock_aws
-def test_ecr_registry_scanning_configuration():
-    client = boto3.client("ecr", region_name=ECR_REGION)
-    client.create_repository(repositoryName=ECR_REPO)
-
-    get_scanning_config_response = client.get_registry_scanning_configuration()
-    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
-    assert get_scanning_config_response["scanningConfiguration"] == {
-        "rules": [],
-        "scanType": "BASIC",
-    }
-
-    put_scanning_config_response = client.put_registry_scanning_configuration(
-        scanType="BASIC",
-        rules=[
-            {
-                "repositoryFilters": [
-                    {
-                        "filter": "test-*",
-                        "filterType": "WILDCARD",
-                    }
-                ],
-                "scanFrequency": "SCAN_ON_PUSH",
-            }
-        ],
-    )
-
-    assert put_scanning_config_response["registryScanningConfiguration"] == {
-        "rules": [
-            {
-                "repositoryFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
-                "scanFrequency": "SCAN_ON_PUSH",
-            }
-        ],
-        "scanType": "BASIC",
-    }
-
-    # check if scanning config is returned in get operation
-    get_scanning_config_response = client.get_registry_scanning_configuration()
-    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
-    assert get_scanning_config_response["scanningConfiguration"] == {
-        "rules": [
-            {
-                "repositoryFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
-                "scanFrequency": "SCAN_ON_PUSH",
-            }
-        ],
-        "scanType": "BASIC",
-    }
-
-    # check if the scanning config is returned in batch_get_repository_scanning_configuration
-    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
-        repositoryNames=[ECR_REPO]
-    )
-    assert repo_scanning_config_result["scanningConfigurations"][0] == {
-        "appliedScanFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
-        "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/{ECR_REPO}",
-        "repositoryName": ECR_REPO,
-        "scanFrequency": "SCAN_ON_PUSH",
-        "scanOnPush": False,
-    }
-
-    # create new repository and check if scanning config is applied
-    client.create_repository(repositoryName="test-repo-2")
-    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
-        repositoryNames=["test-repo-2"]
-    )
-    assert repo_scanning_config_result["scanningConfigurations"][0] == {
-        "appliedScanFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
-        "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/test-repo-2",
-        "repositoryName": "test-repo-2",
-        "scanFrequency": "SCAN_ON_PUSH",
-        "scanOnPush": False,
-    }
-
-    # revert scanning config and see if it is properly applied to all repositories
-    put_scanning_config_response = client.put_registry_scanning_configuration(
-        scanType="BASIC",
-        rules=[],
-    )
-    assert put_scanning_config_response["registryScanningConfiguration"] == {
-        "rules": [],
-        "scanType": "BASIC",
-    }
-
-    get_scanning_config_response = client.get_registry_scanning_configuration()
-    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
-    assert get_scanning_config_response["scanningConfiguration"] == {
-        "rules": [],
-        "scanType": "BASIC",
-    }
-
-    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
-        repositoryNames=[ECR_REPO, "test-repo-2"]
-    )
-    assert repo_scanning_config_result["scanningConfigurations"] == [
-        {
-            "appliedScanFilters": [],
-            "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/{ECR_REPO}",
-            "repositoryName": ECR_REPO,
-            "scanFrequency": "MANUAL",
-            "scanOnPush": False,
-        },
-        {
-            "appliedScanFilters": [],
-            "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/test-repo-2",
-            "repositoryName": "test-repo-2",
-            "scanFrequency": "MANUAL",
-            "scanOnPush": False,
-        },
-    ]
diff --git a/tests/test_ecr/test_ecr_scanning_config.py b/tests/test_ecr/test_ecr_scanning_config.py
@@ -1,6 +1,10 @@
 import boto3
 
 from moto import mock_aws
+from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
+
+ECR_REGION = "us-east-1"
+ECR_REPO = "test-repo"
 
 
 @mock_aws
@@ -133,9 +137,120 @@ def test_put_registry_scanning_configuration():
             "repositoryArn": repo_arn,
             "repositoryName": repo_name,
             "scanOnPush": False,
-            "scanFrequency": "SCAN_ON_PUSH",
-            "appliedScanFilters": [
-                {"filter": f"{repo_name[:4]}*", "filterType": "WILDCARD"}
-            ],
+            "scanFrequency": "MANUAL",
+            "appliedScanFilters": [],
         }
     ]
+
+
+@mock_aws
+def test_registry_scanning_configuration_lifecycle():
+    client = boto3.client("ecr", region_name=ECR_REGION)
+    client.create_repository(repositoryName=ECR_REPO)
+
+    get_scanning_config_response = client.get_registry_scanning_configuration()
+    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
+    assert get_scanning_config_response["scanningConfiguration"] == {
+        "rules": [],
+        "scanType": "BASIC",
+    }
+
+    put_scanning_config_response = client.put_registry_scanning_configuration(
+        scanType="BASIC",
+        rules=[
+            {
+                "repositoryFilters": [
+                    {
+                        "filter": "test-*",
+                        "filterType": "WILDCARD",
+                    }
+                ],
+                "scanFrequency": "SCAN_ON_PUSH",
+            }
+        ],
+    )
+
+    assert put_scanning_config_response["registryScanningConfiguration"] == {
+        "rules": [
+            {
+                "repositoryFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
+                "scanFrequency": "SCAN_ON_PUSH",
+            }
+        ],
+        "scanType": "BASIC",
+    }
+
+    # check if scanning config is returned in get operation
+    get_scanning_config_response = client.get_registry_scanning_configuration()
+    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
+    assert get_scanning_config_response["scanningConfiguration"] == {
+        "rules": [
+            {
+                "repositoryFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
+                "scanFrequency": "SCAN_ON_PUSH",
+            }
+        ],
+        "scanType": "BASIC",
+    }
+
+    # check if the scanning config is returned in batch_get_repository_scanning_configuration
+    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
+        repositoryNames=[ECR_REPO]
+    )
+    assert repo_scanning_config_result["scanningConfigurations"][0] == {
+        "appliedScanFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
+        "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/{ECR_REPO}",
+        "repositoryName": ECR_REPO,
+        "scanFrequency": "SCAN_ON_PUSH",
+        "scanOnPush": False,
+    }
+
+    # create new repository and check if scanning config is applied
+    client.create_repository(repositoryName="test-repo-2")
+    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
+        repositoryNames=["test-repo-2"]
+    )
+    assert repo_scanning_config_result["scanningConfigurations"][0] == {
+        "appliedScanFilters": [{"filter": "test-*", "filterType": "WILDCARD"}],
+        "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/test-repo-2",
+        "repositoryName": "test-repo-2",
+        "scanFrequency": "SCAN_ON_PUSH",
+        "scanOnPush": False,
+    }
+
+    # revert scanning config and see if it is properly applied to all repositories
+    put_scanning_config_response = client.put_registry_scanning_configuration(
+        scanType="BASIC",
+        rules=[],
+    )
+    assert put_scanning_config_response["registryScanningConfiguration"] == {
+        "rules": [],
+        "scanType": "BASIC",
+    }
+
+    get_scanning_config_response = client.get_registry_scanning_configuration()
+    assert get_scanning_config_response["registryId"] == ACCOUNT_ID
+    assert get_scanning_config_response["scanningConfiguration"] == {
+        "rules": [],
+        "scanType": "BASIC",
+    }
+
+    repo_scanning_config_result = client.batch_get_repository_scanning_configuration(
+        repositoryNames=[ECR_REPO, "test-repo-2"]
+    )
+    assert repo_scanning_config_result["scanningConfigurations"] == [
+        {
+            "appliedScanFilters": [],
+            "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/{ECR_REPO}",
+            "repositoryName": ECR_REPO,
+            "scanFrequency": "MANUAL",
+            "scanOnPush": False,
+        },
+        {
+            "appliedScanFilters": [],
+            "repositoryArn": f"arn:aws:ecr:{ECR_REGION}:{ACCOUNT_ID}:repository/test-repo-2",
+            "repositoryName": "test-repo-2",
+            "scanFrequency": "MANUAL",
+            "scanOnPush": False,
+        },
+    ]