From 4aa5f864b62b6193ed0729a4ac71c010877fe377 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Wed, 23 Nov 2022 19:21:44 +0000 Subject: [PATCH 1/2] Update to latest models --- .../api-change-grafana-93809.json | 5 + .../next-release/api-change-rbin-23839.json | 5 + .../data/grafana/2020-08-18/service-2.json | 203 +++++++- .../rbin/2021-06-15/endpoint-rule-set-1.json | 2 +- botocore/data/rbin/2021-06-15/service-2.json | 251 ++++++++- .../grafana/endpoint-tests-1.json | 166 +++--- .../endpoint-rules/rbin/endpoint-tests-1.json | 486 +++++++++--------- 7 files changed, 761 insertions(+), 357 deletions(-) create mode 100644 .changes/next-release/api-change-grafana-93809.json create mode 100644 .changes/next-release/api-change-rbin-23839.json diff --git a/.changes/next-release/api-change-grafana-93809.json b/.changes/next-release/api-change-grafana-93809.json new file mode 100644 index 0000000000..71c51bd9e4 --- /dev/null +++ b/.changes/next-release/api-change-grafana-93809.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``grafana``", + "description": "This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings." +} diff --git a/.changes/next-release/api-change-rbin-23839.json b/.changes/next-release/api-change-rbin-23839.json new file mode 100644 index 0000000000..d8649661aa --- /dev/null +++ b/.changes/next-release/api-change-rbin-23839.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``rbin``", + "description": "This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted." +} diff --git a/botocore/data/grafana/2020-08-18/service-2.json b/botocore/data/grafana/2020-08-18/service-2.json index e609f5b492..e244b3b587 100644 --- a/botocore/data/grafana/2020-08-18/service-2.json +++ b/botocore/data/grafana/2020-08-18/service-2.json @@ -68,7 +68,7 @@ {"shape":"InternalServerException"}, {"shape":"ServiceQuotaExceededException"} ], - "documentation":"

Creates an API key for the workspace. This key can be used to authenticate requests sent to the workspace's HTTP API. See https://docs.aws.amazon.com/grafana/latest/userguide/Using-Grafana-APIs.html for available APIs and example requests.

" + "documentation":"

Creates a Grafana API key for the workspace. This key can be used to authenticate requests sent to the workspace's HTTP API. See https://docs.aws.amazon.com/grafana/latest/userguide/Using-Grafana-APIs.html for available APIs and example requests.

" }, "DeleteWorkspace":{ "name":"DeleteWorkspace", @@ -107,7 +107,7 @@ {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"} ], - "documentation":"

Deletes an API key for a workspace.

" + "documentation":"

Deletes a Grafana API key for the workspace.

" }, "DescribeWorkspace":{ "name":"DescribeWorkspace", @@ -145,6 +145,23 @@ ], "documentation":"

Displays information about the authentication methods used in one Amazon Managed Grafana workspace.

" }, + "DescribeWorkspaceConfiguration":{ + "name":"DescribeWorkspaceConfiguration", + "http":{ + "method":"GET", + "requestUri":"/workspaces/{workspaceId}/configuration", + "responseCode":200 + }, + "input":{"shape":"DescribeWorkspaceConfigurationRequest"}, + "output":{"shape":"DescribeWorkspaceConfigurationResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"AccessDeniedException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Gets the current configuration string for the given workspace.

" + }, "DisassociateLicense":{ "name":"DisassociateLicense", "http":{ @@ -287,7 +304,7 @@ {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"} ], - "documentation":"

Modifies an existing Amazon Managed Grafana workspace. If you use this operation and omit any optional parameters, the existing values of those parameters are not changed.

To modify the user authentication methods that the workspace uses, such as SAML or Amazon Web Services SSO, use UpdateWorkspaceAuthentication.

To modify which users in the workspace have the Admin and Editor Grafana roles, use UpdatePermissions.

" + "documentation":"

Modifies an existing Amazon Managed Grafana workspace. If you use this operation and omit any optional parameters, the existing values of those parameters are not changed.

To modify the user authentication methods that the workspace uses, such as SAML or IAM Identity Center, use UpdateWorkspaceAuthentication.

To modify which users in the workspace have the Admin and Editor Grafana roles, use UpdatePermissions.

" }, "UpdateWorkspaceAuthentication":{ "name":"UpdateWorkspaceAuthentication", @@ -307,6 +324,25 @@ {"shape":"InternalServerException"} ], "documentation":"

Use this operation to define the identity provider (IdP) that this workspace authenticates users from, using SAML. You can also map SAML assertion attributes to workspace user information and define which groups in the assertion attribute are to have the Admin and Editor roles in the workspace.

" + }, + "UpdateWorkspaceConfiguration":{ + "name":"UpdateWorkspaceConfiguration", + "http":{ + "method":"PUT", + "requestUri":"/workspaces/{workspaceId}/configuration", + "responseCode":202 + }, + "input":{"shape":"UpdateWorkspaceConfigurationRequest"}, + "output":{"shape":"UpdateWorkspaceConfigurationResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"ConflictException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Updates the configuration string for the given workspace

" } }, "shapes":{ @@ -420,11 +456,11 @@ "members":{ "awsSso":{ "shape":"AwsSsoAuthentication", - "documentation":"

A structure containing information about how this workspace works with Amazon Web Services SSO.

