Skip to content

Commit a22c328

Browse files
author
awstools
committed
feat(client-athena): This release updates data types that contain either QueryExecutionId, NamedQueryId or ExpectedBucketOwner. Ids must be between 1 and 128 characters and contain only non-whitespace characters. ExpectedBucketOwner must be 12-digit string.
1 parent b6f9a9f commit a22c328

File tree

2 files changed

+45
-6
lines changed

2 files changed

+45
-6
lines changed

‎clients/client-athena/src/models/models_0.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ export namespace AclConfiguration {
3535
});
3636
}
3737

38+
/**
39+
* <p>Contains an array of named query IDs.</p>
40+
*/
3841
export interface BatchGetNamedQueryInput {
3942
/**
4043
* <p>An array of query IDs.</p>
@@ -327,6 +330,9 @@ export namespace BatchGetPreparedStatementOutput {
327330
});
328331
}
329332

333+
/**
334+
* <p>Contains an array of query execution IDs.</p>
335+
*/
330336
export interface BatchGetQueryExecutionInput {
331337
/**
332338
* <p>An array of query execution IDs.</p>

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

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,16 @@
214214
"smithy.api#documentation": "<p>Provides information about an Athena query error. The\n <code>AthenaError</code> feature provides standardized error information to help you\n understand failed queries and take steps after a query failure occurs.\n <code>AthenaError</code> includes an <code>ErrorCategory</code> field that specifies\n whether the cause of the failed query is due to system error, user error, or other\n error.</p>"
215215
}
216216
},
217+
"com.amazonaws.athena#AwsAccountId": {
218+
"type": "string",
219+
"traits": {
220+
"smithy.api#length": {
221+
"min": 12,
222+
"max": 12
223+
},
224+
"smithy.api#pattern": "^[0-9]+$"
225+
}
226+
},
217227
"com.amazonaws.athena#BatchGetNamedQuery": {
218228
"type": "operation",
219229
"input": {
@@ -244,6 +254,9 @@
244254
"smithy.api#required": {}
245255
}
246256
}
257+
},
258+
"traits": {
259+
"smithy.api#documentation": "<p>Contains an array of named query IDs.</p>"
247260
}
248261
},
249262
"com.amazonaws.athena#BatchGetNamedQueryOutput": {
@@ -349,6 +362,9 @@
349362
"smithy.api#required": {}
350363
}
351364
}
365+
},
366+
"traits": {
367+
"smithy.api#documentation": "<p>Contains an array of query execution IDs.</p>"
352368
}
353369
},
354370
"com.amazonaws.athena#BatchGetQueryExecutionOutput": {
@@ -2460,7 +2476,14 @@
24602476
}
24612477
},
24622478
"com.amazonaws.athena#NamedQueryId": {
2463-
"type": "string"
2479+
"type": "string",
2480+
"traits": {
2481+
"smithy.api#length": {
2482+
"min": 1,
2483+
"max": 128
2484+
},
2485+
"smithy.api#pattern": "^\\S+$"
2486+
}
24642487
},
24652488
"com.amazonaws.athena#NamedQueryIdList": {
24662489
"type": "list",
@@ -2669,7 +2692,14 @@
26692692
}
26702693
},
26712694
"com.amazonaws.athena#QueryExecutionId": {
2672-
"type": "string"
2695+
"type": "string",
2696+
"traits": {
2697+
"smithy.api#length": {
2698+
"min": 1,
2699+
"max": 128
2700+
},
2701+
"smithy.api#pattern": "^\\S+$"
2702+
}
26732703
},
26742704
"com.amazonaws.athena#QueryExecutionIdList": {
26752705
"type": "list",
@@ -2835,7 +2865,7 @@
28352865
"type": "structure",
28362866
"members": {
28372867
"OutputLocation": {
2838-
"target": "com.amazonaws.athena#String",
2868+
"target": "com.amazonaws.athena#ResultOutputLocation",
28392869
"traits": {
28402870
"smithy.api#documentation": "<p>The location in Amazon S3 where your query results are stored, such as\n <code>s3://path/to/query/bucket/</code>. To run the query, you must specify the\n query results location using one of the ways: either for individual queries using either\n this setting (client-side), or in the workgroup, using <a>WorkGroupConfiguration</a>. If none of them is set, Athena\n issues an error that no output location is provided. For more information, see <a href=\"https://docs.aws.amazon.com/athena/latest/ug/querying.html\">Query Results</a>. If\n workgroup settings override client-side settings, then the query uses the settings\n specified for the workgroup. See <a>WorkGroupConfiguration$EnforceWorkGroupConfiguration</a>.</p>"
28412871
}
@@ -2847,7 +2877,7 @@
28472877
}
28482878
},
28492879
"ExpectedBucketOwner": {
2850-
"target": "com.amazonaws.athena#String",
2880+
"target": "com.amazonaws.athena#AwsAccountId",
28512881
"traits": {
28522882
"smithy.api#documentation": "<p>The Amazon Web Services account ID that you expect to be the owner of the Amazon S3 bucket specified by <a>ResultConfiguration$OutputLocation</a>.\n If set, Athena uses the value for <code>ExpectedBucketOwner</code> when it\n makes Amazon S3 calls to your specified output location. If the\n <code>ExpectedBucketOwner</code>\n Amazon Web Services account ID does not match the actual owner of the Amazon S3\n bucket, the call fails with a permissions error.</p>\n <p>This is a client-side setting. If workgroup settings override client-side settings,\n then the query uses the <code>ExpectedBucketOwner</code> setting that is specified for\n the workgroup, and also uses the location for storing query results specified in the\n workgroup. See <a>WorkGroupConfiguration$EnforceWorkGroupConfiguration</a>\n and <a href=\"https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html\">Workgroup Settings Override Client-Side Settings</a>.</p>"
28532883
}
@@ -2867,7 +2897,7 @@
28672897
"type": "structure",
28682898
"members": {
28692899
"OutputLocation": {
2870-
"target": "com.amazonaws.athena#String",
2900+
"target": "com.amazonaws.athena#ResultOutputLocation",
28712901
"traits": {
28722902
"smithy.api#documentation": "<p>The location in Amazon S3 where your query results are stored, such as\n <code>s3://path/to/query/bucket/</code>. For more information, see <a href=\"https://docs.aws.amazon.com/athena/latest/ug/querying.html\">Query Results</a> If\n workgroup settings override client-side settings, then the query uses the location for\n the query results and the encryption configuration that are specified for the workgroup.\n The \"workgroup settings override\" is specified in\n <code>EnforceWorkGroupConfiguration</code> (true/false) in the\n <code>WorkGroupConfiguration</code>. See <a>WorkGroupConfiguration$EnforceWorkGroupConfiguration</a>.</p>"
28732903
}
@@ -2891,7 +2921,7 @@
28912921
}
28922922
},
28932923
"ExpectedBucketOwner": {
2894-
"target": "com.amazonaws.athena#String",
2924+
"target": "com.amazonaws.athena#AwsAccountId",
28952925
"traits": {
28962926
"smithy.api#documentation": "<p>The Amazon Web Services account ID that you expect to be the owner of the Amazon S3 bucket specified by <a>ResultConfiguration$OutputLocation</a>.\n If set, Athena uses the value for <code>ExpectedBucketOwner</code> when it\n makes Amazon S3 calls to your specified output location. If the\n <code>ExpectedBucketOwner</code>\n Amazon Web Services account ID does not match the actual owner of the Amazon S3\n bucket, the call fails with a permissions error.</p>\n\n <p>If workgroup settings override client-side settings, then the query uses the\n <code>ExpectedBucketOwner</code> setting that is specified for the workgroup, and\n also uses the location for storing query results specified in the workgroup. See <a>WorkGroupConfiguration$EnforceWorkGroupConfiguration</a> and <a href=\"https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html\">Workgroup Settings Override Client-Side Settings</a>.</p>"
28972927
}
@@ -2919,6 +2949,9 @@
29192949
"smithy.api#documentation": "<p>The information about the updates in the query results, such as output location and\n encryption configuration for the query results.</p>"
29202950
}
29212951
},
2952+
"com.amazonaws.athena#ResultOutputLocation": {
2953+
"type": "string"
2954+
},
29222955
"com.amazonaws.athena#ResultSet": {
29232956
"type": "structure",
29242957
"members": {

0 commit comments

Comments
 (0)