Merge branch 'main' into main

beqqrry-aws · web-flow · commit 143c54c33a2f · 2025-08-14T09:20:35.000-07:00
diff --git a/.doc_gen/metadata/entityresolution_metadata.yaml b/.doc_gen/metadata/entityresolution_metadata.yaml
@@ -21,7 +21,7 @@ entityresolution_Hello:
               snippet_tags:
                 - javascript.v3.entity-resolution.hello
   services:
-    entityresolution: {listMatchingWorkflows}
+    entityresolution: {ListMatchingWorkflows}
 entityresolution_DeleteSchemaMapping:
   languages:
     Java:
@@ -42,7 +42,7 @@ entityresolution_DeleteSchemaMapping:
                 - entity-resolution.JavaScriptv3.delete.schema-mapping
   services:
     entityresolution: {DeleteSchemaMapping}
-entityresolution_TagEntityResource:
+entityresolution_TagResource:
   languages:
     Java:
       versions:
@@ -61,7 +61,7 @@ entityresolution_TagEntityResource:
               snippet_tags:
                 - entity-resolution.JavaScriptv3.tag.entity-resource
   services:
-    entityresolution: {TagEntityResource}
+    entityresolution: {TagResource}
 entityresolution_CreateMatchingWorkflow:
   languages:
     Java:
@@ -82,26 +82,6 @@ entityresolution_CreateMatchingWorkflow:
                 - entity-resolution.JavaScriptv3.create-matching-workflow
   services:
     entityresolution: {CreateMatchingWorkflow}
-entityresolution_CheckWorkflowStatus:
-  languages:
-    Java:
-      versions:
-        - sdk_version: 2
-          github: javav2/example_code/entityresolution
-          excerpts:
-            - description:
-              snippet_tags:
-                - entityres.java2_check_matching_workflow.main
-    JavaScript:
-      versions:
-        - sdk_version: 3
-          github: javascriptv3/example_code/entityresolution
-          excerpts:
-            - description:
-              snippet_tags:
-                - entity-resolution.JavaScriptv3.check-workflow-status
-  services:
-    entityresolution: {CheckWorkflowStatus}
 entityresolution_StartMatchingJob:
   languages:
     Java:
diff --git a/.doc_gen/metadata/location_metadata.yaml b/.doc_gen/metadata/location_metadata.yaml
@@ -33,7 +33,7 @@ location_Hello:
               snippet_tags:
                 - javascript.v3.location.hello
   services:
-    location: {ListGeofencesPaginator}
+    location: {ListGeofences, ListGeofenceCollections}
 location_CreateMap:
   languages:
     Kotlin:
diff --git a/javascriptv3/example_code/cross-services/textract-react/package.json b/javascriptv3/example_code/cross-services/textract-react/package.json
@@ -11,8 +11,8 @@
     "@aws-sdk/client-textract": "^3.9.0",
     "@aws-sdk/credential-provider-cognito-identity": "^3.9.0",
     "bootstrap": "^5.0.0-beta3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-scripts": "5.0.0",
     "web-vitals": "^1.1.1"
   },
diff --git a/javascriptv3/example_code/entityresolution/README.md b/javascriptv3/example_code/entityresolution/README.md
@@ -31,14 +31,13 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javas
 
 ### Get started
 
