Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/awslabs/aws-sdk-kotlin into…
Browse files Browse the repository at this point in the history
… route53-custom-error-unmarshalling
  • Loading branch information
0marperez committed Jun 30, 2023
2 parents f381c29 + 96c1635 commit c3be1e9
Show file tree
Hide file tree
Showing 32 changed files with 8,927 additions and 1,618 deletions.
8 changes: 0 additions & 8 deletions .changes/1397b538-9c3d-49f6-a0ae-d2781e442ed1.json

This file was deleted.

8 changes: 0 additions & 8 deletions .changes/1d5c8d89-ed94-4dc3-9845-468b9cf359c8.json

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [0.28.0-beta] - 06/29/2023

### Features
* [#701](https://github.com/awslabs/aws-sdk-kotlin/issues/701) **Breaking**: Simplify mechanisms for setting/updating retry strategies in client config. See [this discussion post](https://github.com/awslabs/aws-sdk-kotlin/discussions/964) for more details.
* [#701](https://github.com/awslabs/aws-sdk-kotlin/issues/701) Add adaptive retry mode

### Miscellaneous
* Sync AWS models and bump smithy-kotlin version

## [0.27.2-beta] - 06/22/2023

### Miscellaneous
Expand Down
4,172 changes: 4,172 additions & 0 deletions codegen/sdk/aws-models/appfabric.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions codegen/sdk/aws-models/appflow.json
Original file line number Diff line number Diff line change
Expand Up @@ -7589,6 +7589,13 @@
"traits": {
"smithy.api#documentation": "<p> The SAPOData OAuth properties required for OAuth type authentication. </p>"
}
},
"disableSSO": {
"target": "com.amazonaws.appflow#Boolean",
"traits": {
"smithy.api#default": false,
"smithy.api#documentation": "<p>If you set this parameter to <code>true</code>, Amazon AppFlow bypasses the single\n sign-on (SSO) settings in your SAP account when it accesses your SAP OData instance.</p>\n <p>Whether you need this option depends on the types of credentials that you applied to \n your SAP OData connection profile. If your profile uses basic authentication credentials, SAP SSO\n can prevent Amazon AppFlow from connecting to your account with your username and\n password. In this case, bypassing SSO makes it possible for Amazon AppFlow to connect\n successfully. However, if your profile uses OAuth credentials, this parameter has no\n affect.</p>"
}
}
},
"traits": {
Expand Down
142 changes: 115 additions & 27 deletions codegen/sdk/aws-models/chime-sdk-identity.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,13 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>"
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>"
}
Expand Down Expand Up @@ -368,13 +368,13 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>"
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>"
}
Expand Down Expand Up @@ -2015,15 +2015,15 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>",
"smithy.api#httpLabel": {},
"smithy.api#required": {}
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>",
"smithy.api#httpLabel": {},
Expand Down Expand Up @@ -2325,15 +2325,15 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString1600",
"target": "com.amazonaws.chimesdkidentity#String1600",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>",
"smithy.api#httpLabel": {},
"smithy.api#required": {}
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>",
"smithy.api#httpLabel": {},
Expand Down Expand Up @@ -2711,6 +2711,28 @@
"smithy.api#documentation": "<p>The details of a user or bot.</p>"
}
},
"com.amazonaws.chimesdkidentity#InvokedBy": {
"type": "structure",
"members": {
"StandardMessages": {
"target": "com.amazonaws.chimesdkidentity#StandardMessages",
"traits": {
"smithy.api#documentation": "<p>Sets standard messages as the bot trigger. For standard messages:</p>\n <ul>\n <li>\n <p>\n <code>ALL</code>: The bot processes all standard messages.</p>\n </li>\n <li>\n <p>\n <code>AUTO</code>: The bot responds to ALL messages when the channel has one other non-hidden member, and responds to MENTIONS when the \n channel has more than one other non-hidden member.</p>\n </li>\n <li>\n <p>\n <code>MENTIONS</code>: The bot processes all standard messages that have a message attribute with <code>CHIME.mentions</code> and a \n value of the bot ARN.</p>\n </li>\n <li>\n <p>\n <code>NONE</code>: The bot processes no standard messages.</p>\n </li>\n </ul>",
"smithy.api#required": {}
}
},
"TargetedMessages": {
"target": "com.amazonaws.chimesdkidentity#TargetedMessages",
"traits": {
"smithy.api#documentation": "<p>Sets targeted messages as the bot trigger. For targeted messages:</p>\n <ul>\n <li>\n <p>\n <code>ALL</code>: The bot processes all <code>TargetedMessages</code> sent to it. The bot then responds with a targeted message back to the sender.\n </p>\n </li>\n <li>\n <p>\n <code>NONE</code>: The bot processes no targeted messages.</p>\n </li>\n </ul>",
"smithy.api#required": {}
}
}
},
"traits": {
"smithy.api#documentation": "<p>Specifies the type of message that triggers a bot.</p>"
}
},
"com.amazonaws.chimesdkidentity#LexBotAliasArn": {
"type": "string",
"traits": {
Expand All @@ -2727,8 +2749,13 @@
"RespondsTo": {
"target": "com.amazonaws.chimesdkidentity#RespondsTo",
"traits": {
"smithy.api#documentation": "<p>Determines whether the Amazon Lex V2 bot responds to all standard messages. Control messages are not supported.</p>",
"smithy.api#required": {}
"smithy.api#documentation": "<important>\n <p>\n <b>Deprecated</b>. Use <code>InvokedBy</code> instead.</p>\n </important>\n <p>Determines whether the Amazon Lex V2 bot responds to all standard messages. Control messages are not supported.</p>"
}
},
"InvokedBy": {
"target": "com.amazonaws.chimesdkidentity#InvokedBy",
"traits": {
"smithy.api#documentation": "<p>Specifies the type of message that triggers a bot.</p>"
}
},
"LexBotAliasArn": {
Expand Down Expand Up @@ -3644,13 +3671,13 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>"
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>"
}
Expand Down Expand Up @@ -3729,17 +3756,6 @@
"smithy.api#sensitive": {}
}
},
"com.amazonaws.chimesdkidentity#SensitiveString64": {
"type": "string",
"traits": {
"smithy.api#length": {
"min": 0,
"max": 64
},
"smithy.api#pattern": ".*",
"smithy.api#sensitive": {}
}
},
"com.amazonaws.chimesdkidentity#ServiceFailureException": {
"type": "structure",
"members": {
Expand Down Expand Up @@ -3772,9 +3788,58 @@
"smithy.api#httpError": 503
}
},
"com.amazonaws.chimesdkidentity#StandardMessages": {
"type": "enum",
"members": {
"AUTO": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "AUTO"
}
},
"ALL": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "ALL"
}
},
"MENTIONS": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "MENTIONS"
}
},
"NONE": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "NONE"
}
}
}
},
"com.amazonaws.chimesdkidentity#String": {
"type": "string"
},
"com.amazonaws.chimesdkidentity#String1600": {
"type": "string",
"traits": {
"smithy.api#length": {
"min": 0,
"max": 1600
},
"smithy.api#pattern": ".*"
}
},
"com.amazonaws.chimesdkidentity#String64": {
"type": "string",
"traits": {
"smithy.api#length": {
"min": 0,
"max": 64
},
"smithy.api#pattern": ".*"
}
},
"com.amazonaws.chimesdkidentity#Tag": {
"type": "structure",
"members": {
Expand Down Expand Up @@ -3903,6 +3968,23 @@
"smithy.api#sensitive": {}
}
},
"com.amazonaws.chimesdkidentity#TargetedMessages": {
"type": "enum",
"members": {
"ALL": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "ALL"
}
},
"NONE": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "NONE"
}
}
}
},
"com.amazonaws.chimesdkidentity#ThrottledClientException": {
"type": "structure",
"members": {
Expand Down Expand Up @@ -4104,6 +4186,12 @@
"smithy.api#documentation": "<p>The metadata of the <code>AppInstanceBot</code>.</p>",
"smithy.api#required": {}
}
},
"Configuration": {
"target": "com.amazonaws.chimesdkidentity#Configuration",
"traits": {
"smithy.api#documentation": "<p>The configuration for the bot update.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -4255,15 +4343,15 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>",
"smithy.api#httpLabel": {},
"smithy.api#required": {}
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>",
"smithy.api#httpLabel": {},
Expand Down Expand Up @@ -4291,13 +4379,13 @@
"type": "structure",
"members": {
"AppInstanceUserArn": {
"target": "com.amazonaws.chimesdkidentity#SensitiveChimeArn",
"target": "com.amazonaws.chimesdkidentity#ChimeArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the <code>AppInstanceUser</code>.</p>"
}
},
"EndpointId": {
"target": "com.amazonaws.chimesdkidentity#SensitiveString64",
"target": "com.amazonaws.chimesdkidentity#String64",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the <code>AppInstanceUserEndpoint</code>.</p>"
}
Expand Down
Loading

0 comments on commit c3be1e9

Please sign in to comment.