" + "documentation":"

A structure containing information about how this workspace works with IAM Identity Center.

" }, "providers":{ "shape":"AuthenticationProviders", - "documentation":"

Specifies whether this workspace uses Amazon Web Services SSO, SAML, or both methods to authenticate users to use the Grafana console in the Amazon Managed Grafana workspace.

" + "documentation":"

Specifies whether this workspace uses IAM Identity Center, SAML, or both methods to authenticate users to use the Grafana console in the Amazon Managed Grafana workspace.

" }, "saml":{ "shape":"SamlAuthentication", @@ -450,24 +486,24 @@ "members":{ "providers":{ "shape":"AuthenticationProviders", - "documentation":"

Specifies whether the workspace uses SAML, Amazon Web Services SSO, or both methods for user authentication.

" + "documentation":"

Specifies whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication.

" }, "samlConfigurationStatus":{ "shape":"SamlConfigurationStatus", "documentation":"

Specifies whether the workplace's user authentication method is fully configured.

" } }, - "documentation":"

A structure that describes whether the workspace uses SAML, Amazon Web Services SSO, or both methods for user authentication, and whether that authentication is fully configured.

" + "documentation":"

A structure that describes whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication, and whether that authentication is fully configured.

" }, "AwsSsoAuthentication":{ "type":"structure", "members":{ "ssoClientId":{ "shape":"SSOClientId", - "documentation":"

The ID of the Amazon Web Services SSO-managed application that is created by Amazon Managed Grafana.

" + "documentation":"

The ID of the IAM Identity Center-managed application that is created by Amazon Managed Grafana.

" } }, - "documentation":"

A structure containing information about how this workspace works with Amazon Web Services SSO.

" + "documentation":"

A structure containing information about how this workspace works with IAM Identity Center.

" }, "Boolean":{ "type":"boolean", @@ -516,11 +552,11 @@ "members":{ "keyName":{ "shape":"ApiKeyName", - "documentation":"

Specifies the name of the key to create. Key names must be unique to the workspace.

" + "documentation":"

Specifies the name of the key. Keynames must be unique to the workspace.

" }, "keyRole":{ "shape":"String", - "documentation":"

Specifies the permission level of the key.

Valid Values: VIEWER | EDITOR | ADMIN

" + "documentation":"

Specifies the permission level of the key.

Valid values: VIEWER|EDITOR|ADMIN

" }, "secondsToLive":{ "shape":"CreateWorkspaceApiKeyRequestSecondsToLiveInteger", @@ -528,7 +564,7 @@ }, "workspaceId":{ "shape":"WorkspaceId", - "documentation":"

The ID of the workspace in which to create an API key.

", + "documentation":"

The ID of the workspace to create an API key.

", "location":"uri", "locationName":"workspaceId" } @@ -550,7 +586,7 @@ "members":{ "key":{ "shape":"ApiKeyToken", - "documentation":"

The key token that was created. Use this value as a bearer token to authenticate HTTP requests to the workspace.

" + "documentation":"

The key token. Use this value as a bearer token to authenticate HTTP requests to the workspace.

" }, "keyName":{ "shape":"ApiKeyName", @@ -576,20 +612,25 @@ }, "authenticationProviders":{ "shape":"AuthenticationProviders", - "documentation":"

Specifies whether this workspace uses SAML 2.0, Amazon Web Services Single Sign On, or both to authenticate users for using the Grafana console within a workspace. For more information, see User authentication in Amazon Managed Grafana.

" + "documentation":"

Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to authenticate users for using the Grafana console within a workspace. For more information, see User authentication in Amazon Managed Grafana.

" }, "clientToken":{ "shape":"ClientToken", "documentation":"

A unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", "idempotencyToken":true }, + "configuration":{ + "shape":"OverridableConfigurationJson", + "documentation":"

The configuration string for the workspace that you create. For more information about the format and configuration options available, see Working in your Grafana workspace.

", + "jsonvalue":true + }, "organizationRoleName":{ "shape":"OrganizationRoleName", "documentation":"

The name of an IAM role that already exists to use with Organizations to access Amazon Web Services data sources and notification channels in other accounts in an organization.

" }, "permissionType":{ "shape":"PermissionType", - "documentation":"

If you specify SERVICE_MANAGED on AWS Grafana console, Amazon Managed Grafana automatically creates the IAM roles and provisions the permissions that the workspace needs to use Amazon Web Services data sources and notification channels. In CLI mode, the permissionType SERVICE_MANAGED will not create the IAM role for you.

If you specify CUSTOMER_MANAGED, you will manage those roles and permissions yourself. If you are creating this workspace in a member account of an organization that is not a delegated administrator account, and you want the workspace to access data sources in other Amazon Web Services accounts in the organization, you must choose CUSTOMER_MANAGED.

For more information, see Amazon Managed Grafana permissions and policies for Amazon Web Services data sources and notification channels.

" + "documentation":"

If you specify SERVICE_MANAGED on AWS Grafana console, Amazon Managed Grafana automatically creates the IAM roles and provisions the permissions that the workspace needs to use Amazon Web Services data sources and notification channels. In the CLI mode, the permissionType SERVICE_MANAGED will not create the IAM role for you. The ability for the Amazon Managed Grafana to create the IAM role on behalf of the user is supported only in the Amazon Managed Grafana AWS console. Use only the CUSTOMER_MANAGED permission type when creating a workspace in the CLI.

