Skip to content

Commit 87f71cc

Browse files
Added fields for output manifest reporting and task chunking parameters
1 parent 6c14d03 commit 87f71cc

19 files changed

+645
-7
lines changed

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

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4861,7 +4861,8 @@
48614861
"processExitCode":{"shape":"ProcessExitCode"},
48624862
"progressMessage":{"shape":"SessionActionProgressMessage"},
48634863
"definition":{"shape":"SessionActionDefinition"},
4864-
"acquiredLimits":{"shape":"AcquiredLimits"}
4864+
"acquiredLimits":{"shape":"AcquiredLimits"},
4865+
"manifests":{"shape":"TaskRunManifestPropertiesListResponse"}
48654866
}
48664867
},
48674868
"GetSessionRequest":{
@@ -7830,7 +7831,8 @@
78307831
"endedAt":{"shape":"EndedAt"},
78317832
"workerUpdatedAt":{"shape":"Timestamp"},
78327833
"progressPercent":{"shape":"SessionActionProgressPercent"},
7833-
"definition":{"shape":"SessionActionDefinitionSummary"}
7834+
"definition":{"shape":"SessionActionDefinitionSummary"},
7835+
"manifests":{"shape":"TaskRunManifestPropertiesListResponse"}
78347836
}
78357837
},
78367838
"SessionId":{
@@ -8151,7 +8153,8 @@
81518153
"INT",
81528154
"FLOAT",
81538155
"STRING",
8154-
"PATH"
8156+
"PATH",
8157+
"CHUNK_INT"
81558158
]
81568159
},
81578160
"StepRequiredCapabilities":{
@@ -8355,7 +8358,8 @@
83558358
"int":{"shape":"IntString"},
83568359
"float":{"shape":"FloatString"},
83578360
"string":{"shape":"ParameterString"},
8358-
"path":{"shape":"PathString"}
8361+
"path":{"shape":"PathString"},
8362+
"chunkInt":{"shape":"String"}
83598363
},
83608364
"sensitive":true,
83618365
"union":true
@@ -8372,6 +8376,40 @@
83728376
"max":2147483647,
83738377
"min":0
83748378
},
8379+
"TaskRunManifestPropertiesListRequest":{
8380+
"type":"list",
8381+
"member":{"shape":"TaskRunManifestPropertiesRequest"},
8382+
"max":10,
8383+
"min":0
8384+
},
8385+
"TaskRunManifestPropertiesListResponse":{
8386+
"type":"list",
8387+
"member":{"shape":"TaskRunManifestPropertiesResponse"}
8388+
},
8389+
"TaskRunManifestPropertiesRequest":{
8390+
"type":"structure",
8391+
"members":{
8392+
"outputManifestPath":{"shape":"TaskRunManifestPropertiesRequestOutputManifestPathString"},
8393+
"outputManifestHash":{"shape":"TaskRunManifestPropertiesRequestOutputManifestHashString"}
8394+
}
8395+
},
8396+
"TaskRunManifestPropertiesRequestOutputManifestHashString":{
8397+
"type":"string",
8398+
"max":256,
8399+
"min":1
8400+
},
8401+
"TaskRunManifestPropertiesRequestOutputManifestPathString":{
8402+
"type":"string",
8403+
"max":512,
8404+
"min":1
8405+
},
8406+
"TaskRunManifestPropertiesResponse":{
8407+
"type":"structure",
8408+
"members":{
8409+
"outputManifestPath":{"shape":"String"},
8410+
"outputManifestHash":{"shape":"String"}
8411+
}
8412+
},
83758413
"TaskRunSessionActionDefinition":{
83768414
"type":"structure",
83778415
"required":[
@@ -8389,7 +8427,8 @@
83898427
"required":["stepId"],
83908428
"members":{
83918429
"taskId":{"shape":"TaskId"},
8392-
"stepId":{"shape":"StepId"}
8430+
"stepId":{"shape":"StepId"},
8431+
"parameters":{"shape":"TaskParameters"}
83938432
}
83948433
},
83958434
"TaskRunStatus":{
@@ -9147,7 +9186,8 @@
91479186
"startedAt":{"shape":"SyntheticTimestamp_date_time"},
91489187
"endedAt":{"shape":"SyntheticTimestamp_date_time"},
91499188
"updatedAt":{"shape":"SyntheticTimestamp_date_time"},
9150-
"progressPercent":{"shape":"SessionActionProgressPercent"}
9189+
"progressPercent":{"shape":"SessionActionProgressPercent"},
9190+
"manifests":{"shape":"TaskRunManifestPropertiesListRequest"}
91519191
}
91529192
},
91539193
"UpdatedSessionActions":{

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4036,7 +4036,10 @@
40364036
"TagResourceRequest$resourceArn": "<p>The ARN of the resource to apply tags to.</p>",
40374037
"Tags$key": null,
40384038
"Tags$value": null,
4039+
"TaskParameterValue$chunkInt": "<p>A range (for example 1-10) or selection of specific (for example 1,3,7,8,10) integers represented as a string.</p>",
40394040
"TaskParameters$key": null,
4041+
"TaskRunManifestPropertiesResponse$outputManifestPath": "<p>The manifest file path.</p>",
4042+
"TaskRunManifestPropertiesResponse$outputManifestHash": "<p>The hash value of the file.</p>",
40404043
"ThrottlingException$message": null,
40414044
"ThrottlingException$serviceCode": "<p>Identifies the service that is being throttled.</p>",
40424045
"ThrottlingException$quotaCode": "<p>Identifies the quota that is being throttled.</p>",
@@ -4172,6 +4175,7 @@
41724175
"AssignedTaskRunSessionActionDefinition$parameters": "<p>The parameters to include.</p>",
41734176
"GetTaskResponse$parameters": "<p>The parameters for the task.</p>",
41744177
"TaskRunSessionActionDefinition$parameters": "<p>The task parameters.</p>",
4178+
"TaskRunSessionActionDefinitionSummary$parameters": "<p>The parameters of a task run in a session action.</p>",
41754179
"TaskSearchSummary$parameters": "<p>The parameters to search for.</p>",
41764180
"TaskSummary$parameters": "<p>The task parameters.</p>"
41774181
}
@@ -4184,6 +4188,43 @@
41844188
"TaskSummary$failureRetryCount": "<p>The number of times that the task failed and was retried.</p>"
41854189
}
41864190
},
4191+
"TaskRunManifestPropertiesListRequest": {
4192+
"base": null,
4193+
"refs": {
4194+
"UpdatedSessionActionInfo$manifests": "<p>A list of output manifest properties reported by the worker agent, with each entry corresponding to a manifest property in the job.</p>"
4195+
}
4196+
},
4197+
"TaskRunManifestPropertiesListResponse": {
4198+
"base": null,
4199+
"refs": {
4200+
"GetSessionActionResponse$manifests": "<p>The list of manifest properties that describe file attachments for the task run.</p>",
4201+
"SessionActionSummary$manifests": "<p>The list of manifest properties that describe file attachments for the task run.</p>"
4202+
}
4203+
},
4204+
"TaskRunManifestPropertiesRequest": {
4205+
"base": "<p>The output manifest properties reported by the worker agent for a completed task run.</p>",
4206+
"refs": {
4207+
"TaskRunManifestPropertiesListRequest$member": null
4208+
}
4209+
},
4210+
"TaskRunManifestPropertiesRequestOutputManifestHashString": {
4211+
"base": null,
4212+
"refs": {
4213+
"TaskRunManifestPropertiesRequest$outputManifestHash": "<p>The hash value of the file.</p>"
4214+
}
4215+
},
4216+
"TaskRunManifestPropertiesRequestOutputManifestPathString": {
4217+
"base": null,
4218+
"refs": {
4219+
"TaskRunManifestPropertiesRequest$outputManifestPath": "<p>The manifest file path.</p>"
4220+
}
4221+
},
4222+
"TaskRunManifestPropertiesResponse": {
4223+
"base": "<p>The manifest properties for a task run, corresponding to the manifest properties in the job.</p>",
4224+
"refs": {
4225+
"TaskRunManifestPropertiesListResponse$member": null
4226+
}
4227+
},
41874228
"TaskRunSessionActionDefinition": {
41884229
"base": "<p>The task, step, and parameters for the task run in the session action.</p>",
41894230
"refs": {

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6285,6 +6285,10 @@
62856285
"acquiredLimits":{
62866286
"shape":"AcquiredLimits",
62876287
"documentation":"<p>The limits and their amounts acquired during a session action. If no limits were acquired during the session, this field isn't returned.</p>"
6288+
},
6289+
"manifests":{
6290+
"shape":"TaskRunManifestPropertiesListResponse",
6291+
"documentation":"<p>The list of manifest properties that describe file attachments for the task run.</p>"
62886292
}
62896293
}
62906294
},
@@ -10627,6 +10631,10 @@
1062710631
"definition":{
1062810632
"shape":"SessionActionDefinitionSummary",
1062910633
"documentation":"<p>The session action definition.</p>"
10634+
},
10635+
"manifests":{
10636+
"shape":"TaskRunManifestPropertiesListResponse",
10637+
"documentation":"<p>The list of manifest properties that describe file attachments for the task run.</p>"
1063010638
}
1063110639
},
1063210640
"documentation":"<p>The details of a session action.</p>"
@@ -11142,7 +11150,8 @@
1114211150
"INT",
1114311151
"FLOAT",
1114411152
"STRING",
11145-
"PATH"
11153+
"PATH",
11154+
"CHUNK_INT"
1114611155
]
1114711156
},
1114811157
"StepRequiredCapabilities":{
@@ -11486,6 +11495,10 @@
1148611495
"path":{
1148711496
"shape":"PathString",
1148811497
"documentation":"<p>A file system path represented as a string.</p>"
11498+
},
11499+
"chunkInt":{
11500+
"shape":"String",
11501+
"documentation":"<p>A range (for example 1-10) or selection of specific (for example 1,3,7,8,10) integers represented as a string.</p>"
1148911502
}
1149011503
},
1149111504
"documentation":"<p>The data types for the task parameters.</p>",
@@ -11504,6 +11517,54 @@
1150411517
"max":2147483647,
1150511518
"min":0
1150611519
},
11520+
"TaskRunManifestPropertiesListRequest":{
11521+
"type":"list",
11522+
"member":{"shape":"TaskRunManifestPropertiesRequest"},
11523+
"max":10,
11524+
"min":0
11525+
},
11526+
"TaskRunManifestPropertiesListResponse":{
11527+
"type":"list",
11528+
"member":{"shape":"TaskRunManifestPropertiesResponse"}
11529+
},
11530+
"TaskRunManifestPropertiesRequest":{
11531+
"type":"structure",
11532+
"members":{
11533+
"outputManifestPath":{
11534+
"shape":"TaskRunManifestPropertiesRequestOutputManifestPathString",
11535+
"documentation":"<p>The manifest file path.</p>"
11536+
},
11537+
"outputManifestHash":{
11538+
"shape":"TaskRunManifestPropertiesRequestOutputManifestHashString",
11539+
"documentation":"<p>The hash value of the file.</p>"
11540+
}
11541+
},
11542+
"documentation":"<p>The output manifest properties reported by the worker agent for a completed task run.</p>"
11543+
},
11544+
"TaskRunManifestPropertiesRequestOutputManifestHashString":{
11545+
"type":"string",
11546+
"max":256,
11547+
"min":1
11548+
},
11549+
"TaskRunManifestPropertiesRequestOutputManifestPathString":{
11550+
"type":"string",
11551+
"max":512,
11552+
"min":1
11553+
},
11554+
"TaskRunManifestPropertiesResponse":{
11555+
"type":"structure",
11556+
"members":{
11557+
"outputManifestPath":{
11558+
"shape":"String",
11559+
"documentation":"<p>The manifest file path.</p>"
11560+
},
11561+
"outputManifestHash":{
11562+
"shape":"String",
11563+
"documentation":"<p>The hash value of the file.</p>"
11564+
}
11565+
},
11566+
"documentation":"<p>The manifest properties for a task run, corresponding to the manifest properties in the job.</p>"
11567+
},
1150711568
"TaskRunSessionActionDefinition":{
1150811569
"type":"structure",
1150911570
"required":[
@@ -11537,6 +11598,10 @@
1153711598
"stepId":{
1153811599
"shape":"StepId",
1153911600
"documentation":"<p>The step ID.</p>"
11601+
},
11602+
"parameters":{
11603+
"shape":"TaskParameters",
11604+
"documentation":"<p>The parameters of a task run in a session action.</p>"
1154011605
}
1154111606
},
1154211607
"documentation":"<p>The details of a task run in a session action.</p>"
@@ -12630,6 +12695,10 @@
1263012695
"progressPercent":{
1263112696
"shape":"SessionActionProgressPercent",
1263212697
"documentation":"<p>The percentage completed.</p>"
12698+
},
12699+
"manifests":{
12700+
"shape":"TaskRunManifestPropertiesListRequest",
12701+
"documentation":"<p>A list of output manifest properties reported by the worker agent, with each entry corresponding to a manifest property in the job.</p>"
1263312702
}
1263412703
},
1263512704
"documentation":"<p>The updated session action information as it relates to completion and progress of the session.</p>"

