Break out to reprioritizeAuthOptions function to make testing easier

Author: lauzadis

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -381,6 +381,7 @@ object RuntimeTypes {
             val SigV4AuthScheme = symbol("SigV4AuthScheme")
             val SigV4AsymmetricAuthScheme = symbol("SigV4AsymmetricAuthScheme")
             val mergeAuthOptions = symbol("mergeAuthOptions")
+            val reprioritizeAuthOptions = symbol("reprioritizeAuthOptions")
             val sigV4 = symbol("sigV4")
             val sigV4A = symbol("sigV4A")
         }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt

@@ -131,23 +131,7 @@ open class AuthSchemeProviderGenerator {
                 }
                 write("")
 
-                // reprioritize auth options based on user's preference
-                withInlineBlock("return authSchemePreference?.let {", "} ") {
-                    // add preferred candidates first
-                    withBlock("val preferredAuthOptions = it.mapNotNull { preferredSchemeId ->", "}") {
-                        writeWithNoFormatting("val preferredSchemeName = preferredSchemeId.id.substringAfter('#')")
-                        withBlock("authOptions.singleOrNull {", "}") {
-                            writeWithNoFormatting("it.schemeId.id.substringAfter('#') == preferredSchemeName")
-                        }
-                    }
-
-                    // add any remaining candidates that weren't in the preference list
-                    write("val nonPreferredAuthOptions = authOptions.filterNot { it in preferredAuthOptions }")
-                    write("")
-
-                    write("preferredAuthOptions + nonPreferredAuthOptions")
-                }
-                write("?: authOptions")
+                write("return authSchemePreference?.let { #T(it, authOptions) } ?: authOptions", RuntimeTypes.Auth.HttpAuthAws.reprioritizeAuthOptions)
             }
 
             // render any helper methods

runtime/auth/http-auth-aws/api/http-auth-aws.api

@@ -36,6 +36,7 @@ public final class aws/smithy/kotlin/runtime/http/auth/AwsHttpSigner$Config {
 
 public final class aws/smithy/kotlin/runtime/http/auth/EndpointAuthKt {
 	public static final fun mergeAuthOptions (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
+	public static final fun reprioritizeAuthOptions (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
 }
 
 public final class aws/smithy/kotlin/runtime/http/auth/SigV4AsymmetricAuthScheme : aws/smithy/kotlin/runtime/http/auth/AuthScheme {

runtime/auth/http-auth-aws/common/src/aws/smithy/kotlin/runtime/http/auth/EndpointAuth.kt

@@ -6,6 +6,7 @@ package aws.smithy.kotlin.runtime.http.auth
 
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.auth.AuthOption
+import aws.smithy.kotlin.runtime.auth.AuthSchemeId
 import aws.smithy.kotlin.runtime.collections.merge
 import aws.smithy.kotlin.runtime.collections.toMutableAttributes
 
@@ -37,3 +38,21 @@ public fun mergeAuthOptions(modeled: List<AuthOption>, endpointOptions: List<Aut
 
     return merged
 }
+
+/**
+ * Re-prioritize a resolved list of auth options based on a user's preference list
+ */
+@InternalApi
+public fun reprioritizeAuthOptions(authSchemePreference: List<AuthSchemeId>, authOptions: List<AuthOption>): List<AuthOption> {
+    // add preferred candidates first
+    val preferredAuthOptions = authSchemePreference.mapNotNull { preferredSchemeId ->
+        val preferredSchemeName = preferredSchemeId.id.substringAfter('#')
+        authOptions.singleOrNull {
+            it.schemeId.id.substringAfter('#') == preferredSchemeName
+        }
+    }
+
+    val nonPreferredAuthOptions = authOptions.filterNot { it in preferredAuthOptions }
+
+    return preferredAuthOptions + nonPreferredAuthOptions
+}

runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/EndpointAuthTest.kt

@@ -7,6 +7,7 @@ package aws.smithy.kotlin.runtime.http.auth
 import aws.smithy.kotlin.runtime.auth.AuthOption
 import aws.smithy.kotlin.runtime.auth.AuthSchemeId
 import aws.smithy.kotlin.runtime.collections.attributesOf
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -54,4 +55,75 @@ class EndpointAuthTest {
             assertEquals(expectedOption.attributes, actualOption.attributes)
         }
     }
+
+    @Test
+    fun testReprioritizeAuthOptions() = runTest {
+        val preference = listOf(AuthSchemeId.AwsSigV4Asymmetric)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+            AuthOption(AuthSchemeId.AwsSigV4),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsNoOp() = runTest {
+        val preference = listOf(AuthSchemeId.HttpBearer)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsAllPreferred() = runTest {
+        val preference = listOf(AuthSchemeId.HttpDigest, AuthSchemeId.HttpBasic)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.HttpBasic),
+            AuthOption(AuthSchemeId.HttpDigest),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.HttpDigest),
+            AuthOption(AuthSchemeId.HttpBasic),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsNoPreference() = runTest {
+        val preference = emptyList<AuthSchemeId>()
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.HttpBearer),
+        )
+
+        val expected = authOptions
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsEmptyAuthOptions() = runTest {
+        val preference = listOf(AuthSchemeId.AwsSigV4)
+        val authOptions = emptyList<AuthOption>()
+
+        val expected = emptyList<AuthOption>()
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
 }