If you specify CUSTOMER_MANAGED, you will manage those roles and permissions yourself. If you are creating this workspace in a member account of an organization that is not a delegated administrator account, and you want the workspace to access data sources in other Amazon Web Services accounts in the organization, you must choose CUSTOMER_MANAGED.

For more information, see Amazon Managed Grafana permissions and policies for Amazon Web Services data sources and notification channels.

" }, "stackSetName":{ "shape":"StackSetName", @@ -599,6 +640,10 @@ "shape":"TagMap", "documentation":"

The list of tags associated with the workspace.

" }, + "vpcConfiguration":{ + "shape":"VpcConfiguration", + "documentation":"

The configuration settings for an Amazon VPC that contains data sources for your Grafana workspace to connect to.

" + }, "workspaceDataSources":{ "shape":"DataSourceTypesList", "documentation":"

Specify the Amazon Web Services data sources that you want to be queried in this workspace. Specifying these data sources here enables Amazon Managed Grafana to create IAM roles and permissions that allow Amazon Managed Grafana to read data from these sources. You must still add them as data sources in the Grafana console in the workspace.

If you don't specify a data source here, you can still add it as a data source in the workspace console later. However, you will then have to manually configure permissions for it.

" @@ -645,7 +690,8 @@ "TIMESTREAM", "SITEWISE", "ATHENA", - "REDSHIFT" + "REDSHIFT", + "TWINMAKER" ] }, "DataSourceTypesList":{ @@ -682,7 +728,7 @@ "members":{ "keyName":{ "shape":"ApiKeyName", - "documentation":"

The name of the API key that was deleted.

" + "documentation":"

The name of the key that was deleted.

" }, "workspaceId":{ "shape":"WorkspaceId", @@ -734,6 +780,29 @@ } } }, + "DescribeWorkspaceConfigurationRequest":{ + "type":"structure", + "required":["workspaceId"], + "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace to get configuration information for.

", + "location":"uri", + "locationName":"workspaceId" + } + } + }, + "DescribeWorkspaceConfigurationResponse":{ + "type":"structure", + "required":["configuration"], + "members":{ + "configuration":{ + "shape":"OverridableConfigurationJson", + "documentation":"

The configuration string for the workspace that you requested. For more information about the format and configuration options available, see Working in your Grafana workspace.

", + "jsonvalue":true + } + } + }, "DescribeWorkspaceRequest":{ "type":"structure", "required":["workspaceId"], @@ -814,14 +883,14 @@ "members":{ "url":{ "shape":"IdpMetadataUrl", - "documentation":"

The URL of the location containing the metadata.

" + "documentation":"

The URL of the location containing the IdP metadata.

" }, "xml":{ "shape":"String", - "documentation":"

The actual full metadata file, in XML format.

" + "documentation":"

The full IdP metadata, in XML format.

" } }, - "documentation":"

A structure containing the identity provider (IdP) metadata used to integrate the identity provider with this workspace. You can specify the metadata either by providing a URL to its location in the url parameter, or by specifying the full metadata in XML format in the xml parameter.

", + "documentation":"

A structure containing the identity provider (IdP) metadata used to integrate the identity provider with this workspace. You can specify the metadata either by providing a URL to its location in the url parameter, or by specifying the full metadata in XML format in the xml parameter. Specifying both will cause an error.

", "union":true }, "IdpMetadataUrl":{ @@ -891,7 +960,7 @@ }, "userType":{ "shape":"UserType", - "documentation":"

(Optional) If you specify SSO_USER, then only the permissions of Amazon Web Services SSO users are returned. If you specify SSO_GROUP, only the permissions of Amazon Web Services SSO groups are returned.

", + "documentation":"

(Optional) If you specify SSO_USER, then only the permissions of IAM Identity Center users are returned. If you specify SSO_GROUP, only the permissions of IAM Identity Center groups are returned.

", "location":"querystring", "locationName":"userType" }, @@ -1002,6 +1071,11 @@ "member":{"shape":"OrganizationalUnit"}, "sensitive":true }, + "OverridableConfigurationJson":{ + "type":"string", + "max":65536, + "min":2 + }, "PaginationToken":{"type":"string"}, "PermissionEntry":{ "type":"structure", @@ -1012,14 +1086,14 @@ "members":{ "role":{ "shape":"Role", - "documentation":"

Specifies whether the user or group has the Admin or Editor role.

" + "documentation":"

Specifies whether the user or group has the Admin, Editor, or Viewer role.

" }, "user":{ "shape":"User", "documentation":"

A structure with the ID of the user or group with this role.

" } }, - "documentation":"

A structure containing the identity of one user or group and the Admin or Editor role that they have.

" + "documentation":"

A structure containing the identity of one user or group and the Admin, Editor, or Viewer role that they have.

" }, "PermissionEntryList":{ "type":"list", @@ -1089,7 +1163,7 @@ "documentation":"

A list of groups from the SAML assertion attribute to grant the Grafana Editor role to.

" } }, - "documentation":"

This structure defines which groups defined in the SAML assertion attribute are to be mapped to the Grafana Admin and Editor roles in the workspace.

" + "documentation":"

This structure defines which groups defined in the SAML assertion attribute are to be mapped to the Grafana Admin and Editor roles in the workspace. SAML authenticated users not part of Admin or Editor role groups have Viewer permission over the workspace.