sdk/code-analysis/ServiceAnalysis/Deadline/Generated/PropertyValueRules.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,6 +2897,16 @@
28972897
<min>0</min>
28982898
<max>1024</max>
28992899
</property-value-rule>
2900+
<property-value-rule>
2901+
<property>Amazon.Deadline.Model.TaskRunManifestPropertiesRequest.OutputManifestHash</property>
2902+
<min>1</min>
2903+
<max>256</max>
2904+
</property-value-rule>
2905+
<property-value-rule>
2906+
<property>Amazon.Deadline.Model.TaskRunManifestPropertiesRequest.OutputManifestPath</property>
2907+
<min>1</min>
2908+
<max>512</max>
2909+
</property-value-rule>
29002910
<property-value-rule>
29012911
<property>Amazon.Deadline.Model.TaskRunSessionActionDefinition.StepId</property>
29022912
<pattern>step-[0-9a-f]{32}</pattern>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public partial class GetSessionActionResponse : AmazonWebServiceResponse
3737
private List<AcquiredLimit> _acquiredLimits = AWSConfigs.InitializeCollections ? new List<AcquiredLimit>() : null;
3838
private SessionActionDefinition _definition;
3939
private DateTime? _endedAt;
40+
private List<TaskRunManifestPropertiesResponse> _manifests = AWSConfigs.InitializeCollections ? new List<TaskRunManifestPropertiesResponse>() : null;
4041
private int? _processExitCode;
4142
private string _progressMessage;
4243
private float? _progressPercent;
@@ -107,6 +108,29 @@ internal bool IsSetEndedAt()
107108
return this._endedAt.HasValue;
108109
}
109110

