Merge branch 'release-1.29.42'

* release-1.29.42: Bumping version to 1.29.42 Update changelog based on model updates CLI examples for opsworks, opsworkscm
aws · Sep 6, 2023 · 97464f2 · 97464f2
2 parents c2869c7 + 8bd8f12
commit 97464f2
Show file tree

Hide file tree

Showing 12 changed files with 209 additions and 164 deletions.
diff --git a/.changes/1.29.42.json b/.changes/1.29.42.json
@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``appflow``",
+    "description": "Adding OAuth2.0 support for servicenow connector.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "This release adds 'outpost' location type to the DescribeInstanceTypeOfferings API, allowing customers that have been allowlisted for outpost to query their offerings in the API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elbv2``",
+    "description": "Update elbv2 command to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``medialive``",
+    "description": "Adds advanced Output Locking options for Epoch Locking: Custom Epoch and Jam Sync Time",
+    "type": "api-change"
+  },
+  {
+    "category": "``wafv2``",
+    "description": "The targeted protection level of the Bot Control managed rule group now provides optional, machine-learning analysis of traffic statistics to detect some bot-related activity. You can enable or disable the machine learning functionality through the API.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.29.42
+=======
+
+* api-change:``appflow``: Adding OAuth2.0 support for servicenow connector.
+* api-change:``ec2``: This release adds 'outpost' location type to the DescribeInstanceTypeOfferings API, allowing customers that have been allowlisted for outpost to query their offerings in the API.
+* api-change:``elbv2``: Update elbv2 command to latest version
+* api-change:``medialive``: Adds advanced Output Locking options for Epoch Locking: Custom Epoch and Jam Sync Time
+* api-change:``wafv2``: The targeted protection level of the Bot Control managed rule group now provides optional, machine-learning analysis of traffic statistics to detect some bot-related activity. You can enable or disable the machine learning functionality through the API.
+
+
 1.29.41
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.29.41'
+__version__ = '1.29.42'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/examples/opsworks/create-app.rst b/awscli/examples/opsworks/create-app.rst
@@ -1,51 +1,62 @@
-**To create an app**
+**Example 1: To create an app**
 
 The following example creates a PHP app named SimplePHPApp from code stored in a GitHub repository.
 The command uses the shorthand form of the application source definition. ::
 
-  aws opsworks --region us-east-1 create-app --stack-id f6673d70-32e6-4425-8999-265dd002fec7 --name SimplePHPApp --type php --app-source Type=git,Url=git://github.com/amazonwebservices/opsworks-demo-php-simple-app.git,Revision=version1
+    aws opsworks create-app \
+        --region us-east-1 \
+        --stack-id f6673d70-32e6-4425-8999-265dd002fec7 \
+        --name SimplePHPApp \
+        --type php \
+        --app-source Type=git,Url=git://github.com/amazonwebservices/opsworks-demo-php-simple-app.git,Revision=version1
 
-*Output*::
+Output::
 
-  {
-    "AppId": "6cf5163c-a951-444f-a8f7-3716be75f2a2"
-  }
+    {
+        "AppId": "6cf5163c-a951-444f-a8f7-3716be75f2a2"
+    }
 
-**To create an app with an attached database**
+**Example 2: To create an app with an attached database**
 
 The following example creates a JSP app from code stored in .zip archive in a public S3 bucket.
 It attaches an RDS DB instance to serve as the app's data store. The application and database sources are defined in separate
 JSON files that are in the directory from which you run the command. ::
 
-  aws opsworks --region us-east-1 create-app --stack-id 8c428b08-a1a1-46ce-a5f8-feddc43771b8 --name SimpleJSP --type java --app-source file://appsource.json --data-sources file://datasource.json 
+    aws opsworks create-app \
+        --region us-east-1 \
+        --stack-id 8c428b08-a1a1-46ce-a5f8-feddc43771b8 \
+        --name SimpleJSP \
+        --type java \
+        --app-source file://appsource.json \
+        --data-sources file://datasource.json 
 
 The application source information is in ``appsource.json`` and contains the following. ::
 
-  {
-    "Type": "archive",
-    "Url": "https://s3.amazonaws.com/jsp_example/simplejsp.zip"
-  }
+    {
+        "Type": "archive",
+        "Url": "https://s3.amazonaws.com/opsworks-demo-assets/simplejsp.zip"
+    }
 
 The database source information is in ``datasource.json`` and contains the following. ::
 
-  [
-    {
-      "Type": "RdsDbInstance",
-      "Arn": "arn:aws:rds:us-west-2:123456789012:db:clitestdb",
-      "DatabaseName": "mydb"
-    }
-  ]
+    [
+        {
+            "Type": "RdsDbInstance",
+            "Arn": "arn:aws:rds:us-west-2:123456789012:db:clitestdb",
+            "DatabaseName": "mydb"
+        }
+    ]
   
 **Note**: For an RDS DB instance, you must first use ``register-rds-db-instance`` to register the instance with the stack.
 For MySQL App Server instances, set ``Type`` to ``OpsworksMysqlInstance``. These instances are
 created by AWS OpsWorks,
 so they do not have to be registered.
 
-*Output*::
+Output::
 
-  {
-    "AppId": "26a61ead-d201-47e3-b55c-2a7c666942f8"
-  }
+    {
+        "AppId": "26a61ead-d201-47e3-b55c-2a7c666942f8"
+    }
 
 For more information, see `Adding Apps`_ in the *AWS OpsWorks User Guide*.
 

diff --git a/awscli/examples/opsworks/describe-apps.rst b/awscli/examples/opsworks/describe-apps.rst
@@ -1,38 +1,36 @@
 **To describe apps**
 
-The following ``describe-apps`` command describes the apps in a specified stack.  ::
-
-  aws opsworks --region us-east-1 describe-apps --stack-id 38ee91e2-abdc-4208-a107-0b7168b3cc7a
-
-*Output*: This particular stack has one app.
-
-::
-
-  {
-    "Apps": [
-      {
-        "StackId": "38ee91e2-abdc-4208-a107-0b7168b3cc7a",
-        "AppSource": {
-          "Url": "https://s3-us-west-2.amazonaws.com/opsworks-tomcat/simplejsp.zip",
-          "Type": "archive"
-        },
-        "Name": "SimpleJSP",
-        "EnableSsl": false,
-        "SslConfiguration": {},
-        "AppId": "da1decc1-0dff-43ea-ad7c-bb667cd87c8b",
-        "Attributes": {
-          "RailsEnv": null,
-          "AutoBundleOnDeploy": "true",
-          "DocumentRoot": "ROOT"
-        },
-        "Shortname": "simplejsp",
-        "Type": "other",
-        "CreatedAt": "2013-08-01T21:46:54+00:00"
-      }
-    ]
-  }
-
-**More Information**
+The following ``describe-apps`` command describes the apps in a specified stack. ::
+
+    aws opsworks describe-apps \
+        --stack-id 38ee91e2-abdc-4208-a107-0b7168b3cc7a \
+        --region us-east-1 
+
+Output:: 
+
+    {
+        "Apps": [
+            {
+                "StackId": "38ee91e2-abdc-4208-a107-0b7168b3cc7a",
+                "AppSource": {
+                "Url": "https://s3-us-west-2.amazonaws.com/opsworks-demo-assets/simplejsp.zip",
+                "Type": "archive"
+            },
+                "Name": "SimpleJSP",
+                "EnableSsl": false,
+                "SslConfiguration": {},
+                "AppId": "da1decc1-0dff-43ea-ad7c-bb667cd87c8b",
+                "Attributes": {
+                "RailsEnv": null,
+                "AutoBundleOnDeploy": "true",
+                "DocumentRoot": "ROOT"
+            },
+                "Shortname": "simplejsp",
+                "Type": "other",
+                "CreatedAt": "2013-08-01T21:46:54+00:00"
+            }
+        ]
+    }
 
 For more information, see Apps_ in the *AWS OpsWorks User Guide*.
 

diff --git a/awscli/examples/opsworks/describe-commands.rst b/awscli/examples/opsworks/describe-commands.rst
@@ -2,40 +2,40 @@
 
 The following ``describe-commands`` commmand describes the commands in a specified instance. ::
 
-  aws opsworks --region us-east-1 describe-commands --instance-id 8c2673b9-3fe5-420d-9cfa-78d875ee7687
-
-*Output*::
-
-  {
-    "Commands": [
-      {
-        "Status": "successful",
-        "CompletedAt": "2013-07-25T18:57:47+00:00",
-        "InstanceId": "8c2673b9-3fe5-420d-9cfa-78d875ee7687",
-        "DeploymentId": "6ed0df4c-9ef7-4812-8dac-d54a05be1029",
-        "AcknowledgedAt": "2013-07-25T18:57:41+00:00",
-        "LogUrl": "https://s3.amazonaws.com/prod_stage-log/logs/008c1a91-ec59-4d51-971d-3adff54b00cc?AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE &Expires=1375394373&Signature=HkXil6UuNfxTCC37EPQAa462E1E%3D&response-cache-control=private&response-content-encoding=gzip&response-content- type=text%2Fplain",
-        "Type": "undeploy",
-        "CommandId": "008c1a91-ec59-4d51-971d-3adff54b00cc",
-        "CreatedAt": "2013-07-25T18:57:34+00:00",
-        "ExitCode": 0
-      },
-      {
-        "Status": "successful",
-        "CompletedAt": "2013-07-25T18:55:40+00:00",
-        "InstanceId": "8c2673b9-3fe5-420d-9cfa-78d875ee7687",
-        "DeploymentId": "19d3121e-d949-4ff2-9f9d-94eac087862a",
-        "AcknowledgedAt": "2013-07-25T18:55:32+00:00",
-        "LogUrl": "https://s3.amazonaws.com/prod_stage-log/logs/899d3d64-0384-47b6-a586-33433aad117c?AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE &Expires=1375394373&Signature=xMsJvtLuUqWmsr8s%2FAjVru0BtRs%3D&response-cache-control=private&response-content-encoding=gzip&response-conten t-type=text%2Fplain",
-        "Type": "deploy",
-        "CommandId": "899d3d64-0384-47b6-a586-33433aad117c",
-        "CreatedAt": "2013-07-25T18:55:29+00:00",
-        "ExitCode": 0
-      }
-    ]
-  }
-
-**More Information**
+    aws opsworks describe-commands \
+        --instance-id 8c2673b9-3fe5-420d-9cfa-78d875ee7687 \
+        --region us-east-1
+
+Output::
+
+    {
+        "Commands": [
+            {
+                "Status": "successful",
+                "CompletedAt": "2013-07-25T18:57:47+00:00",
+                "InstanceId": "8c2673b9-3fe5-420d-9cfa-78d875ee7687",
+                "DeploymentId": "6ed0df4c-9ef7-4812-8dac-d54a05be1029",
+                "AcknowledgedAt": "2013-07-25T18:57:41+00:00",
+                "LogUrl": "https://s3.amazonaws.com/<bucket-name>/logs/008c1a91-ec59-4d51-971d-3adff54b00cc?AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE &Expires=1375394373&Signature=HkXil6UuNfxTCC37EPQAa462E1E%3D&response-cache-control=private&response-content-encoding=gzip&response-content- type=text%2Fplain",
+                "Type": "undeploy",
+                "CommandId": "008c1a91-ec59-4d51-971d-3adff54b00cc",
+                "CreatedAt": "2013-07-25T18:57:34+00:00",
+                "ExitCode": 0
+            },
+            {
+                "Status": "successful",
+                "CompletedAt": "2013-07-25T18:55:40+00:00",
+                "InstanceId": "8c2673b9-3fe5-420d-9cfa-78d875ee7687",
+                "DeploymentId": "19d3121e-d949-4ff2-9f9d-94eac087862a",
+                "AcknowledgedAt": "2013-07-25T18:55:32+00:00",
+                "LogUrl": "https://s3.amazonaws.com/<bucket-name>/logs/899d3d64-0384-47b6-a586-33433aad117c?AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE &Expires=1375394373&Signature=xMsJvtLuUqWmsr8s%2FAjVru0BtRs%3D&response-cache-control=private&response-content-encoding=gzip&response-conten t-type=text%2Fplain",
+                "Type": "deploy",
+                "CommandId": "899d3d64-0384-47b6-a586-33433aad117c",
+                "CreatedAt": "2013-07-25T18:55:29+00:00",
+                "ExitCode": 0
+            }
+        ]
+    }
 
 For more information, see `AWS OpsWorks Lifecycle Events`_ in the *AWS OpsWorks User Guide*.
 

diff --git a/awscli/examples/opsworkscm/create-backup.rst b/awscli/examples/opsworkscm/create-backup.rst
@@ -2,45 +2,45 @@
 
 The following ``create-backup`` command starts a manual backup of a Chef Automate server
 named ``automate-06`` in the ``us-east-1`` region. The command adds a descriptive message to
-the backup in the ``--description`` parameter.::
+the backup in the ``--description`` parameter. ::
 
-  aws opsworks-cm create-backup --server-name 'automate-06' --description "state of my infrastructure at launch"
+    aws opsworks-cm create-backup \
+        --server-name 'automate-06' \
+        --description "state of my infrastructure at launch"
 
 The output shows you information similar to the following about the new backup.
-*Output*::
 
-  {
-   "Backups": [ 
-      { 
-         "BackupArn": "string",
-         "BackupId": "automate-06-20160729133847520",
-         "BackupType": "MANUAL",
-         "CreatedAt": 2016-07-29T13:38:47.520Z,
-         "Description": "state of my infrastructure at launch",
-         "Engine": "Chef",
-         "EngineModel": "Single",
-         "EngineVersion": "12",
-         "InstanceProfileArn": "arn:aws:iam::1019881987024:instance-profile/automate-06-1010V4UU2WRM2",
-         "InstanceType": "m4.large",
-         "KeyPair": "",
-         "PreferredBackupWindow": "",
-         "PreferredMaintenanceWindow": "",
-         "S3LogUrl": "https://s3.amazonaws.com/automate-06/automate-06-20160729133847520",
-         "SecurityGroupIds": [ "sg-1a24c270" ],
-         "ServerName": "automate-06",
-         "ServiceRoleArn": "arn:aws:iam::1019881987024:role/aws-opsworks-cm-service-role.1114810729735",
-         "Status": "OK",
-         "StatusDescription": "",
-         "SubnetIds": [ "subnet-49436a18" ],
-         "ToolsVersion": "string",
-         "UserArn": "arn:aws:iam::1019881987024:user/opsworks-user"
-      }
-   ],
-  }
-
-**More Information**
+Output::
+
+    {
+        "Backups": [ 
+            { 
+                "BackupArn": "string",
+                "BackupId": "automate-06-20160729133847520",
+                "BackupType": "MANUAL",
+                "CreatedAt": 2016-07-29T13:38:47.520Z,
+                "Description": "state of my infrastructure at launch",
+                "Engine": "Chef",
+                "EngineModel": "Single",
+                "EngineVersion": "12",
+                "InstanceProfileArn": "arn:aws:iam::1019881987024:instance-profile/automate-06-1010V4UU2WRM2",
+                "InstanceType": "m4.large",
+                "KeyPair": "",
+                "PreferredBackupWindow": "",
+                "PreferredMaintenanceWindow": "",
+                "S3LogUrl": "https://s3.amazonaws.com/<bucket-name>/automate-06-20160729133847520",
+                "SecurityGroupIds": [ "sg-1a24c270" ],
+                "ServerName": "automate-06",
+                "ServiceRoleArn": "arn:aws:iam::1019881987024:role/aws-opsworks-cm-service-role.1114810729735",
+                "Status": "OK",
+                "StatusDescription": "",
+                "SubnetIds": [ "subnet-49436a18" ],
+                "ToolsVersion": "string",
+                "UserArn": "arn:aws:iam::1019881987024:user/opsworks-user"
+            }
+        ],
+    }
 
 For more information, see `Back Up and Restore an AWS OpsWorks for Chef Automate Server`_ in the *AWS OpsWorks User Guide*.
 
-.. _`Back Up and Restore an AWS OpsWorks for Chef Automate Server`: http://docs.aws.amazon.com/opsworks/latest/userguide/opscm-backup-restore.html
-
+.. _`Back Up and Restore an AWS OpsWorks for Chef Automate Server`: http://docs.aws.amazon.com/opsworks/latest/userguide/opscm-backup-restore.html