" }, "SSOClientId":{"type":"string"}, "SamlAuthentication":{ @@ -1141,6 +1215,17 @@ "NOT_CONFIGURED" ] }, + "SecurityGroupId":{ + "type":"string", + "max":255, + "min":0 + }, + "SecurityGroupIds":{ + "type":"list", + "member":{"shape":"SecurityGroupId"}, + "max":100, + "min":1 + }, "ServiceQuotaExceededException":{ "type":"structure", "required":[ @@ -1186,6 +1271,17 @@ }, "StackSetName":{"type":"string"}, "String":{"type":"string"}, + "SubnetId":{ + "type":"string", + "max":255, + "min":0 + }, + "SubnetIds":{ + "type":"list", + "member":{"shape":"SubnetId"}, + "max":100, + "min":1 + }, "TagKey":{ "type":"string", "max":128, @@ -1396,7 +1492,7 @@ "members":{ "authenticationProviders":{ "shape":"AuthenticationProviders", - "documentation":"

Specifies whether this workspace uses SAML 2.0, Amazon Web Services Single Sign On, or both to authenticate users for using the Grafana console within a workspace. For more information, see User authentication in Amazon Managed Grafana.

" + "documentation":"

Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to authenticate users for using the Grafana console within a workspace. For more information, see User authentication in Amazon Managed Grafana.

" }, "samlConfiguration":{ "shape":"SamlConfiguration", @@ -1420,6 +1516,31 @@ } } }, + "UpdateWorkspaceConfigurationRequest":{ + "type":"structure", + "required":[ + "configuration", + "workspaceId" + ], + "members":{ + "configuration":{ + "shape":"OverridableConfigurationJson", + "documentation":"

The new configuration string for the workspace. For more information about the format and configuration options available, see Working in your Grafana workspace.

", + "jsonvalue":true + }, + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace to update.

", + "location":"uri", + "locationName":"workspaceId" + } + } + }, + "UpdateWorkspaceConfigurationResponse":{ + "type":"structure", + "members":{ + } + }, "UpdateWorkspaceRequest":{ "type":"structure", "required":["workspaceId"], @@ -1436,10 +1557,18 @@ "shape":"PermissionType", "documentation":"

If you specify Service Managed, Amazon Managed Grafana automatically creates the IAM roles and provisions the permissions that the workspace needs to use Amazon Web Services data sources and notification channels.

If you specify CUSTOMER_MANAGED, you will manage those roles and permissions yourself. If you are creating this workspace in a member account of an organization and that account is not a delegated administrator account, and you want the workspace to access data sources in other Amazon Web Services accounts in the organization, you must choose CUSTOMER_MANAGED.

For more information, see Amazon Managed Grafana permissions and policies for Amazon Web Services data sources and notification channels

" }, + "removeVpcConfiguration":{ + "shape":"Boolean", + "documentation":"

Whether to remove the VPC configuration from the workspace.

Setting this to true and providing a vpcConfiguration to set will return an error.

" + }, "stackSetName":{ "shape":"StackSetName", "documentation":"

The name of the CloudFormation stack set to use to generate IAM roles to be used for this workspace.

" }, + "vpcConfiguration":{ + "shape":"VpcConfiguration", + "documentation":"

The configuration settings for an Amazon VPC that contains data sources for your Grafana workspace to connect to.

" + }, "workspaceDataSources":{ "shape":"DataSourceTypesList", "documentation":"

Specify the Amazon Web Services data sources that you want to be queried in this workspace. Specifying these data sources here enables Amazon Managed Grafana to create IAM roles and permissions that allow Amazon Managed Grafana to read data from these sources. You must still add them as data sources in the Grafana console in the workspace.

If you don't specify a data source here, you can still add it as a data source later in the workspace console. However, you will then have to manually configure permissions for it.

" @@ -1569,6 +1698,24 @@ "OTHER" ] }, + "VpcConfiguration":{ + "type":"structure", + "required":[ + "securityGroupIds", + "subnetIds" + ], + "members":{ + "securityGroupIds":{ + "shape":"SecurityGroupIds", + "documentation":"

The list of Amazon EC2 security group IDs attached to the Amazon VPC for your Grafana workspace to connect.

" + }, + "subnetIds":{ + "shape":"SubnetIds", + "documentation":"

The list of Amazon EC2 subnet IDs created in the Amazon VPC for your Grafana workspace to connect.

" + } + }, + "documentation":"

The configuration settings for an Amazon VPC that contains data sources for your Grafana workspace to connect to.

" + }, "WorkspaceDescription":{ "type":"structure", "required":[ @@ -1588,7 +1735,7 @@ }, "authentication":{ "shape":"AuthenticationSummary", - "documentation":"

A structure that describes whether the workspace uses SAML, Amazon Web Services SSO, or both methods for user authentication.

" + "documentation":"

A structure that describes whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication.

" }, "created":{ "shape":"Timestamp", @@ -1666,6 +1813,10 @@ "shape":"TagMap", "documentation":"

The list of tags associated with the workspace.

" }, + "vpcConfiguration":{ + "shape":"VpcConfiguration", + "documentation":"

The configuration for connecting to data sources in a private VPC (Amazon Virtual Private Cloud).

