Merge branch 'main' into dependabot/maven/javav2/usecases/workflow_sa…

…gemaker_lambda/org.apache.logging.log4j-log4j-core-2.17.1

.doc_gen/metadata/rds_metadata.yaml

@@ -106,6 +106,14 @@ rds_CreateDBInstance:
                 - cpp.example_code.rds.client_configuration
                 - cpp.example_code.rds.client
                 - cpp.example_code.rds.CreateDBInstance
+    PHP:
+      versions:
+        - sdk_version: 3
+          github: php/example_code/rds
+          excerpts:
+            - description:
+              snippet_tags:
+                - php.example_code.rds.createDBInstance.complete
   services:
     rds: {CreateDBInstance}
 rds_DeleteDBInstance:
@@ -170,6 +178,14 @@ rds_DeleteDBInstance:
                 - cpp.example_code.rds.client_configuration
                 - cpp.example_code.rds.client
                 - cpp.example_code.rds.DeleteDBInstance
+    PHP:
+      versions:
+        - sdk_version: 3
+          github: php/example_code/rds
+          excerpts:
+            - description:
+              snippet_tags:
+                - php.example_code.rds.deleteDBInstance.complete
   services:
     rds: {DeleteDBInstance} 
 rds_DescribeAccountAttributes:
@@ -268,6 +284,14 @@ rds_DescribeDBInstances:
                 - cpp.example_code.rds.client_configuration
                 - cpp.example_code.rds.client
                 - cpp.example_code.rds.DescribeDBInstances
+    PHP:
+      versions:
+        - sdk_version: 3
+          github: php/example_code/rds
+          excerpts:
+            - description:
+              snippet_tags:
+                - php.example_code.rds.describeDBInstances.complete
   services:
     rds: {DescribeDBInstances}         
 rds_ModifyDBInstance:
@@ -675,6 +699,14 @@ rds_CreateDBSnapshot:
                 - cpp.example_code.rds.client_configuration
                 - cpp.example_code.rds.client
                 - cpp.example_code.rds.CreateDBSnapshot
+    PHP:
+      versions:
+        - sdk_version: 3
+          github: php/example_code/rds
+          excerpts:
+            - description:
+              snippet_tags:
+                - php.example_code.rds.createDBSnapshot.complete
   services:
     rds: {CreateDBSnapshot}
 rds_DescribeDBSnapshots:

javav2/usecases/workflow_multiple_channels/pom.xml

@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.0</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

php/example_code/rds/CreateDBInstance.php

@@ -2,20 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.create_db_instance.complete]
-// snippet-start:[rds.php.create_db_instance.import]
+// snippet-start:[php.example_code.rds.createDBInstance.complete]
+// snippet-start:[php.example_code.rds.createDBInstance.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.create_db_instance.import]
+// snippet-end:[php.example_code.rds.createDBInstance.import]
+
+// snippet-start:[php.example_code.rds.createDBInstance.main]
 
-// snippet-start:[rds.php.create_db_instance.main]
-//Create a RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-2'
 ]);
 
@@ -29,18 +27,17 @@
 try {
     $result = $rdsClient->createDBInstance([
         'DBInstanceIdentifier' => $dbIdentifier,
-        'DBInstanceClass' => $dbClass ,
+        'DBInstanceClass' => $dbClass,
         'AllocatedStorage' => $storage,
         'Engine' => $engine,
         'MasterUsername' => $username,
         'MasterUserPassword' => $password,
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.create_db_instance.main]
-// snippet-end:[rds.php.create_db_instance.complete]
+// snippet-end:[php.example_code.rds.createDBInstance.main]
+// snippet-end:[php.example_code.rds.createDBInstance.complete]

php/example_code/rds/CreateDBInstanceReadReplica.php

@@ -2,20 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.create_db_replica.complete]
-// snippet-start:[rds.php.create_db_replica.import]
+// snippet-start:[php.example_code.rds.createDBInstanceReadReplica.complete]
+// snippet-start:[php.example_code.rds.createDBInstanceReadReplica.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.create_db_replica.import]
+// snippet-end:[php.example_code.rds.createDBInstanceReadReplica.import]
+
+// snippet-start:[php.example_code.rds.createDBInstanceReadReplica.main]
 
-// snippet-start:[rds.php.create_db_replica.main]
-//Create a RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-2'
 ]);
 
@@ -29,10 +27,9 @@
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.create_db_replica.main]
-// snippet-end:[rds.php.create_db_replica.complete]
+// snippet-end:[php.example_code.rds.createDBInstanceReadReplica.main]
+// snippet-end:[php.example_code.rds.createDBInstanceReadReplica.complete]

php/example_code/rds/CreateDBSnapshot.php

@@ -2,20 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.create_db_snapshot.complete]
-// snippet-start:[rds.php.create_db_snapshot.import]
+// snippet-start:[php.example_code.rds.createDBSnapshot.complete]
+// snippet-start:[php.example_code.rds.createDBSnapshot.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.create_db_snapshot.import]
+// snippet-end:[php.example_code.rds.createDBSnapshot.import]
+
+// snippet-start:[php.example_code.rds.createDBSnapshot.main]
 
