From dddd199cd287999a249d9001077a62d5fab93d3a Mon Sep 17 00:00:00 2001
From: David Miller <45697098+dlm6693@users.noreply.github.com>
Date: Mon, 12 Dec 2022 13:06:08 -0500
Subject: [PATCH] Update ARN delimiter parsing in endpoint provider (#2831)

* support : and / separators for arn resourceId

* changelog
---
 .../bugfix-Endpointprovider-32427.json        |  5 +++
 botocore/endpoint_provider.py                 |  4 +-
 tests/unit/test_endpoint_provider.py          | 41 +++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 .changes/next-release/bugfix-Endpointprovider-32427.json

diff --git a/.changes/next-release/bugfix-Endpointprovider-32427.json b/.changes/next-release/bugfix-Endpointprovider-32427.json
new file mode 100644
index 0000000000..a75daf298c
--- /dev/null
+++ b/.changes/next-release/bugfix-Endpointprovider-32427.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "Endpoint provider",
+  "description": "Updates ARN parsing ``resourceId`` delimiters"
+}
diff --git a/botocore/endpoint_provider.py b/botocore/endpoint_provider.py
index f90eb94db0..c319817018 100644
--- a/botocore/endpoint_provider.py
+++ b/botocore/endpoint_provider.py
@@ -47,6 +47,7 @@
 VALID_HOST_LABEL_RE = re.compile(
     r"^(?!-)[a-zA-Z\d-]{1,63}(?<!-)$",
 )
+ARN_DELIMITER_RE = re.compile(r"/|:")
 CACHE_SIZE = 100
 ARN_PARSER = ArnParser()
 STRING_FORMATTER = Formatter()
@@ -236,8 +237,7 @@ def aws_parse_arn(self, value):
         arn_dict["accountId"] = arn_dict.pop("account")
 
         resource = arn_dict.pop("resource")
-        delimiter = ":" if ":" in resource else "/"
-        arn_dict["resourceId"] = resource.split(delimiter)
+        arn_dict["resourceId"] = re.split(ARN_DELIMITER_RE, resource)
 
         return arn_dict
 
diff --git a/tests/unit/test_endpoint_provider.py b/tests/unit/test_endpoint_provider.py
index bbcbade062..1009c47cba 100644
--- a/tests/unit/test_endpoint_provider.py
+++ b/tests/unit/test_endpoint_provider.py
@@ -220,6 +220,47 @@ def test_invalid_arn_returns_none(rule_lib):
     assert rule_lib.aws_parse_arn("arn:aws:this-is-not-an-arn:foo") is None
 
 
+@pytest.mark.parametrize(
+    "arn, expected_resource_id",
+    [
+        (
+            "arn:aws:s3:::myBucket/key",
+            {
+                "partition": "aws",
+                "service": "s3",
+                "region": "",
+                "accountId": "",
+                "resourceId": ["myBucket", "key"],
+            },
+        ),
+        (
+            "arn:aws:kinesis:us-east-1:1234567890:stream/mystream:foo",
+            {
+                "partition": "aws",
+                "service": "kinesis",
+                "region": "us-east-1",
+                "accountId": "1234567890",
+                "resourceId": ["stream", "mystream", "foo"],
+            },
+        ),
+        (
+            "arn:aws:s3:::myBucket",
+            {
+                "partition": "aws",
+                "service": "s3",
+                "region": "",
+                "accountId": "",
+                "region": "",
+                "resourceId": ["myBucket"],
+            },
+        ),
+    ],
+)
+def test_parse_arn_delimiters(rule_lib, arn, expected_resource_id):
+    parsed_arn = rule_lib.aws_parse_arn(arn)
+    assert parsed_arn == expected_resource_id
+
+
 def test_uri_encode_none_returns_none(rule_lib):
     assert rule_lib.uri_encode(None) is None