Skip to content

Commit 04a1916

Browse files
aajtoddaajtodd
committed
Merge remote-tracking branch 'origin/main' into release
2 parents 14e70c8 + 920c524 commit 04a1916

30 files changed

+6011
-1501
lines changed

‎codegen/sdk/aws-models/appflow.json‎

Lines changed: 99 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
"traits": {
284284
"smithy.api#length": {
285285
"min": 0,
286-
"max": 512
286+
"max": 2048
287287
},
288288
"smithy.api#pattern": "^\\S+$"
289289
}
@@ -4871,6 +4871,77 @@
48714871
"smithy.api#documentation": "<p>The OAuth 2.0 credentials required for OAuth 2.0 authentication.</p>"
48724872
}
48734873
},
4874+
"com.amazonaws.appflow#OAuth2CustomParameter": {
4875+
"type": "structure",
4876+
"members": {
4877+
"key": {
4878+
"target": "com.amazonaws.appflow#Key",
4879+
"traits": {
4880+
"smithy.api#documentation": "<p>The key of the custom parameter required for OAuth 2.0 authentication.</p>"
4881+
}
4882+
},
4883+
"isRequired": {
4884+
"target": "com.amazonaws.appflow#Boolean",
4885+
"traits": {
4886+
"smithy.api#documentation": "<p>Indicates whether the custom parameter for OAuth 2.0 authentication is required.</p>"
4887+
}
4888+
},
4889+
"label": {
4890+
"target": "com.amazonaws.appflow#Label",
4891+
"traits": {
4892+
"smithy.api#documentation": "<p>The label of the custom parameter used for OAuth 2.0 authentication.</p>"
4893+
}
4894+
},
4895+
"description": {
4896+
"target": "com.amazonaws.appflow#Description",
4897+
"traits": {
4898+
"smithy.api#documentation": "<p>A description about the custom parameter used for OAuth 2.0 authentication.</p>"
4899+
}
4900+
},
4901+
"isSensitiveField": {
4902+
"target": "com.amazonaws.appflow#Boolean",
4903+
"traits": {
4904+
"smithy.api#documentation": "<p>Indicates whether this authentication custom parameter is a sensitive field.</p>"
4905+
}
4906+
},
4907+
"connectorSuppliedValues": {
4908+
"target": "com.amazonaws.appflow#ConnectorSuppliedValueList",
4909+
"traits": {
4910+
"smithy.api#documentation": "<p>Contains default values for this authentication parameter that are supplied by the\n connector.</p>"
4911+
}
4912+
},
4913+
"type": {
4914+
"target": "com.amazonaws.appflow#OAuth2CustomPropType",
4915+
"traits": {
4916+
"smithy.api#documentation": "<p>Indicates whether custom parameter is used with TokenUrl or AuthUrl.</p>"
4917+
}
4918+
}
4919+
},
4920+
"traits": {
4921+
"smithy.api#documentation": "<p>Custom parameter required for OAuth 2.0 authentication.</p>"
4922+
}
4923+
},
4924+
"com.amazonaws.appflow#OAuth2CustomPropType": {
4925+
"type": "string",
4926+
"traits": {
4927+
"smithy.api#enum": [
4928+
{
4929+
"value": "TOKEN_URL",
4930+
"name": "TOKEN_URL"
4931+
},
4932+
{
4933+
"value": "AUTH_URL",
4934+
"name": "AUTH_URL"
4935+
}
4936+
]
4937+
}
4938+
},
4939+
"com.amazonaws.appflow#OAuth2CustomPropertiesList": {
4940+
"type": "list",
4941+
"member": {
4942+
"target": "com.amazonaws.appflow#OAuth2CustomParameter"
4943+
}
4944+
},
48744945
"com.amazonaws.appflow#OAuth2Defaults": {
48754946
"type": "structure",
48764947
"members": {
@@ -4897,6 +4968,12 @@
48974968
"traits": {
48984969
"smithy.api#documentation": "<p>OAuth 2.0 grant types supported by the connector.</p>"
48994970
}
4971+
},
4972+
"oauth2CustomProperties": {
4973+
"target": "com.amazonaws.appflow#OAuth2CustomPropertiesList",
4974+
"traits": {
4975+
"smithy.api#documentation": "<p>List of custom parameters required for OAuth 2.0 authentication.</p>"
4976+
}
49004977
}
49014978
},
49024979
"traits": {
@@ -4940,6 +5017,12 @@
49405017
"smithy.api#documentation": "<p>The OAuth 2.0 grant type used by connector for OAuth 2.0 authentication.</p>",
49415018
"smithy.api#required": {}
49425019
}
5020+
},
5021+
"tokenUrlCustomProperties": {
5022+
"target": "com.amazonaws.appflow#TokenUrlCustomProperties",
5023+
"traits": {
5024+
"smithy.api#documentation": "<p>Associates your token URL with a map of properties that you define. Use this parameter\n to provide any additional details that the connector requires to authenticate your\n request.</p>"
5025+
}
49435026
}
49445027
},
49455028
"traits": {
@@ -7799,6 +7882,21 @@
77997882
"smithy.api#pattern": "^(https?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]$"
78007883
}
78017884
},
7885+
"com.amazonaws.appflow#TokenUrlCustomProperties": {
7886+
"type": "map",
7887+
"key": {
7888+
"target": "com.amazonaws.appflow#CustomPropertyKey"
7889+
},
7890+
"value": {
7891+
"target": "com.amazonaws.appflow#CustomPropertyValue"
7892+
},
7893+
"traits": {
7894+
"smithy.api#length": {
7895+
"min": 0,
7896+
"max": 50
7897+
}
7898+
}
7899+
},
78027900
"com.amazonaws.appflow#TokenUrlList": {
78037901
"type": "list",
78047902
"member": {

‎codegen/sdk/aws-models/appstream.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,12 @@
13821382
"traits": {
13831383
"smithy.api#documentation": "<p>The USB device filter strings that specify which USB devices a user can redirect to the fleet streaming session, when using the Windows native client. This is allowed but not required for Elastic fleets.</p>"
13841384
}
1385+
},
1386+
"SessionScriptS3Location": {
1387+
"target": "com.amazonaws.appstream#S3Location",
1388+
"traits": {
1389+
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets.</p>"
1390+
}
13851391
}
13861392
}
13871393
},
@@ -4121,6 +4127,12 @@
41214127
"traits": {
41224128
"smithy.api#documentation": "<p>The USB device filter strings associated with the fleet.</p>"
41234129
}
4130+
},
4131+
"SessionScriptS3Location": {
4132+
"target": "com.amazonaws.appstream#S3Location",
4133+
"traits": {
4134+
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets.</p>"
4135+
}
41244136
}
41254137
},
41264138
"traits": {
@@ -4151,6 +4163,10 @@
41514163
{
41524164
"value": "USB_DEVICE_FILTER_STRINGS",
41534165
"name": "USB_DEVICE_FILTER_STRINGS"
4166+
},
4167+
{
4168+
"value": "SESSION_SCRIPT_S3_LOCATION",
4169+
"name": "SESSION_SCRIPT_S3_LOCATION"
41544170
}
41554171
]
41564172
}
@@ -6867,6 +6883,12 @@
68676883
"traits": {
68686884
"smithy.api#documentation": "<p>The USB device filter strings that specify which USB devices a user can redirect to the fleet streaming session, when using the Windows native client. This is allowed but not required for Elastic fleets.</p>"
68696885
}
6886+
},
6887+
"SessionScriptS3Location": {
6888+
"target": "com.amazonaws.appstream#S3Location",
6889+
"traits": {
6890+
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets. </p>"
6891+
}
68706892
}
68716893
}
68726894
},

0 commit comments

Comments
 (0)