Skip to content

Commit 4ead47c

Browse files
With this release you can use a new field to specify the search term match type. Search term match types currently support fuzzy and contains matching.
1 parent 3167804 commit 4ead47c

15 files changed

+151
-39
lines changed

generator/ServiceModels/deadline/deadline-2023-10-12.api.json

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,6 @@
23022302
"AssignedTaskRunSessionActionDefinition":{
23032303
"type":"structure",
23042304
"required":[
2305-
"taskId",
23062305
"stepId",
23072306
"parameters"
23082307
],
@@ -4135,8 +4134,7 @@
41354134
"type":"string",
41364135
"max":64,
41374136
"min":1,
4138-
"pattern":"[0-9A-Za-z ]*",
4139-
"sensitive":true
4137+
"pattern":"[0-9A-Za-z ]*"
41404138
},
41414139
"FileSystemLocationType":{
41424140
"type":"string",
@@ -5504,10 +5502,15 @@
55045502
},
55055503
"JobParameters":{
55065504
"type":"map",
5507-
"key":{"shape":"String"},
5505+
"key":{"shape":"JobParametersKeyString"},
55085506
"value":{"shape":"JobParameter"},
55095507
"sensitive":true
55105508
},
5509+
"JobParametersKeyString":{
5510+
"type":"string",
5511+
"max":1024,
5512+
"min":1
5513+
},
55115514
"JobPriority":{
55125515
"type":"integer",
55135516
"box":true,
@@ -7575,9 +7578,17 @@
75757578
"type":"structure",
75767579
"required":["searchTerm"],
75777580
"members":{
7578-
"searchTerm":{"shape":"SearchTerm"}
7581+
"searchTerm":{"shape":"SearchTerm"},
7582+
"matchType":{"shape":"SearchTermMatchingType"}
75797583
}
75807584
},
7585+
"SearchTermMatchingType":{
7586+
"type":"string",
7587+
"enum":[
7588+
"FUZZY_MATCH",
7589+
"CONTAINS"
7590+
]
7591+
},
75817592
"SearchWorkersRequest":{
75827593
"type":"structure",
75837594
"required":[
@@ -8319,7 +8330,6 @@
83198330
"TaskRunSessionActionDefinition":{
83208331
"type":"structure",
83218332
"required":[
8322-
"taskId",
83238333
"stepId",
83248334
"parameters"
83258335
],
@@ -8331,10 +8341,7 @@
83318341
},
83328342
"TaskRunSessionActionDefinitionSummary":{
83338343
"type":"structure",
8334-
"required":[
8335-
"taskId",
8336-
"stepId"
8337-
],
8344+
"required":["stepId"],
83388345
"members":{
83398346
"taskId":{"shape":"TaskId"},
83408347
"stepId":{"shape":"StepId"}

generator/ServiceModels/deadline/deadline-2023-10-12.docs.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,10 +2144,16 @@
21442144
"JobSearchSummary$jobParameters": "<p>The job parameters.</p>"
21452145
}
21462146
},
2147+
"JobParametersKeyString": {
2148+
"base": null,
2149+
"refs": {
2150+
"JobParameters$key": null
2151+
}
2152+
},
21472153
"JobPriority": {
21482154
"base": null,
21492155
"refs": {
2150-
"CreateJobRequest$priority": "<p>The priority of the job on a scale of 0 to 100. The highest priority (first scheduled) is 100. When two jobs have the same priority, the oldest job is scheduled first.</p>",
2156+
"CreateJobRequest$priority": "<p>The priority of the job. The highest priority (first scheduled) is 100. When two jobs have the same priority, the oldest job is scheduled first.</p>",
21512157
"GetJobResponse$priority": "<p>The job priority.</p>",
21522158
"JobSearchSummary$priority": "<p>The job priority.</p>",
21532159
"JobSummary$priority": "<p>The job priority.</p>",
@@ -2972,7 +2978,7 @@
29722978
"Priority": {
29732979
"base": null,
29742980
"refs": {
2975-
"CreateQueueEnvironmentRequest$priority": "<p>Sets the priority of the environments in the queue from 0 to 10,000, where 0 is the highest priority. If two environments share the same priority value, the environment created first takes higher priority.</p>",
2981+
"CreateQueueEnvironmentRequest$priority": "<p>Sets the priority of the environments in the queue from 0 to 10,000, where 0 is the highest priority (activated first and deactivated last). If two environments share the same priority value, the environment created first takes higher priority.</p>",
29762982
"GetQueueEnvironmentResponse$priority": "<p>The priority of the queue environment.</p>",
29772983
"QueueEnvironmentSummary$priority": "<p>The queue environment's priority.</p>",
29782984
"UpdateQueueEnvironmentRequest$priority": "<p>The priority to update.</p>"
@@ -2981,8 +2987,8 @@
29812987
"ProcessExitCode": {
29822988
"base": null,
29832989
"refs": {
2984-
"GetSessionActionResponse$processExitCode": "<p>The exit code to exit the session.</p>",
2985-
"UpdatedSessionActionInfo$processExitCode": "<p>The process exit code.</p>"
2990+
"GetSessionActionResponse$processExitCode": "<p>The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit exit codes to signed 32-bit exit codes.</p>",
2991+
"UpdatedSessionActionInfo$processExitCode": "<p>The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit exit codes to signed 32-bit exit codes.</p>"
29862992
}
29872993
},
29882994
"PutMeteredProductRequest": {
@@ -3393,6 +3399,12 @@
33933399
"SearchFilterExpression$searchTermFilter": "<p>Filters by a specified search term.</p>"
33943400
}
33953401
},
3402+
"SearchTermMatchingType": {
3403+
"base": null,
3404+
"refs": {
3405+
"SearchTermFilterExpression$matchType": "<p>Specifies how Deadline Cloud matches your search term in the results. If you don't specify a <code>matchType</code> the default is <code>FUZZY_MATCH</code>.</p> <ul> <li> <p> <code>FUZZY_MATCH</code> - Matches if a portion of the search term is found in the result.</p> </li> <li> <p> <code>CONTAINS</code> - Matches if the exact search term is contained in the result.</p> </li> </ul>"
3406+
}
3407+
},
33963408
"SearchWorkersRequest": {
33973409
"base": null,
33983410
"refs": {
@@ -3918,7 +3930,6 @@
39183930
"JobDetailsEntity$logGroupName": "<p>The log group name.</p>",
39193931
"JobDetailsEntity$schemaVersion": "<p>The schema version.</p>",
39203932
"JobDetailsError$message": "<p>The error message detailing the error's cause.</p>",
3921-
"JobParameters$key": null,
39223933
"JobSearchSummary$lifecycleStatusMessage": "<p>The life cycle status message.</p>",
39233934
"JobSummary$lifecycleStatusMessage": "<p>The life cycle status message.</p>",
39243935
"ListAvailableMeteredProductsRequest$nextToken": "<p>The token for the next set of results, or <code>null</code> to start from the beginning.</p>",

generator/ServiceModels/deadline/deadline-2023-10-12.normal.json

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,7 +2499,6 @@
24992499
"AssignedTaskRunSessionActionDefinition":{
25002500
"type":"structure",
25012501
"required":[
2502-
"taskId",
25032502
"stepId",
25042503
"parameters"
25052504
],
@@ -3525,7 +3524,7 @@
35253524
},
35263525
"priority":{
35273526
"shape":"JobPriority",
3528-
"documentation":"<p>The priority of the job on a scale of 0 to 100. The highest priority (first scheduled) is 100. When two jobs have the same priority, the oldest job is scheduled first.</p>"
3527+
"documentation":"<p>The priority of the job. The highest priority (first scheduled) is 100. When two jobs have the same priority, the oldest job is scheduled first.</p>"
35293528
},
35303529
"parameters":{
35313530
"shape":"JobParameters",
@@ -3765,7 +3764,7 @@
37653764
},
37663765
"priority":{
37673766
"shape":"Priority",
3768-
"documentation":"<p>Sets the priority of the environments in the queue from 0 to 10,000, where 0 is the highest priority. If two environments share the same priority value, the environment created first takes higher priority.</p>"
3767+
"documentation":"<p>Sets the priority of the environments in the queue from 0 to 10,000, where 0 is the highest priority (activated first and deactivated last). If two environments share the same priority value, the environment created first takes higher priority.</p>"
37693768
},
37703769
"templateType":{
37713770
"shape":"EnvironmentTemplateType",
@@ -4984,8 +4983,7 @@
49844983
"type":"string",
49854984
"max":64,
49864985
"min":1,
4987-
"pattern":"[0-9A-Za-z ]*",
4988-
"sensitive":true
4986+
"pattern":"[0-9A-Za-z ]*"
49894987
},
49904988
"FileSystemLocationType":{
49914989
"type":"string",
@@ -6254,7 +6252,7 @@
62546252
},
62556253
"processExitCode":{
62566254
"shape":"ProcessExitCode",
6257-
"documentation":"<p>The exit code to exit the session.</p>"
6255+
"documentation":"<p>The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit exit codes to signed 32-bit exit codes.</p>"
62586256
},
62596257
"progressMessage":{
62606258
"shape":"SessionActionProgressMessage",
@@ -7296,10 +7294,15 @@
72967294
},
72977295
"JobParameters":{
72987296
"type":"map",
7299-
"key":{"shape":"String"},
7297+
"key":{"shape":"JobParametersKeyString"},
73007298
"value":{"shape":"JobParameter"},
73017299
"sensitive":true
73027300
},
7301+
"JobParametersKeyString":{
7302+
"type":"string",
7303+
"max":1024,
7304+
"min":1
7305+
},
73037306
"JobPriority":{
73047307
"type":"integer",
73057308
"box":true,
@@ -10201,10 +10204,21 @@
1020110204
"searchTerm":{
1020210205
"shape":"SearchTerm",
1020310206
"documentation":"<p>The term to search for.</p>"
10207+
},
10208+
"matchType":{
10209+
"shape":"SearchTermMatchingType",
10210+
"documentation":"<p>Specifies how Deadline Cloud matches your search term in the results. If you don't specify a <code>matchType</code> the default is <code>FUZZY_MATCH</code>.</p> <ul> <li> <p> <code>FUZZY_MATCH</code> - Matches if a portion of the search term is found in the result.</p> </li> <li> <p> <code>CONTAINS</code> - Matches if the exact search term is contained in the result.</p> </li> </ul>"
1020410211
}
1020510212
},
1020610213
"documentation":"<p>Searches for a particular search term.</p>"
1020710214
},
10215+
"SearchTermMatchingType":{
10216+
"type":"string",
10217+
"enum":[
10218+
"FUZZY_MATCH",
10219+
"CONTAINS"
10220+
]
10221+
},
1020810222
"SearchWorkersRequest":{
1020910223
"type":"structure",
1021010224
"required":[
@@ -11408,7 +11422,6 @@
1140811422
"TaskRunSessionActionDefinition":{
1140911423
"type":"structure",
1141011424
"required":[
11411-
"taskId",
1141211425
"stepId",
1141311426
"parameters"
1141411427
],
@@ -11430,10 +11443,7 @@
1143011443
},
1143111444
"TaskRunSessionActionDefinitionSummary":{
1143211445
"type":"structure",
11433-
"required":[
11434-
"taskId",
11435-
"stepId"
11436-
],
11446+
"required":["stepId"],
1143711447
"members":{
1143811448
"taskId":{
1143911449
"shape":"TaskId",
@@ -12506,7 +12516,7 @@
1250612516
},
1250712517
"processExitCode":{
1250812518
"shape":"ProcessExitCode",
12509-
"documentation":"<p>The process exit code.</p>"
12519+
"documentation":"<p>The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit exit codes to signed 32-bit exit codes.</p>"
1251012520
},
1251112521
"progressMessage":{
1251212522
"shape":"SessionActionProgressMessage",

sdk/src/Services/Deadline/Generated/Model/AssignedTaskRunSessionActionDefinition.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ internal bool IsSetStepId()
8282
/// The task ID.
8383
/// </para>
8484
/// </summary>
85-
[AWSProperty(Required=true)]
8685
public string TaskId
8786
{
8887
get { return this._taskId; }

sdk/src/Services/Deadline/Generated/Model/CreateJobRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ internal bool IsSetParameters()
200200
/// <summary>
201201
/// Gets and sets the property Priority.
202202
/// <para>
203-
/// The priority of the job on a scale of 0 to 100. The highest priority (first scheduled)
204-
/// is 100. When two jobs have the same priority, the oldest job is scheduled first.
203+
/// The priority of the job. The highest priority (first scheduled) is 100. When two jobs
204+
/// have the same priority, the oldest job is scheduled first.
205205
/// </para>
206206
/// </summary>
207207
[AWSProperty(Required=true, Min=0, Max=100)]

sdk/src/Services/Deadline/Generated/Model/CreateQueueEnvironmentRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ internal bool IsSetFarmId()
8484
/// Gets and sets the property Priority.
8585
/// <para>
8686
/// Sets the priority of the environments in the queue from 0 to 10,000, where 0 is the
87-
/// highest priority. If two environments share the same priority value, the environment
88-
/// created first takes higher priority.
87+
/// highest priority (activated first and deactivated last). If two environments share
88+
/// the same priority value, the environment created first takes higher priority.
8989
/// </para>
9090
/// </summary>
9191
[AWSProperty(Required=true, Min=0, Max=10000)]

sdk/src/Services/Deadline/Generated/Model/FileSystemLocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public partial class FileSystemLocation
4444
/// The location name.
4545
/// </para>
4646
/// </summary>
47-
[AWSProperty(Required=true, Sensitive=true, Min=1, Max=64)]
47+
[AWSProperty(Required=true, Min=1, Max=64)]
4848
public string Name
4949
{
5050
get { return this._name; }

sdk/src/Services/Deadline/Generated/Model/GetSessionActionResponse.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ internal bool IsSetEndedAt()
105105
/// <summary>
106106
/// Gets and sets the property ProcessExitCode.
107107
/// <para>
108-
/// The exit code to exit the session.
108+
/// The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit
109+
/// exit codes to signed 32-bit exit codes.
109110
/// </para>
110111
/// </summary>
111112
[AWSProperty(Min=-2147483648, Max=2147483647)]

sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/SearchTermFilterExpressionMarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ public void Marshall(SearchTermFilterExpression requestObject, JsonMarshallerCon
4848
{
4949
if(requestObject == null)
5050
return;
51+
if(requestObject.IsSetMatchType())
52+
{
53+
context.Writer.WritePropertyName("matchType");
54+
context.Writer.Write(requestObject.MatchType);
55+
}
56+
5157
if(requestObject.IsSetSearchTerm())
5258
{
5359
context.Writer.WritePropertyName("searchTerm");

sdk/src/Services/Deadline/Generated/Model/ManifestProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public partial class ManifestProperties
4747
/// The file system location name.
4848
/// </para>
4949
/// </summary>
50-
[AWSProperty(Sensitive=true, Min=1, Max=64)]
50+
[AWSProperty(Min=1, Max=64)]
5151
public string FileSystemLocationName
5252
{
5353
get { return this._fileSystemLocationName; }

sdk/src/Services/Deadline/Generated/Model/SearchTermFilterExpression.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,37 @@ namespace Amazon.Deadline.Model
3434
/// </summary>
3535
public partial class SearchTermFilterExpression
3636
{
37+
private SearchTermMatchingType _matchType;
3738
private string _searchTerm;
3839

40+
/// <summary>
41+
/// Gets and sets the property MatchType.
42+
/// <para>
43+
/// Specifies how Deadline Cloud matches your search term in the results. If you don't
44+
/// specify a <c>matchType</c> the default is <c>FUZZY_MATCH</c>.
45+
/// </para>
46+
/// <ul> <li>
47+
/// <para>
48+
/// <c>FUZZY_MATCH</c> - Matches if a portion of the search term is found in the result.
49+
/// </para>
50+
/// </li> <li>
51+
/// <para>
52+
/// <c>CONTAINS</c> - Matches if the exact search term is contained in the result.
53+
/// </para>
54+
/// </li> </ul>
55+
/// </summary>
56+
public SearchTermMatchingType MatchType
57+
{
58+
get { return this._matchType; }
59+
set { this._matchType = value; }
60+
}
61+
62+
// Check to see if MatchType property is set
63+
internal bool IsSetMatchType()
64+
{
65+
return this._matchType != null;
66+
}
67+
3968
/// <summary>
4069
/// Gets and sets the property SearchTerm.
4170
/// <para>

sdk/src/Services/Deadline/Generated/Model/TaskRunSessionActionDefinition.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ internal bool IsSetStepId()
8282
/// The task ID.
8383
/// </para>
8484
/// </summary>
85-
[AWSProperty(Required=true)]
8685
public string TaskId
8786
{
8887
get { return this._taskId; }

sdk/src/Services/Deadline/Generated/Model/TaskRunSessionActionDefinitionSummary.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ internal bool IsSetStepId()
6262
/// The task ID.
6363
/// </para>
6464
/// </summary>
65-
[AWSProperty(Required=true)]
6665
public string TaskId
6766
{
6867
get { return this._taskId; }

sdk/src/Services/Deadline/Generated/Model/UpdatedSessionActionInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ internal bool IsSetEndedAt()
8282
/// <summary>
8383
/// Gets and sets the property ProcessExitCode.
8484
/// <para>
85-
/// The process exit code.
85+
/// The process exit code. The default Deadline Cloud worker agent converts unsigned 32-bit
86+
/// exit codes to signed 32-bit exit codes.
8687
/// </para>
8788
/// </summary>
8889
[AWSProperty(Min=-2147483648, Max=2147483647)]

0 commit comments

Comments
 (0)