-- [Hello AWS Entity Resolution](hello.js#L4) (`listMatchingWorkflows`)
+- [Hello AWS Entity Resolution](hello.js#L4) (`ListMatchingWorkflows`)
 
 
 ### Single actions
 
 Code excerpts that show you how to call individual service functions.
 
-- [CheckWorkflowStatus](actions/check-workflow-status.js#L4)
 - [CreateMatchingWorkflow](actions/create-matching-workflow.js#L4)
 - [CreateSchemaMapping](actions/create-schema-mapping.js#L4)
 - [DeleteMatchingWorkflow](actions/delete-matching-workflow.js#L4)
@@ -47,7 +46,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetSchemaMapping](actions/get-schema-mapping.js#L4)
 - [ListSchemaMappings](actions/list-schema-mappings.js#L4)
 - [StartMatchingJob](actions/start-matching-job.js#L4)
-- [TagEntityResource](actions/tag-entity-resource.js#L4)
+- [TagResource](actions/tag-entity-resource.js#L4)
 
 
 <!--custom.examples.start-->
diff --git a/javascriptv3/example_code/location/README.md b/javascriptv3/example_code/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javas
 
 ### Get started
 
-- [Hello Amazon Location](hello.js#L4) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](hello.js#L4) (`ListGeofenceCollections`)
 
 
 ### Basics
diff --git a/javav2/example_code/entityresolution/README.md b/javav2/example_code/entityresolution/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javav
 
 ### Get started
 
-- [Hello AWS Entity Resolution](src/main/java/com/example/entity/HelloEntityResoultion.java#L19) (`listMatchingWorkflows`)
+- [Hello AWS Entity Resolution](src/main/java/com/example/entity/HelloEntityResoultion.java#L19) (`ListMatchingWorkflows`)
 
 
 ### Basics
@@ -45,7 +45,6 @@ Code examples that show you how to perform the essential operations within a ser
 
 Code excerpts that show you how to call individual service functions.
 
-- [CheckWorkflowStatus](src/main/java/com/example/entity/scenario/EntityResActions.java#L391)
 - [CreateMatchingWorkflow](src/main/java/com/example/entity/scenario/EntityResActions.java#L429)
 - [CreateSchemaMapping](src/main/java/com/example/entity/scenario/EntityResActions.java#L230)
 - [DeleteMatchingWorkflow](src/main/java/com/example/entity/scenario/EntityResActions.java#L196)
@@ -54,7 +53,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetSchemaMapping](src/main/java/com/example/entity/scenario/EntityResActions.java#L280)
 - [ListSchemaMappings](src/main/java/com/example/entity/scenario/EntityResActions.java#L173)
 - [StartMatchingJob](src/main/java/com/example/entity/scenario/EntityResActions.java#L354)
-- [TagEntityResource](src/main/java/com/example/entity/scenario/EntityResActions.java#L516)
+- [TagResource](src/main/java/com/example/entity/scenario/EntityResActions.java#L516)
 
 
 <!--custom.examples.start-->
diff --git a/javav2/example_code/location/README.md b/javav2/example_code/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javav
 
 ### Get started
 
-- [Hello Amazon Location](src/main/java/com/example/location/HelloLocation.java#L18) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](src/main/java/com/example/location/HelloLocation.java#L18) (`ListGeofenceCollections`)
 
 
 ### Basics
diff --git a/kotlin/services/location/README.md b/kotlin/services/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `kotli
 
 ### Get started
 
-- [Hello Amazon Location](src/main/java/location/HelloLocation.kt#L10) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](src/main/java/location/HelloLocation.kt#L10) (`ListGeofenceCollections`)
 
 
 ### Basics
diff --git a/python/example_code/bedrock-agent-runtime/README.md b/python/example_code/bedrock-agent-runtime/README.md
@@ -38,7 +38,7 @@ python -m pip install -r requirements.txt
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](../bedrock-agent/flows/flow-conversation.py)
+- [Learn the basics](flows/flow-conversation.py)
 
 
 ### Single actions
@@ -79,7 +79,7 @@ This example shows you how to use InvokeFlow to converse with an Amazon Bedrock
 Start the example by running the following at a command prompt:
 
 ```
-python ../bedrock-agent/flows/flow-conversation.py
+python flows/flow-conversation.py
 ```
 
 
diff --git a/python/example_code/bedrock-agent/flows/flow-conversation.py b/python/example_code/bedrock-agent/flows/flow-conversation.py
@@ -1,7 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# snippet-start:[python.example_code.bedrock-agent-runtime.flow_conversation.complete]
+# snippet-start:[python.example_code.bedrock-agent.flow_conversation.complete]
 
 
 """
@@ -179,4 +179,4 @@ def main():
 if __name__ == "__main__":
     main()
 
- # snippet-end:[python.example_code.bedrock-agent-runtime.flow_conversation.complete]
+ # snippet-end:[python.example_code.bedrock-agent.flow_conversation.complete]
diff --git a/python/example_code/kms/key_encryption.py b/python/example_code/kms/key_encryption.py
@@ -35,7 +35,7 @@ def from_client(cls) -> "KeyEncrypt":
     # snippet-end:[python.example_code.kms.KeyEncrypt.decl]
 
     # snippet-start:[python.example_code.kms.Encrypt]
-    def encrypt(self, key_id: str, text: str) -> str:
+    def encrypt(self, key_id: str, text: str) -> bytes:
         """
         Encrypts text by using the specified key.
 
@@ -64,7 +64,7 @@ def encrypt(self, key_id: str, text: str) -> str:
     # snippet-end:[python.example_code.kms.Encrypt]
 
     # snippet-start:[python.example_code.kms.Decrypt]
-    def decrypt(self, key_id: str, cipher_text: str) -> bytes:
+    def decrypt(self, key_id: str, cipher_text: bytes) -> str:
         """
         Decrypts text previously encrypted with a key.
 
@@ -75,7 +75,7 @@ def decrypt(self, key_id: str, cipher_text: str) -> bytes:
         try:
             return self.kms_client.decrypt(KeyId=key_id, CiphertextBlob=cipher_text)[
                 "Plaintext"
-            ]
+            ].decode()
         except ClientError as err:
             logger.error(
                 "Couldn't decrypt your ciphertext. Here's why: %s",
@@ -198,7 +198,7 @@ def key_encryption(kms_client):
         answer = input("Ready to decrypt your ciphertext (y/n)? ")
         if answer.lower() == "y":
             decrypted_text = key_encrypt.decrypt(key_id, cipher_text)
-            print(f"Your plaintext is {decrypted_text.decode()}")
+            print(f"Your plaintext is {decrypted_text}")
             print("-" * 88)
             key_encrypt.re_encrypt(key_id, cipher_text)
         else:
diff --git a/swift/example_code/swift-sdk/http-config/Package.swift b/swift/example_code/swift-sdk/http-config/Package.swift
@@ -5,7 +5,7 @@
 // (swift-tools-version has two lines here because it needs to be the first
 // line in the file, but it should also appear in the snippet below)
 //
-// snippet-start:[swift.cognito-identity-provider.scenario.package]
+// snippet-start:[swift.httpconfig.scenario.package]
 // swift-tools-version: 5.9
 //
 // The swift-tools-version declares the minimum version of Swift required to
@@ -44,4 +44,4 @@ let package = Package(
 
     ]
 )
-// snippet-end:[swift.cognito-identity-provider.scenario.package]
+// snippet-end:[swift.httpconfig.scenario.package]