" + }, "workspaceRoleArn":{ "shape":"IamRoleArn", "documentation":"

The IAM role that grants permissions to the Amazon Web Services resources that the workspace will view data from. This role must already exist.

" diff --git a/botocore/data/rbin/2021-06-15/endpoint-rule-set-1.json b/botocore/data/rbin/2021-06-15/endpoint-rule-set-1.json index 1f7b8bd01e..840204cdf8 100644 --- a/botocore/data/rbin/2021-06-15/endpoint-rule-set-1.json +++ b/botocore/data/rbin/2021-06-15/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": false, + "required": true, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, diff --git a/botocore/data/rbin/2021-06-15/service-2.json b/botocore/data/rbin/2021-06-15/service-2.json index e0fb257bd0..c775609df9 100644 --- a/botocore/data/rbin/2021-06-15/service-2.json +++ b/botocore/data/rbin/2021-06-15/service-2.json @@ -40,7 +40,8 @@ "errors":[ {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, - {"shape":"ValidationException"} + {"shape":"ValidationException"}, + {"shape":"ConflictException"} ], "documentation":"

Deletes a Recycle Bin retention rule. For more information, see Delete Recycle Bin retention rules in the Amazon Elastic Compute Cloud User Guide.

" }, @@ -91,6 +92,23 @@ ], "documentation":"

Lists the tags assigned to a retention rule.

" }, + "LockRule":{ + "name":"LockRule", + "http":{ + "method":"PATCH", + "requestUri":"/rules/{identifier}/lock", + "responseCode":200 + }, + "input":{"shape":"LockRuleRequest"}, + "output":{"shape":"LockRuleResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"} + ], + "documentation":"

Locks a retention rule. A locked retention rule can't be modified or deleted.

" + }, "TagResource":{ "name":"TagResource", "http":{ @@ -108,6 +126,23 @@ ], "documentation":"

Assigns tags to the specified retention rule.

" }, + "UnlockRule":{ + "name":"UnlockRule", + "http":{ + "method":"PATCH", + "requestUri":"/rules/{identifier}/unlock", + "responseCode":200 + }, + "input":{"shape":"UnlockRuleRequest"}, + "output":{"shape":"UnlockRuleResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"} + ], + "documentation":"

Unlocks a retention rule. After a retention rule is unlocked, it can be modified or deleted only after the unlock delay period expires.

" + }, "UntagResource":{ "name":"UntagResource", "http":{ @@ -136,12 +171,30 @@ "errors":[ {"shape":"ValidationException"}, {"shape":"InternalServerException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConflictException"} ], - "documentation":"

Updates an existing Recycle Bin retention rule. For more information, see Update Recycle Bin retention rules in the Amazon Elastic Compute Cloud User Guide.

" + "documentation":"

Updates an existing Recycle Bin retention rule. You can update a retention rule's description, resource tags, and retention period at any time after creation. You can't update a retention rule's resource type after creation. For more information, see Update Recycle Bin retention rules in the Amazon Elastic Compute Cloud User Guide.

" } }, "shapes":{ + "ConflictException":{ + "type":"structure", + "members":{ + "Message":{"shape":"ErrorMessage"}, + "Reason":{ + "shape":"ConflictExceptionReason", + "documentation":"

The reason for the exception.

" + } + }, + "documentation":"

The specified retention rule lock request can't be completed.

", + "error":{"httpStatusCode":409}, + "exception":true + }, + "ConflictExceptionReason":{ + "type":"string", + "enum":["INVALID_RULE_STATE"] + }, "CreateRuleRequest":{ "type":"structure", "required":[ @@ -168,6 +221,10 @@ "ResourceTags":{ "shape":"ResourceTags", "documentation":"

Specifies the resource tags to use to identify resources that are to be retained by a tag-level retention rule. For tag-level retention rules, only deleted resources, of the specified resource type, that have one or more of the specified tag key and value pairs are retained. If a resource is deleted, but it does not have any of the specified tag key and value pairs, it is immediately deleted without being retained by the retention rule.

You can add the same tag key and value pair to a maximum or five retention rules.

To create a Region-level retention rule, omit this parameter. A Region-level retention rule does not have any resource tags specified. It retains all deleted resources of the specified resource type in the Region in which the rule is created, even if the resources are not tagged.

" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" } } }, @@ -198,6 +255,14 @@ "Status":{ "shape":"RuleStatus", "documentation":"

The state of the retention rule. Only retention rules that are in the available state retain resources.

" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" } } }, @@ -261,6 +326,18 @@ "Status":{ "shape":"RuleStatus", "documentation":"

The state of the retention rule. Only retention rules that are in the available state retain resources.

" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" + }, + "LockEndTime":{ + "shape":"TimeStamp", + "documentation":"

The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.

" } } }, @@ -293,6 +370,10 @@ "ResourceTags":{ "shape":"ResourceTags", "documentation":"

Information about the resource tags used to identify resources that are retained by the retention rule.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state of the retention rules to list. Only retention rules with the specified lock state are returned.

" } } }, @@ -330,6 +411,78 @@ } } }, + "LockConfiguration":{ + "type":"structure", + "required":["UnlockDelay"], + "members":{ + "UnlockDelay":{ + "shape":"UnlockDelay", + "documentation":"

Information about the retention rule unlock delay.

" + } + }, + "documentation":"

Information about a retention rule lock configuration.

" + }, + "LockRuleRequest":{ + "type":"structure", + "required":[ + "Identifier", + "LockConfiguration" + ], + "members":{ + "Identifier":{ + "shape":"RuleIdentifier", + "documentation":"

The unique ID of the retention rule.

", + "location":"uri", + "locationName":"identifier" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" + } + } + }, + "LockRuleResponse":{ + "type":"structure", + "members":{ + "Identifier":{ + "shape":"RuleIdentifier", + "documentation":"

The unique ID of the retention rule.

" + }, + "Description":{ + "shape":"Description", + "documentation":"

The retention rule description.

" + }, + "ResourceType":{ + "shape":"ResourceType", + "documentation":"

The resource type retained by the retention rule.

" + }, + "RetentionPeriod":{"shape":"RetentionPeriod"}, + "ResourceTags":{ + "shape":"ResourceTags", + "documentation":"

Information about the resource tags used to identify resources that are retained by the retention rule.

" + }, + "Status":{ + "shape":"RuleStatus", + "documentation":"

The state of the retention rule. Only retention rules that are in the available state retain resources.

" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" + } + } + }, + "LockState":{ + "type":"string", + "enum":[ + "locked", + "pending_unlock", + "unlocked" + ] + }, "MaxResults":{ "type":"integer", "max":1000, @@ -450,6 +603,10 @@ "RetentionPeriod":{ "shape":"RetentionPeriod", "documentation":"

Information about the retention period for which the retention rule is to retain resources.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" } }, "documentation":"

Information about a Recycle Bin retention rule.

" @@ -541,6 +698,84 @@ "min":0, "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$" }, + "TimeStamp":{"type":"timestamp"}, + "UnlockDelay":{ + "type":"structure", + "required":[ + "UnlockDelayValue", + "UnlockDelayUnit" + ], + "members":{ + "UnlockDelayValue":{ + "shape":"UnlockDelayValue", + "documentation":"

The unlock delay period, measured in the unit specified for UnlockDelayUnit.

" + }, + "UnlockDelayUnit":{ + "shape":"UnlockDelayUnit", + "documentation":"

The unit of time in which to measure the unlock delay. Currently, the unlock delay can be measure only in days.

" + } + }, + "documentation":"

Information about the retention rule unlock delay. The unlock delay is the period after which a retention rule can be modified or edited after it has been unlocked by a user with the required permissions. The retention rule can't be modified or deleted during the unlock delay.

" + }, + "UnlockDelayUnit":{ + "type":"string", + "enum":["DAYS"] + }, + "UnlockDelayValue":{ + "type":"integer", + "max":30, + "min":7 + }, + "UnlockRuleRequest":{ + "type":"structure", + "required":["Identifier"], + "members":{ + "Identifier":{ + "shape":"RuleIdentifier", + "documentation":"

The unique ID of the retention rule.

", + "location":"uri", + "locationName":"identifier" + } + } + }, + "UnlockRuleResponse":{ + "type":"structure", + "members":{ + "Identifier":{ + "shape":"RuleIdentifier", + "documentation":"

The unique ID of the retention rule.

" + }, + "Description":{ + "shape":"Description", + "documentation":"

The retention rule description.

" + }, + "ResourceType":{ + "shape":"ResourceType", + "documentation":"

The resource type retained by the retention rule.

" + }, + "RetentionPeriod":{"shape":"RetentionPeriod"}, + "ResourceTags":{ + "shape":"ResourceTags", + "documentation":"

Information about the resource tags used to identify resources that are retained by the retention rule.

" + }, + "Status":{ + "shape":"RuleStatus", + "documentation":"

The state of the retention rule. Only retention rules that are in the available state retain resources.

" + }, + "LockConfiguration":{ + "shape":"LockConfiguration", + "documentation":"

Information about the retention rule lock configuration.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" + }, + "LockEndTime":{ + "shape":"TimeStamp", + "documentation":"

The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.

" + } + } + }, "UntagResourceRequest":{ "type":"structure", "required":[ @@ -587,7 +822,7 @@ }, "ResourceType":{ "shape":"ResourceType", - "documentation":"

The resource type to be retained by the retention rule. Currently, only Amazon EBS snapshots and EBS-backed AMIs are supported. To retain snapshots, specify EBS_SNAPSHOT. To retain EBS-backed AMIs, specify EC2_IMAGE.

" + "documentation":"

This parameter is currently not supported. You can't update a retention rule's resource type after creation.

" }, "ResourceTags":{ "shape":"ResourceTags", @@ -618,6 +853,14 @@ "Status":{ "shape":"RuleStatus", "documentation":"

The state of the retention rule. Only retention rules that are in the available state retain resources.

" + }, + "LockState":{ + "shape":"LockState", + "documentation":"

The lock state for the retention rule.

" + }, + "LockEndTime":{ + "shape":"TimeStamp", + "documentation":"

The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.

" } } }, diff --git a/tests/functional/endpoint-rules/grafana/endpoint-tests-1.json b/tests/functional/endpoint-rules/grafana/endpoint-tests-1.json index 5d103399e7..0c4a3e89d7 100644 --- a/tests/functional/endpoint-rules/grafana/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/grafana/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "Region": "eu-central-1", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-central-1" } }, { @@ -21,9 +21,9 @@ } }, "params": { - "Region": "eu-central-1", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-central-1" } }, { @@ -34,9 +34,9 @@ } }, "params": { - "Region": "eu-central-1", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-central-1" } }, { @@ -47,9 +47,9 @@ } }, "params": { - "Region": "eu-central-1", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-central-1" } }, { @@ -60,9 +60,9 @@ } }, "params": { - "Region": "us-west-2", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-west-2" } }, { @@ -73,9 +73,9 @@ } }, "params": { - "Region": "us-west-2", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-west-2" } }, { @@ -86,9 +86,9 @@ } }, "params": { - "Region": "us-west-2", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-west-2" } }, { @@ -99,9 +99,9 @@ } }, "params": { - "Region": "us-west-2", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-west-2" } }, { @@ -112,9 +112,9 @@ } }, "params": { - "Region": "eu-west-2", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-west-2" } }, { @@ -125,9 +125,9 @@ } }, "params": { - "Region": "eu-west-2", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-west-2" } }, { @@ -138,9 +138,9 @@ } }, "params": { - "Region": "eu-west-2", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-west-2" } }, { @@ -151,9 +151,9 @@ } }, "params": { - "Region": "eu-west-2", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-west-2" } }, { @@ -164,9 +164,9 @@ } }, "params": { - "Region": "eu-west-1", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-west-1" } }, { @@ -177,9 +177,9 @@ } }, "params": { - "Region": "eu-west-1", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "eu-west-1" } }, { @@ -190,9 +190,9 @@ } }, "params": { - "Region": "eu-west-1", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-west-1" } }, { @@ -203,9 +203,9 @@ } }, "params": { - "Region": "eu-west-1", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "eu-west-1" } }, { @@ -216,9 +216,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-northeast-2" } }, { @@ -229,9 +229,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-northeast-2" } }, { @@ -242,9 +242,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-northeast-2" } }, { @@ -255,9 +255,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-northeast-2" } }, { @@ -268,9 +268,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-northeast-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-northeast-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-northeast-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-northeast-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-southeast-1" } }, { @@ -333,9 +333,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-southeast-1" } }, { @@ -346,9 +346,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-southeast-1" } }, { @@ -359,9 +359,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-southeast-1" } }, { @@ -372,9 +372,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-southeast-2" } }, { @@ -385,9 +385,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "ap-southeast-2" } }, { @@ -398,9 +398,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-southeast-2" } }, { @@ -411,9 +411,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "ap-southeast-2" } }, { @@ -424,9 +424,9 @@ } }, "params": { - "Region": "us-east-1", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-east-1" } }, { @@ -437,9 +437,9 @@ } }, "params": { - "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-east-1" } }, { @@ -450,9 +450,9 @@ } }, "params": { - "Region": "us-east-1", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-east-1" } }, { @@ -463,9 +463,9 @@ } }, "params": { - "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-east-1" } }, { @@ -476,9 +476,9 @@ } }, "params": { - "Region": "us-east-2", "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-east-2" } }, { @@ -489,9 +489,9 @@ } }, "params": { - "Region": "us-east-2", "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "Region": "us-east-2" } }, { @@ -502,9 +502,9 @@ } }, "params": { - "Region": "us-east-2", "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-east-2" } }, { @@ -515,9 +515,9 @@ } }, "params": { - "Region": "us-east-2", "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Region": "us-east-2" } }, { @@ -528,9 +528,9 @@ } }, "params": { - "Region": "us-east-1", "UseDualStack": false, "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -540,9 +540,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseDualStack": false, "UseFIPS": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -552,9 +552,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseDualStack": true, "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/tests/functional/endpoint-rules/rbin/endpoint-tests-1.json b/tests/functional/endpoint-rules/rbin/endpoint-tests-1.json index 415564b785..28b1128260 100644 --- a/tests/functional/endpoint-rules/rbin/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/rbin/endpoint-tests-1.json @@ -9,8 +9,8 @@ }, "params": { "Region": "ap-south-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -22,8 +22,8 @@ }, "params": { "Region": "ap-south-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -35,8 +35,8 @@ }, "params": { "Region": "ap-south-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -48,8 +48,8 @@ }, "params": { "Region": "ap-south-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -61,8 +61,8 @@ }, "params": { "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -74,8 +74,8 @@ }, "params": { "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -87,8 +87,8 @@ }, "params": { "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -100,8 +100,8 @@ }, "params": { "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -113,8 +113,8 @@ }, "params": { "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -126,8 +126,8 @@ }, "params": { "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -139,8 +139,8 @@ }, "params": { "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -152,8 +152,8 @@ }, "params": { "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -165,8 +165,8 @@ }, "params": { "Region": "eu-south-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -178,8 +178,8 @@ }, "params": { "Region": "eu-south-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -191,8 +191,8 @@ }, "params": { "Region": "eu-south-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -204,8 +204,8 @@ }, "params": { "Region": "eu-south-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -217,8 +217,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -230,8 +230,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -243,8 +243,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -256,8 +256,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -269,8 +269,8 @@ }, "params": { "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -282,8 +282,8 @@ }, "params": { "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -295,8 +295,8 @@ }, "params": { "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -308,8 +308,8 @@ }, "params": { "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -321,8 +321,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -334,8 +334,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -347,8 +347,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -360,8 +360,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -373,8 +373,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -386,8 +386,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -399,8 +399,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -412,8 +412,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -425,8 +425,8 @@ }, "params": { "Region": "eu-central-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -438,8 +438,8 @@ }, "params": { "Region": "eu-central-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -451,8 +451,8 @@ }, "params": { "Region": "eu-central-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -464,8 +464,8 @@ }, "params": { "Region": "eu-central-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -477,8 +477,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -490,8 +490,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -503,8 +503,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -516,8 +516,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -529,8 +529,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -542,8 +542,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -555,8 +555,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -568,8 +568,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -581,8 +581,8 @@ }, "params": { "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -594,8 +594,8 @@ }, "params": { "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -607,8 +607,8 @@ }, "params": { "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -620,8 +620,8 @@ }, "params": { "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -633,8 +633,8 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -646,8 +646,8 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -659,8 +659,8 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -672,8 +672,8 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -685,8 +685,8 @@ }, "params": { "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -698,8 +698,8 @@ }, "params": { "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -711,8 +711,8 @@ }, "params": { "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -724,8 +724,8 @@ }, "params": { "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -737,8 +737,8 @@ }, "params": { "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -750,8 +750,8 @@ }, "params": { "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -763,8 +763,8 @@ }, "params": { "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -776,8 +776,8 @@ }, "params": { "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -789,8 +789,8 @@ }, "params": { "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -802,8 +802,8 @@ }, "params": { "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -815,8 +815,8 @@ }, "params": { "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -828,8 +828,8 @@ }, "params": { "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -841,8 +841,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -854,8 +854,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -867,8 +867,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -880,8 +880,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -893,8 +893,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -906,8 +906,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -919,8 +919,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -932,8 +932,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -945,8 +945,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -958,8 +958,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -971,8 +971,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -984,8 +984,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -997,8 +997,8 @@ }, "params": { "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1010,8 +1010,8 @@ }, "params": { "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1023,8 +1023,8 @@ }, "params": { "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1036,8 +1036,8 @@ }, "params": { "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1049,8 +1049,8 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1062,8 +1062,8 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1075,8 +1075,8 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1088,8 +1088,8 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1101,8 +1101,8 @@ }, "params": { "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1114,8 +1114,8 @@ }, "params": { "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1127,8 +1127,8 @@ }, "params": { "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1140,8 +1140,8 @@ }, "params": { "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1153,8 +1153,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1166,8 +1166,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1179,8 +1179,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1192,8 +1192,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1205,8 +1205,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1218,8 +1218,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1231,8 +1231,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1244,8 +1244,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1257,8 +1257,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1270,8 +1270,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1283,8 +1283,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1296,8 +1296,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1309,8 +1309,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1322,8 +1322,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1335,8 +1335,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1348,8 +1348,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1361,8 +1361,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1374,8 +1374,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1387,8 +1387,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1400,8 +1400,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1413,8 +1413,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1426,8 +1426,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1439,8 +1439,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1452,8 +1452,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1465,8 +1465,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1478,8 +1478,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1491,8 +1491,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1504,8 +1504,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1517,8 +1517,8 @@ }, "params": { "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1530,8 +1530,8 @@ }, "params": { "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1543,8 +1543,8 @@ }, "params": { "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1556,8 +1556,8 @@ }, "params": { "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1569,8 +1569,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1581,8 +1581,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1593,8 +1593,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } } From 22c3cb362c0ef00c6de404140f06a14d0e195f39 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Wed, 23 Nov 2022 19:21:45 +0000 Subject: [PATCH 2/2] Bumping version to 1.29.16 --- .changes/1.29.16.json | 12 ++++++++++++ .changes/next-release/api-change-grafana-93809.json | 5 ----- .changes/next-release/api-change-rbin-23839.json | 5 ----- CHANGELOG.rst | 7 +++++++ botocore/__init__.py | 2 +- docs/source/conf.py | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 .changes/1.29.16.json delete mode 100644 .changes/next-release/api-change-grafana-93809.json delete mode 100644 .changes/next-release/api-change-rbin-23839.json diff --git a/.changes/1.29.16.json b/.changes/1.29.16.json new file mode 100644 index 0000000000..c23cf64eed --- /dev/null +++ b/.changes/1.29.16.json @@ -0,0 +1,12 @@ +[ + { + "category": "``grafana``", + "description": "This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings.", + "type": "api-change" + }, + { + "category": "``rbin``", + "description": "This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-grafana-93809.json b/.changes/next-release/api-change-grafana-93809.json deleted file mode 100644 index 71c51bd9e4..0000000000 --- a/.changes/next-release/api-change-grafana-93809.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``grafana``", - "description": "This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings." -} diff --git a/.changes/next-release/api-change-rbin-23839.json b/.changes/next-release/api-change-rbin-23839.json deleted file mode 100644 index d8649661aa..0000000000 --- a/.changes/next-release/api-change-rbin-23839.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``rbin``", - "description": "This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted." -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e5b414ee1c..22476b3ebc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +1.29.16 +======= + +* api-change:``grafana``: This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings. +* api-change:``rbin``: This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted. + + 1.29.15 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 65e678214a..9b7116342e 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.29.15' +__version__ = '1.29.16' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index 7e92edd056..39addedd41 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,7 +54,7 @@ # The short X.Y version. version = '1.29.' # The full version, including alpha/beta/rc tags. -release = '1.29.15' +release = '1.29.16' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.