Merge branch 'dotnettestfixes' of github.com:rlhagerm/aws-doc-sdk-examples into dotnettestfixes

Author: rlhagerm

.doc_gen/metadata/dynamodb_metadata.yaml

@@ -131,7 +131,7 @@ opensearch_DescribeDomain:
           excerpts:
             - description:
               snippet_tags:
-                - opensearch.java2.update_domain.main
+                - opensearch.java2.describe_domain.main
   services:
     opensearch: {DescribeDomain}
 opensearch_UpdateDomainConfig:

.doc_gen/metadata/opensearch_metadata.yaml

@@ -154,25 +154,11 @@ public static String createMediaJob(MediaConvertClient mc, String mcRoleARN, Str
 
                 try {
                         // snippet-start:[mediaconvert.java.createjob.getendpointurl]
-                        DescribeEndpointsResponse res = mc
-                                        .describeEndpoints(DescribeEndpointsRequest.builder().maxResults(20).build());
-
-                        if (res.endpoints().size() <= 0) {
-                                System.out.println("Cannot find MediaConvert service endpoint URL!");
-                                System.exit(1);
-                        }
-                        String endpointURL = res.endpoints().get(0).url();
-                        System.out.println("MediaConvert service URL: " + endpointURL);
                         System.out.println("MediaConvert role arn: " + mcRoleARN);
                         System.out.println("MediaConvert input file: " + fileInput);
                         System.out.println("MediaConvert output path: " + s3path);
                         // snippet-end:[mediaconvert.java.createjob.getendpointurl]
 
-                        MediaConvertClient emc = MediaConvertClient.builder()
-                                        .region(Region.US_WEST_2)
-                                        .endpointOverride(URI.create(endpointURL))
-                                        .build();
-
                         // output group Preset HLS low profile
                         Output hlsLow = createOutput("hls_low", "_low", "_$dt$", 750000, 7, 1920, 1080, 640);
                         // output group Preset HLS media profile
@@ -369,7 +355,7 @@ public static String createMediaJob(MediaConvertClient mc, String mcRoleARN, Str
                                         .settings(jobSettings)
                                         .build();
 
-                        CreateJobResponse createJobResponse = emc.createJob(createJobRequest);
+                        CreateJobResponse createJobResponse = mc.createJob(createJobRequest);
                         return createJobResponse.job().id();
 
                 } catch (MediaConvertException e) {

javav2/example_code/mediaconvert/src/main/java/com/example/mediaconvert/CreateJob.java

@@ -49,25 +49,11 @@ public static void main(String[] args) {
 
     public static void getSpecificJob(MediaConvertClient mc, String jobId) {
         try {
-            DescribeEndpointsResponse res = mc.describeEndpoints(DescribeEndpointsRequest.builder()
-                    .maxResults(20)
-                    .build());
-
-            if (res.endpoints().size() <= 0) {
-                System.out.println("Cannot find MediaConvert service endpoint URL!");
-                System.exit(1);
-            }
-            String endpointURL = res.endpoints().get(0).url();
-            MediaConvertClient emc = MediaConvertClient.builder()
-                    .region(Region.US_WEST_2)
-                    .endpointOverride(URI.create(endpointURL))
-                    .build();
-
             GetJobRequest jobRequest = GetJobRequest.builder()
                     .id(jobId)
                     .build();
 
-            GetJobResponse response = emc.getJob(jobRequest);
+            GetJobResponse response = mc.getJob(jobRequest);
             System.out.println("The ARN of the job is " + response.job().arn());
 
         } catch (MediaConvertException e) {

javav2/example_code/mediaconvert/src/main/java/com/example/mediaconvert/GetJob.java

@@ -38,27 +38,14 @@ public static void main(String[] args) {
 
     public static void listCompleteJobs(MediaConvertClient mc) {
         try {
-            DescribeEndpointsResponse res = mc.describeEndpoints(DescribeEndpointsRequest.builder()
-                    .maxResults(20)
-                    .build());
-
-            if (res.endpoints().size() <= 0) {
-                System.out.println("Cannot find MediaConvert service endpoint URL!");
-                System.exit(1);
-            }
-
-            String endpointURL = res.endpoints().get(0).url();
-            MediaConvertClient emc = MediaConvertClient.builder()
-                    .region(Region.US_WEST_2)
-                    .endpointOverride(URI.create(endpointURL))
-                    .build();
-
+            // Create the ListJobsRequest
             ListJobsRequest jobsRequest = ListJobsRequest.builder()
                     .maxResults(10)
                     .status("COMPLETE")
                     .build();
 
-            ListJobsResponse jobsResponse = emc.listJobs(jobsRequest);
+            // Call the listJobs operation
+            ListJobsResponse jobsResponse = mc.listJobs(jobsRequest);
             List<Job> jobs = jobsResponse.jobs();
             for (Job job : jobs) {
                 System.out.println("The JOB ARN is : " + job.arn());

javav2/example_code/mediaconvert/src/main/java/com/example/mediaconvert/ListJobs.java

@@ -49,7 +49,7 @@ Code excerpts that show you how to call individual service functions.
 - [ChangeProgress](src/main/java/com/example/search/scenario/OpenSearchActions.java#L215)
 - [CreateDomain](src/main/java/com/example/search/scenario/OpenSearchActions.java#L69)
 - [DeleteDomain](src/main/java/com/example/search/scenario/OpenSearchActions.java#L114)
-- [DescribeDomain](src/main/java/com/example/search/scenario/OpenSearchActions.java#L189)
+- [DescribeDomain](src/main/java/com/example/search/scenario/OpenSearchActions.java#L136)
 - [ListDomainNames](src/main/java/com/example/search/scenario/OpenSearchActions.java#L167)
 - [ListTags](src/main/java/com/example/search/scenario/OpenSearchActions.java#L265)
 - [UpdateDomainConfig](src/main/java/com/example/search/scenario/OpenSearchActions.java#L189)
@@ -119,4 +119,4 @@ in the `javav2` folder.
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: Apache-2.0

javav2/example_code/opensearch/README.md

@@ -48,11 +48,11 @@ public class AmazonRedshiftTest {
     @BeforeAll
     public static void setUp() {
         redshiftClient = RedshiftClient.builder()
-            .region(Region.US_EAST_1)
+            .region(Region.US_EAST_2)
             .build();
 
         redshiftDataClient = RedshiftDataClient.builder()
-            .region(Region.US_EAST_1)
+            .region(Region.US_EAST_2)
             .build();
 
         Random rand = new Random();
@@ -195,6 +195,7 @@ public void testDeleteDatabase() {
         logger.info("Test 11 passed");
     }
 
+
     private static String getSecretValues() {
         SecretsManagerClient secretClient = SecretsManagerClient.builder()
             .region(Region.US_EAST_1)

javav2/example_code/redshift/src/test/java/AmazonRedshiftTest.java

@@ -29,8 +29,7 @@
  * {
  * "Effect": "Allow",
  * "Principal": {
- * "AWS": "<Specify the ARN of your IAM user you are using in this code
- * example>"
+ * "AWS": "<Specify the ARN of your IAM user you are using in this code example>"
  * },
  * "Action": "sts:AssumeRole"
  * }
@@ -54,7 +53,7 @@ public static void main(String[] args) {
                     <roleArn> <roleSessionName>\s
 
                 Where:
-                    roleArn - The Amazon Resource Name (ARN) of the role to assume (for example, rn:aws:iam::000008047983:role/s3role).\s
+                    roleArn - The Amazon Resource Name (ARN) of the role to assume (for example, arn:aws:iam::000008047983:role/s3role).\s
                     roleSessionName - An identifier for the assumed role session (for example, mysession).\s
                 """;
 

javav2/example_code/sts/src/main/java/com/example/sts/AssumeRole.java

@@ -22,22 +22,75 @@ Cross-service examples are located in the [*cross-services folder*](cross_servic
 *  We recommend that you grant your code least privilege. At most, grant only the minimum permissions required to perform the task. For more information, see [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
 * This code is not tested in every AWS Region. For more information, see [AWS Regional Services](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services).
 
+## Prerequisites
 
-### Prerequisites
+To run these code examples, you need:
+
+* [PHP](https://www.php.net/) version 8.1 or higher
+* [Composer](https://getcomposer.org) for dependency management
+* [PHPUnit](https://phpunit.de/) for unit testing
+* The [AWS SDK for PHP](https://aws.amazon.com/sdk-for-php/)
+* [AWS credentials](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/guide_credentials.html) set up
+
+For more information, see [Getting Started](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/getting-started_index.html) in the AWS SDK for PHP Developer Guide.
+
+## Set up the examples
+
+Some examples require supporting files from the GitHub repository in addition to the AWS SDK for PHP. For these examples:
+
+1. Clone, fork, or download the entire [aws-doc-sdk-examples repository](https://github.com/awsdocs/aws-doc-sdk-examples) from GitHub. 
+
+   You need the entire repository, not just individual files, so supporting files can be accessed by the examples.
+
+2. Install dependencies
+
+   From the directory that contains the composer.json file for the example, run:
+   ```bash
+   composer install
+   ```
+
+3. Run examples from within the repository structure and from the directory that contains the initiating code
+
+   Run examples from within the cloned directory structure to ensure access to supporting files.
+
+## Run the examples
+
+By default, these code examples run using the default AWS credential provider chain, which includes using the AWS shared credentials and config files with a `default` profile.
+For more information, about using AWS shared files and the `default` profile, see [Using shared config and credentials files to globally configure AWS SDKs and tools](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html) in the *AWS SDKs and Tools
+Reference Guide*.
+
+Important: Running these code examples might result in charges to the AWS account associated with the AWS credentials being used.
+
+Many examples include a `Runner.php` file to abstract the logic from running the code. From any example directory with a Runner.php file, run:
+
+```bash
+php Runner.php
+```
+
+---------
+
+## Prerequisites
 To run or test these code examples, you need the following:
 
 - [PHP](https://www.php.net/) version 8.1 or higher
 - [Composer](https://getcomposer.org), for dependency management
 - [PHPUnit](https://phpunit.de/), for unit testing
 - The [AWS SDK for PHP](https://aws.amazon.com/sdk-for-php/)
 - [AWS credentials](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/guide_credentials.html) set up
+- For examples that use supporting files that are available only in the GitHub repository
+and not available for installation by Composer, you need to
+  - clone, fork, or download a zip of the entire [aws-doc-sdk-examples repository](https://github.com/awsdocs/aws-doc-sdk-examples) from GitHub.
+You want the entire repository, not just indvidual files, so supporting files can be accessed by the examples.
+  - Run the example from within the directory structure and from within the directory that contains the composer.json file.
+  - Install the dependencies and configuration settings with Composer.
 
 For more information, see [Getting Started](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/getting-started_index.html) in the *AWS SDK for PHP Developer Guide*.
 
 ## Run the code
 
-By default, these code examples run using the default AWS credential provider chain, which includes using an AWS shared credentials file and profiles.
-For more information, see [Using the AWS Credentials File and Credential Profiles](https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/guide_credentials_profiles.html) in the *AWS SDK for PHP Developer Guide*.
+By default, these code examples run using the default AWS credential provider chain, which includes using the AWS shared credentials and config files with a `default` profile.
+For more information, about using AWS shared files and the `default` profile, see [Using shared config and credentials files to globally configure AWS SDKs and tools](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html) in the *AWS SDKs and Tools
+Reference Guide*.
 
 Running these code examples might result in charges to the AWS account that is associated with the AWS credentials being used.
 

php/README.md

@@ -17,8 +17,7 @@ class DynamoDBService extends AWSServiceClass
     public function __construct(
         DynamoDbClient $client = null,
         string $region = 'us-west-2',
-        string $version = 'latest',
-        string $profile = 'default'
+        string $version = 'latest'
     ) {
         if (gettype($client) == DynamoDbClient::class) {
             $this->dynamoDbClient = $client;
@@ -27,7 +26,6 @@ public function __construct(
         $this->dynamoDbClient = new DynamoDbClient([
             'region' => $region,
             'version' => $version,
-            'profile' => $profile,
             'http' => [
                 'verify' => false,
             ],