111+
/// <summary>
112+
/// Gets and sets the property Manifests.
113+
/// <para>
114+
/// The list of manifest properties that describe file attachments for the task run.
115+
/// </para>
116+
/// <para />
117+
/// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
118+
/// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
119+
/// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
120+
/// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
121+
/// </summary>
122+
public List<TaskRunManifestPropertiesResponse> Manifests
123+
{
124+
get { return this._manifests; }
125+
set { this._manifests = value; }
126+
}
127+
128+
// Check to see if Manifests property is set
129+
internal bool IsSetManifests()
130+
{
131+
return this._manifests != null && (this._manifests.Count > 0 || !AWSConfigs.InitializeCollections);
132+
}
133+
110134
/// <summary>
111135
/// Gets and sets the property ProcessExitCode.
112136
/// <para>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont
7070
response.EndedAt = unmarshaller.Unmarshall(context, ref reader);
7171
continue;
7272
}
73+
if (context.TestExpression("manifests", targetDepth))
74+
{
75+
var unmarshaller = new JsonListUnmarshaller<TaskRunManifestPropertiesResponse, TaskRunManifestPropertiesResponseUnmarshaller>(TaskRunManifestPropertiesResponseUnmarshaller.Instance);
76+
response.Manifests = unmarshaller.Unmarshall(context, ref reader);
77+
continue;
78+
}
7379
if (context.TestExpression("processExitCode", targetDepth))
7480
{
7581
var unmarshaller = NullableIntUnmarshaller.Instance;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public SessionActionSummary Unmarshall(JsonUnmarshallerContext context, ref Stre
6868
unmarshalledObject.EndedAt = unmarshaller.Unmarshall(context, ref reader);
6969
continue;
7070
}
71+
if (context.TestExpression("manifests", targetDepth))
72+
{
73+
var unmarshaller = new JsonListUnmarshaller<TaskRunManifestPropertiesResponse, TaskRunManifestPropertiesResponseUnmarshaller>(TaskRunManifestPropertiesResponseUnmarshaller.Instance);
74+
unmarshalledObject.Manifests = unmarshaller.Unmarshall(context, ref reader);
75+
continue;
76+
}
7177
if (context.TestExpression("progressPercent", targetDepth))
7278
{
7379
var unmarshaller = NullableFloatUnmarshaller.Instance;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ public TaskParameterValue Unmarshall(JsonUnmarshallerContext context, ref Stream
5656
int targetDepth = context.CurrentDepth;
5757
while (context.ReadAtDepth(targetDepth, ref reader))
5858
{
59+
if (context.TestExpression("chunkInt", targetDepth))
60+
{
61+
var unmarshaller = StringUnmarshaller.Instance;
62+
unmarshalledObject.ChunkInt = unmarshaller.Unmarshall(context, ref reader);
63+
continue;
64+
}
5965
if (context.TestExpression("float", targetDepth))
6066
{
6167
var unmarshaller = StringUnmarshaller.Instance;

0 commit comments

Comments
 (0)