Allow # in app/ user-agent metadata

Author: lauzadis

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadata.kt

@@ -73,7 +73,7 @@ public data class AwsUserAgentMetadata(
             add(languageMetadata)
             execEnvMetadata?.let(::add)
             customMetadata?.typedExtras?.filterIsInstance<ConfigMetadata>()?.forEach(::add)
-            appId?.let { add(uaPair("app", it)) }
+            appId?.let { add(uaPair("app", value = it)) }
             customMetadata?.typedExtras?.filterIsInstance<FeatureMetadata>()?.forEach(::add)
             frameworkMetadata?.let(::add)
 
@@ -190,7 +190,7 @@ internal expect fun platformLanguageMetadata(): LanguageMetadata
  */
 @InternalSdkApi
 public data class ExecutionEnvMetadata(val name: String) {
-    override fun toString(): String = uaPair("exec-env", name)
+    override fun toString(): String = uaPair("exec-env", value = name)
 }
 
 /**
@@ -223,21 +223,29 @@ private fun detectExecEnv(platform: PlatformEnvironProvider): ExecutionEnvMetada
 // tchar_no_hash = "!" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
 //                 "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
 private val VALID_TCHAR_NO_HASH = setOf('!', '$', '%', '&', '\'', '*', '+', '-', '.', '^', '_', '`', '|', '~')
+private val VALID_TCHAR = VALID_TCHAR_NO_HASH + '#'
 
-internal fun uaPair(category: String, key: String, value: String? = null): String =
-    if (value == null) {
-        "${category.encodeUaToken()}/${key.encodeUaToken()}"
-    } else {
-        "${category.encodeUaToken()}/${key.encodeUaToken()}#${value.encodeUaToken()}"
-    }
 
-private fun String.encodeUaToken(): String {
+internal fun uaPair(category: String, key: String? = null, value: String? = null): String = when {
+    key == null && value == null -> category.encodeUaName()
+    value == null -> "${category.encodeUaName()}/${key!!.encodeUaName()}"
+    key == null -> "${category.encodeUaName()}/${value.encodeUaValue()}"
+    else -> "${category.encodeUaName()}/${key.encodeUaName()}#${value.encodeUaValue()}"
+}
+
+private fun String.encodeUaName() = encodeUaString(VALID_TCHAR_NO_HASH)
+private fun String.encodeUaValue() = encodeUaString(VALID_TCHAR)
+
+/**
+ * Encode a UA string, allowing only A-Z, a-z, 0-9, and characters in `charSet`.
+ */
+private fun String.encodeUaString(charSet: Set<Char>): String {
     val str = this
     return buildString(str.length) {
         for (chr in str) {
             when (chr) {
                 ' ' -> append("_")
-                in 'a'..'z', in 'A'..'Z', in '0'..'9', in VALID_TCHAR_NO_HASH -> append(chr)
+                in 'a'..'z', in 'A'..'Z', in '0'..'9', in charSet -> append(chr)
                 else -> continue
             }
         }

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadataTest.kt

@@ -31,7 +31,7 @@ class AwsUserAgentMetadataTest {
         val langMeta = LanguageMetadata("1.4.31", mapOf("jvmVersion" to "1.11"))
         val execEnvMeta = ExecutionEnvMetadata("lambda")
         val frameworkMeta = FrameworkMetadata("amplify", "1.2.3")
-        val appId = "Foo Service"
+        val appId = "Foo Service #1.2.3"
         val custom = CustomUserAgentMetadata(
             extras = mapOf("foo" to "bar", "internal" to "true"),
             typedExtras = listOf(
@@ -53,7 +53,7 @@ class AwsUserAgentMetadataTest {
             "exec-env/lambda",
             "cfg/retry-mode#standard",
             "cfg/http-engine#okhttp",
-            "app/Foo_Service",
+            "app/Foo_Service_#1.2.3",
             "ft/paginator",
             "ft/ddb-hll#4.5.6",
             "lib/amplify#1.2.3",