Merge remote-tracking branch 'origin/main' into chore-refactor-ep20

.changes/1371764e-c78a-4127-935c-407d11574af7.json

@@ -0,0 +1,5 @@
+{
+    "id": "1371764e-c78a-4127-935c-407d11574af7",
+    "type": "misc",
+    "description": "Generate internal-only clients with `internal` visibility"
+}

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.32.2-beta] - 09/15/2023
+
+### Miscellaneous
+* [#946](https://github.com/awslabs/aws-sdk-kotlin/issues/946) Refactor CredentialsProvider APIs
+* Sync smithy-kotlin and AWS service models.
+
 ## [0.32.1-beta] - 09/08/2023
 
 ### Features

aws-runtime/aws-config/build.gradle.kts

@@ -114,9 +114,11 @@ codegen {
                     generateDefaultBuildFiles = false
                     generateFullProject = false
                 }
+                apiSettings {
+                    visibility = "internal"
+                }
             }
 
-            // TODO - could we add a trait such that we change visibility to `internal` or a build setting...?
             transforms = listOf(
                 """
                 {
@@ -149,6 +151,9 @@ codegen {
                     generateDefaultBuildFiles = false
                     generateFullProject = false
                 }
+                apiSettings {
+                    visibility = "internal"
+                }
             }
 
             transforms = listOf(
@@ -181,6 +186,9 @@ codegen {
                     generateDefaultBuildFiles = false
                     generateFullProject = false
                 }
+                apiSettings {
+                    visibility = "internal"
+                }
             }
 
             transforms = listOf(

codegen/sdk/aws-models/cloud9.json

@@ -1175,7 +1175,7 @@
                 "imageId": {
                     "target": "com.amazonaws.cloud9#ImageId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance.\n      To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM)\n      path.</p>\n         <p>The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned\n      a value in the request. Because Amazon Linux AMI has ended standard support as of December 31,\n      2020, we recommend you choose Amazon Linux 2, which includes long term support through\n      2023.</p>\n         <p>From December 31, 2023, the parameter for Amazon Linux will no longer be available when\n      you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which\n      is used to launch your instance if no parameter is explicitly defined.</p>\n         <p>\n            <b>AMI aliases </b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <b>Amazon Linux (default):\n            <code>amazonlinux-1-x86_64</code>\n                  </b>\n               </p>\n            </li>\n            <li>\n               <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 22.04:  <code>ubuntu-22.04-x86_64</code>\n               </p>\n            </li>\n         </ul>\n         <p>\n            <b>SSM paths</b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <b>Amazon Linux (default):\n              <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code>\n                  </b>\n               </p>\n            </li>\n            <li>\n               <p>Amazon Linux 2:\n          <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 18.04:\n          <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 22.04:\n        <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code>\n               </p>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance.\n      To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM)\n      path.</p>\n         <p>The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned\n      a value in the request. Because Amazon Linux AMI has ended standard support as of December 31,\n      2020, we recommend you choose Amazon Linux 2, which includes long term support through\n      2023.</p>\n         <p>From December 31, 2023, the parameter for Amazon Linux will no longer be available when\n      you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which\n      is used to launch your instance if no parameter is explicitly defined.</p>\n         <p>Since Ubuntu 18.04 has ended standard support as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p>\n         <p>\n            <b>AMI aliases </b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <b>Amazon Linux (default):\n            <code>amazonlinux-1-x86_64</code>\n                  </b>\n               </p>\n            </li>\n            <li>\n               <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 22.04:  <code>ubuntu-22.04-x86_64</code>\n               </p>\n            </li>\n         </ul>\n         <p>\n            <b>SSM paths</b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <b>Amazon Linux (default):\n              <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code>\n                  </b>\n               </p>\n            </li>\n            <li>\n               <p>Amazon Linux 2:\n          <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 18.04:\n          <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code>\n               </p>\n            </li>\n            <li>\n               <p>Ubuntu 22.04:\n        <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code>\n               </p>\n            </li>\n         </ul>"
                     }
                 },
                 "automaticStopTimeMinutes": {