-// snippet-start:[rds.php.create_db_snapshot.main]
-//Create a RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-2'
 ]);
 
@@ -29,10 +27,9 @@
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.create_db_snapshot.main]
-// snippet-end:[rds.php.create_db_snapshot.complete]
+// snippet-end:[php.example_code.rds.createDBSnapshot.main]
+// snippet-end:[php.example_code.rds.createDBSnapshot.complete]

php/example_code/rds/DeleteInstance.php

@@ -2,19 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.delete_instance.complete]
-// snippet-start:[rds.php.delete_instance.import]
+// snippet-start:[php.example_code.rds.deleteDBInstance.complete]
+// snippet-start:[php.example_code.rds.deleteDBInstance.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.delete_instance.import]
-// snippet-start:[rds.php.delete_instance.main]
-//Create a RDSClient
+// snippet-end:[php.example_code.rds.deleteDBInstance.import]
+
+// snippet-start:[php.example_code.rds.deleteDBInstance.main]
+//Create an RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-1'
 ]);
 
@@ -26,10 +25,9 @@
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.delete_instance.main]
-// snippet-end:[rds.php.delete_instance.complete]
+// snippet-end:[php.example_code.rds.deleteDBInstance.main]
+// snippet-end:[php.example_code.rds.deleteDBInstance.complete]

php/example_code/rds/DescribeEvents.php

@@ -2,20 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.describe_events.complete]
-// snippet-start:[rds.php.describe_events.import]
+// snippet-start:[php.example_code.rds.describeEvents.complete]
+// snippet-start:[php.example_code.rds.describeEvents.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.describe_events.import]
+// snippet-end:[php.example_code.rds.describeEvents.import]
+
+// snippet-start:[php.example_code.rds.describeEvents.main]
 
-// snippet-start:[rds.php.describe_events.main]
-//Create a RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-2'
 ]);
 
@@ -28,10 +26,9 @@
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.describe_events.main]
-// snippet-end:[rds.php.describe_events.complete]
+// snippet-end:[php.example_code.rds.describeEvents.main]
+// snippet-end:[php.example_code.rds.describeEvents.complete]

php/example_code/rds/DescribeInstance.php

@@ -2,20 +2,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.describe_instance.complete]
-// snippet-start:[rds.php.describe_instance.import]
+// snippet-start:[php.example_code.rds.describeDBInstances.complete]
+// snippet-start:[php.example_code.rds.describeDBInstances.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.describe_instance.import]
+// snippet-end:[php.example_code.rds.describeDBInstances.import]
 
-// snippet-start:[rds.php.describe_instance.main]
-//Create a RDSClient
+// snippet-start:[php.example_code.rds.describeDBInstances.main]
+//Create an RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
-    'profile' => 'default',
-    'version' => '2014-10-31',
     'region' => 'us-east-2'
 ]);
 
@@ -31,10 +29,9 @@
     print(" Raw Result ");
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.describe_instance.main]
-// snippet-end:[rds.php.describe_instance.complete]
+// snippet-end:[php.example_code.rds.describeDBInstances.main]
+// snippet-end:[php.example_code.rds.describeDBInstances.complete]

php/example_code/rds/README.md

@@ -29,6 +29,16 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `php`
 <!--custom.prerequisites.start-->
 <!--custom.prerequisites.end-->
 
+### Single actions
+
+Code excerpts that show you how to call individual service functions.
+
+- [Create a DB instance](CreateDBInstance.php#L5) (`CreateDBInstance`)
+- [Create a snapshot of a DB instance](CreateDBSnapshot.php#L5) (`CreateDBSnapshot`)
+- [Delete a DB instance](DeleteInstance.php#L5) (`DeleteDBInstance`)
+- [Describe DB instances](DescribeInstance.php#L5) (`DescribeDBInstances`)
+
+
 <!--custom.examples.start-->
 <!--custom.examples.end-->
 

php/example_code/rds/StartInstance.php

@@ -2,17 +2,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// snippet-start:[rds.php.start_instance.complete]
-// snippet-start:[rds.php.start_instance.import]
+// snippet-start:[php.example_code.rds.startDBInstance.complete]
+// snippet-start:[php.example_code.rds.startDBInstance.import]
 
-require 'vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 use Aws\Exception\AwsException;
 
-// snippet-end:[rds.php.start_instance.import]
+// snippet-end:[php.example_code.rds.startDBInstance.import]
 
-// snippet-start:[rds.php.start_instance.main]
-//Create a RDSClient
+// snippet-start:[php.example_code.rds.startDBInstance.main]
+//Create an RDSClient
 $rdsClient = new Aws\Rds\RdsClient([
     'profile' => 'default',
     'version' => '2014-10-31',
@@ -27,10 +27,9 @@
     ]);
     var_dump($result);
 } catch (AwsException $e) {
-    // output error message if fails
     echo $e->getMessage();
     echo "\n";
 }
 
-// snippet-end:[rds.php.start_instance.main]
-// snippet-end:[rds.php.start_instance.complete]
+// snippet-end:[php.example_code.rds.startDBInstance.main]
+// snippet-end:[php.example_code.rds.startDBInstance.complete]