Modify ARN toString to print a valid ARN when there's no region or ac…

…countId Fixes aws#2416
Madrigal · Feb 20, 2024 · 9a82896 · 9a82896
1 parent e970a6f
commit 9a82896
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java b/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java
@@ -198,9 +198,9 @@ public String toString() {
                + ":"
                + this.service
                + ":"
-               + region
+               + (region == null ? "" : region)
                + ":"
-               + this.accountId
+               + (this.accountId == null ? "" : this.accountId)
                + ":"
                + this.resource;
     }

diff --git a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java
@@ -57,6 +57,22 @@ public void arnWithQualifiedResource_ParsesBackToString() {
         assertThat(arn.resourceAsString()).isEqualTo("myresource:foobar:1");
     }
 
+    @Test
+    public void arnWithMinimalResources_ParsesBackToString() {
+        String arnString = "arn:aws:s3:::bucket";
+        Arn arn = Arn.fromString(arnString);
+        assertThat(arn.toString()).isEqualTo(arnString);
+        assertThat(arn.resourceAsString()).isEqualTo("bucket");
+    }
+
+    @Test
+    public void arnWithoutRegion_ParsesBackToString() {
+        String arnString = "arn:aws:iam::123456789012:root";
+        Arn arn = Arn.fromString(arnString);
+        assertThat(arn.toString()).isEqualTo(arnString);
+        assertThat(arn.resourceAsString()).isEqualTo("root");
+    }
+
     @Test
     public void arnWithResourceTypeAndResource_ParsesCorrectly() {
         String arnString = "arn:aws:s3:us-east-1:12345678910:bucket:foobar";