From f7f476d814861b23403eed3f5df97b0fdaeb9ac5 Mon Sep 17 00:00:00 2001 From: Maciej Kwidzinski Date: Mon, 10 Jun 2024 15:16:29 +0200 Subject: [PATCH] Simplify `CanonicalOwnerIdRegistry` impl --- .../tools/aws/CanonicalOwnerIdRegistry.kt | 17 ++++++----------- .../api/CanonicalImageIdByNameResolverTest.kt | 4 ++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/com/atlassian/performance/tools/aws/CanonicalOwnerIdRegistry.kt b/src/main/kotlin/com/atlassian/performance/tools/aws/CanonicalOwnerIdRegistry.kt index d92cf75..abe2f82 100644 --- a/src/main/kotlin/com/atlassian/performance/tools/aws/CanonicalOwnerIdRegistry.kt +++ b/src/main/kotlin/com/atlassian/performance/tools/aws/CanonicalOwnerIdRegistry.kt @@ -1,20 +1,15 @@ package com.atlassian.performance.tools.aws import com.amazonaws.regions.Regions +import com.amazonaws.regions.Regions.* /** - * Based on https://ubuntu.com/server/docs/cloud-images/amazon-ec2 + * Based on https://documentation.ubuntu.com/aws/en/latest/aws-how-to/instances/find-ubuntu-images/#ownership-verification */ internal object CanonicalOwnerIdRegistry { - const val default = "099720109477" - val byRegion = Regions.values().associate { - it to when(it) { - Regions.GovCloud -> "513442679011" - Regions.CN_NORTH_1, - Regions.CN_NORTHWEST_1 -> "837727238323" - else -> default - } + fun forRegion(region: Regions?) = when (region) { + GovCloud -> "513442679011" + CN_NORTH_1, CN_NORTHWEST_1 -> "837727238323" + else -> "099720109477" } - - fun forRegion(region: Regions?) = byRegion[region] ?: default } \ No newline at end of file diff --git a/src/test/kotlin/com/atlassian/performance/tools/aws/api/CanonicalImageIdByNameResolverTest.kt b/src/test/kotlin/com/atlassian/performance/tools/aws/api/CanonicalImageIdByNameResolverTest.kt index d7c64b2..3971190 100644 --- a/src/test/kotlin/com/atlassian/performance/tools/aws/api/CanonicalImageIdByNameResolverTest.kt +++ b/src/test/kotlin/com/atlassian/performance/tools/aws/api/CanonicalImageIdByNameResolverTest.kt @@ -36,7 +36,7 @@ class CanonicalImageIdByNameResolverTest { assertThat(savedRequest).isNotNull assertThat(savedRequest!!.filters).contains( Filter("name", listOf(queriedImageName)), - Filter("owner-id", listOf(CanonicalOwnerIdRegistry.byRegion[region])) + Filter("owner-id", listOf(CanonicalOwnerIdRegistry.forRegion(region))) ) } } @@ -63,7 +63,7 @@ class CanonicalImageIdByNameResolverTest { assertThat(savedRequest).isNotNull assertThat(savedRequest!!.filters).contains( Filter("name", listOf(queriedImageName)), - Filter("owner-id", listOf(CanonicalOwnerIdRegistry.default)) + Filter("owner-id", listOf("099720109477")) ) }