Skip to content

Commit 4931bb0

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Add support for VPC resource endpoints in Service Managed Fleets
1 parent 1888c87 commit 4931bb0

15 files changed

+532
-1
lines changed

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5576,6 +5576,8 @@
55765576
"createdAt":{"shape":"CreatedAt"},
55775577
"endedAt":{"shape":"EndedAt"},
55785578
"startedAt":{"shape":"StartedAt"},
5579+
"updatedAt":{"shape":"UpdatedAt"},
5580+
"updatedBy":{"shape":"UpdatedBy"},
55795581
"jobParameters":{"shape":"JobParameters"},
55805582
"maxWorkerCount":{"shape":"MaxWorkerCount"},
55815583
"sourceJobId":{"shape":"JobId"}
@@ -7685,6 +7687,7 @@
76857687
"members":{
76867688
"instanceCapabilities":{"shape":"ServiceManagedEc2InstanceCapabilities"},
76877689
"instanceMarketOptions":{"shape":"ServiceManagedEc2InstanceMarketOptions"},
7690+
"vpcConfiguration":{"shape":"VpcConfiguration"},
76887691
"storageProfileId":{"shape":"StorageProfileId"}
76897692
}
76907693
},
@@ -8186,8 +8189,11 @@
81868189
"taskRunStatusCounts":{"shape":"TaskRunStatusCounts"},
81878190
"taskFailureRetryCount":{"shape":"TaskFailureRetryCount"},
81888191
"createdAt":{"shape":"CreatedAt"},
8192+
"createdBy":{"shape":"CreatedBy"},
81898193
"startedAt":{"shape":"StartedAt"},
81908194
"endedAt":{"shape":"EndedAt"},
8195+
"updatedAt":{"shape":"UpdatedAt"},
8196+
"updatedBy":{"shape":"UpdatedBy"},
81918197
"parameterSpace":{"shape":"ParameterSpace"}
81928198
}
81938199
},
@@ -8469,7 +8475,9 @@
84698475
"parameters":{"shape":"TaskParameters"},
84708476
"failureRetryCount":{"shape":"TaskRetryCount"},
84718477
"startedAt":{"shape":"StartedAt"},
8472-
"endedAt":{"shape":"EndedAt"}
8478+
"endedAt":{"shape":"EndedAt"},
8479+
"updatedAt":{"shape":"UpdatedAt"},
8480+
"updatedBy":{"shape":"UpdatedBy"}
84738481
}
84748482
},
84758483
"TaskSummaries":{
@@ -9309,12 +9317,27 @@
93099317
"OTHER"
93109318
]
93119319
},
9320+
"VpcConfiguration":{
9321+
"type":"structure",
9322+
"members":{
9323+
"resourceConfigurationArns":{"shape":"VpcResourceConfigurationArns"}
9324+
}
9325+
},
93129326
"VpcId":{
93139327
"type":"string",
93149328
"max":32,
93159329
"min":1,
93169330
"pattern":"vpc-[\\w]{1,120}"
93179331
},
9332+
"VpcResourceConfigurationArn":{
9333+
"type":"string",
9334+
"max":2048,
9335+
"min":1
9336+
},
9337+
"VpcResourceConfigurationArns":{
9338+
"type":"list",
9339+
"member":{"shape":"VpcResourceConfigurationArn"}
9340+
},
93189341
"WindowsUser":{
93199342
"type":"structure",
93209343
"required":[

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@
831831
"QueueFleetAssociationSummary$createdBy": "<p>The user or system that created this resource.</p>",
832832
"QueueLimitAssociationSummary$createdBy": "<p>The user identifier of the person that created the association.</p>",
833833
"QueueSummary$createdBy": "<p>The user or system that created this resource.</p>",
834+
"StepSearchSummary$createdBy": "<p>The user or system that created this resource.</p>",
834835
"StepSummary$createdBy": "<p>The user or system that created this resource.</p>",
835836
"TaskSummary$createdBy": "<p>The user or system that created this resource.</p>",
836837
"WorkerSearchSummary$createdBy": "<p>The user or system that created this resource.</p>",
@@ -4547,14 +4548,17 @@
45474548
"GetStorageProfileResponse$updatedAt": "<p>The date and time the resource was updated.</p>",
45484549
"GetTaskResponse$updatedAt": "<p>The date and time the resource was updated.</p>",
45494550
"GetWorkerResponse$updatedAt": "<p>The date and time the resource was updated.</p>",
4551+
"JobSearchSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45504552
"JobSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45514553
"LimitSummary$updatedAt": "<p>The Unix timestamp of the date and time that the limit was last updated.</p>",
45524554
"MonitorSummary$updatedAt": "<p>The UNIX timestamp of the date and time that the monitor was last updated.</p>",
45534555
"QueueFleetAssociationSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45544556
"QueueLimitAssociationSummary$updatedAt": "<p>The Unix timestamp of the date and time that the association was last updated.</p>",
45554557
"QueueSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45564558
"SessionSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
4559+
"StepSearchSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45574560
"StepSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
4561+
"TaskSearchSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45584562
"TaskSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45594563
"WorkerSearchSummary$updatedAt": "<p>The date and time the resource was updated.</p>",
45604564
"WorkerSummary$updatedAt": "<p>The date and time the resource was updated.</p>"
@@ -4581,14 +4585,17 @@
45814585
"GetStorageProfileResponse$updatedBy": "<p>The user or system that updated this resource.</p>",
45824586
"GetTaskResponse$updatedBy": "<p>The user or system that updated this resource.</p>",
45834587
"GetWorkerResponse$updatedBy": "<p>The user or system that updated this resource.</p>",
4588+
"JobSearchSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45844589
"JobSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45854590
"LimitSummary$updatedBy": "<p>The user identifier of the person that last updated the limit.</p>",
45864591
"MonitorSummary$updatedBy": "<p>The user name of the person that last updated the monitor.</p>",
45874592
"QueueFleetAssociationSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45884593
"QueueLimitAssociationSummary$updatedBy": "<p>The user identifier of the person that updated the association.</p>",
45894594
"QueueSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45904595
"SessionSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
4596+
"StepSearchSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45914597
"StepSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
4598+
"TaskSearchSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45924599
"TaskSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45934600
"WorkerSearchSummary$updatedBy": "<p>The user or system that updated this resource.</p>",
45944601
"WorkerSummary$updatedBy": "<p>The user or system that updated this resource.</p>"
@@ -4699,6 +4706,12 @@
46994706
"ValidationException$reason": "<p>The reason that the request failed validation.</p>"
47004707
}
47014708
},
4709+
"VpcConfiguration": {
4710+
"base": "<p>The configuration options for a service managed fleet's VPC.</p>",
4711+
"refs": {
4712+
"ServiceManagedEc2FleetConfiguration$vpcConfiguration": "<p>The VPC configuration details for a service managed Amazon EC2 fleet.</p>"
4713+
}
4714+
},
47024715
"VpcId": {
47034716
"base": null,
47044717
"refs": {
@@ -4707,6 +4720,18 @@
47074720
"LicenseEndpointSummary$vpcId": "<p>The VCP(virtual private cloud) ID associated with the license endpoint.</p>"
47084721
}
47094722
},
4723+
"VpcResourceConfigurationArn": {
4724+
"base": null,
4725+
"refs": {
4726+
"VpcResourceConfigurationArns$member": null
4727+
}
4728+
},
4729+
"VpcResourceConfigurationArns": {
4730+
"base": null,
4731+
"refs": {
4732+
"VpcConfiguration$resourceConfigurationArns": "<p>The ARNs of the VPC Lattice resource configurations attached to the fleet.</p>"
4733+
}
4734+
},
47104735
"WindowsUser": {
47114736
"base": "<p>The Windows user details.</p>",
47124737
"refs": {

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7454,6 +7454,14 @@
74547454
"shape":"StartedAt",
74557455
"documentation":"<p>The date and time the resource started running.</p>"
74567456
},
7457+
"updatedAt":{
7458+
"shape":"UpdatedAt",
7459+
"documentation":"<p>The date and time the resource was updated.</p>"
7460+
},
7461+
"updatedBy":{
7462+
"shape":"UpdatedBy",
7463+
"documentation":"<p>The user or system that updated this resource.</p>"
7464+
},
74577465
"jobParameters":{
74587466
"shape":"JobParameters",
74597467
"documentation":"<p>The job parameters.</p>"
@@ -10380,6 +10388,10 @@
1038010388
"shape":"ServiceManagedEc2InstanceMarketOptions",
1038110389
"documentation":"<p>The Amazon EC2 market type.</p>"
1038210390
},
10391+
"vpcConfiguration":{
10392+
"shape":"VpcConfiguration",
10393+
"documentation":"<p>The VPC configuration details for a service managed Amazon EC2 fleet.</p>"
10394+
},
1038310395
"storageProfileId":{
1038410396
"shape":"StorageProfileId",
1038510397
"documentation":"<p>The storage profile ID.</p>"
@@ -11223,6 +11235,10 @@
1122311235
"shape":"CreatedAt",
1122411236
"documentation":"<p>The date and time the resource was created.</p>"
1122511237
},
11238+
"createdBy":{
11239+
"shape":"CreatedBy",
11240+
"documentation":"<p>The user or system that created this resource.</p>"
11241+
},
1122611242
"startedAt":{
1122711243
"shape":"StartedAt",
1122811244
"documentation":"<p>The date and time the resource started running.</p>"
@@ -11231,6 +11247,14 @@
1123111247
"shape":"EndedAt",
1123211248
"documentation":"<p>The date and time the resource ended running.</p>"
1123311249
},
11250+
"updatedAt":{
11251+
"shape":"UpdatedAt",
11252+
"documentation":"<p>The date and time the resource was updated.</p>"
11253+
},
11254+
"updatedBy":{
11255+
"shape":"UpdatedBy",
11256+
"documentation":"<p>The user or system that updated this resource.</p>"
11257+
},
1123411258
"parameterSpace":{
1123511259
"shape":"ParameterSpace",
1123611260
"documentation":"<p>The parameters and combination expressions for the search.</p>"
@@ -11674,6 +11698,14 @@
1167411698
"endedAt":{
1167511699
"shape":"EndedAt",
1167611700
"documentation":"<p>The date and time the resource ended running.</p>"
11701+
},
11702+
"updatedAt":{
11703+
"shape":"UpdatedAt",
11704+
"documentation":"<p>The date and time the resource was updated.</p>"
11705+
},
11706+
"updatedBy":{
11707+
"shape":"UpdatedBy",
11708+
"documentation":"<p>The user or system that updated this resource.</p>"
1167711709
}
1167811710
},
1167911711
"documentation":"<p>The details of a task search.</p>"
@@ -12854,12 +12886,31 @@
1285412886
"OTHER"
1285512887
]
1285612888
},
12889+
"VpcConfiguration":{
12890+
"type":"structure",
12891+
"members":{
12892+
"resourceConfigurationArns":{
12893+
"shape":"VpcResourceConfigurationArns",
12894+
"documentation":"<p>The ARNs of the VPC Lattice resource configurations attached to the fleet.</p>"
12895+
}
12896+
},
12897+
"documentation":"<p>The configuration options for a service managed fleet's VPC.</p>"
12898+
},
1285712899
"VpcId":{
1285812900
"type":"string",
1285912901
"max":32,
1286012902
"min":1,
1286112903
"pattern":"vpc-[\\w]{1,120}"
1286212904
},
12905+
"VpcResourceConfigurationArn":{
12906+
"type":"string",
12907+
"max":2048,
12908+
"min":1
12909+
},
12910+
"VpcResourceConfigurationArns":{
12911+
"type":"list",
12912+
"member":{"shape":"VpcResourceConfigurationArn"}
12913+
},
1286312914
"WindowsUser":{
1286412915
"type":"structure",
1286512916
"required":[

‎sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/JobSearchSummaryUnmarshaller.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,18 @@ public JobSearchSummary Unmarshall(JsonUnmarshallerContext context)
180180
unmarshalledObject.TaskRunStatusCounts = unmarshaller.Unmarshall(context);
181181
continue;
182182
}
183+
if (context.TestExpression("updatedAt", targetDepth))
184+
{
185+
var unmarshaller = DateTimeUnmarshaller.Instance;
186+
unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context);
187+
continue;
188+
}
189+
if (context.TestExpression("updatedBy", targetDepth))
190+
{
191+
var unmarshaller = StringUnmarshaller.Instance;
192+
unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context);
193+
continue;
194+
}
183195
}
184196
return unmarshalledObject;
185197
}

‎sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/ServiceManagedEc2FleetConfigurationMarshaller.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,17 @@ public void Marshall(ServiceManagedEc2FleetConfiguration requestObject, JsonMars
7676
context.Writer.Write(requestObject.StorageProfileId);
7777
}
7878

79+
if(requestObject.IsSetVpcConfiguration())
80+
{
81+
context.Writer.WritePropertyName("vpcConfiguration");
82+
context.Writer.WriteObjectStart();
83+
84+
var marshaller = VpcConfigurationMarshaller.Instance;
85+
marshaller.Marshall(requestObject.VpcConfiguration, context);
86+
87+
context.Writer.WriteObjectEnd();
88+
}
89+
7990
}
8091

8192
/// <summary>

‎sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/ServiceManagedEc2FleetConfigurationUnmarshaller.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ public ServiceManagedEc2FleetConfiguration Unmarshall(JsonUnmarshallerContext co
8484
unmarshalledObject.StorageProfileId = unmarshaller.Unmarshall(context);
8585
continue;
8686
}
87+
if (context.TestExpression("vpcConfiguration", targetDepth))
88+
{
89+
var unmarshaller = VpcConfigurationUnmarshaller.Instance;
90+
unmarshalledObject.VpcConfiguration = unmarshaller.Unmarshall(context);
91+
continue;
92+
}
8793
}
8894
return unmarshalledObject;
8995
}

‎sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/StepSearchSummaryUnmarshaller.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ public StepSearchSummary Unmarshall(JsonUnmarshallerContext context)
7272
unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context);
7373
continue;
7474
}
75+
if (context.TestExpression("createdBy", targetDepth))
76+
{
77+
var unmarshaller = StringUnmarshaller.Instance;
78+
unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context);
79+
continue;
80+
}
7581
if (context.TestExpression("endedAt", targetDepth))
7682
{
7783
var unmarshaller = DateTimeUnmarshaller.Instance;
@@ -150,6 +156,18 @@ public StepSearchSummary Unmarshall(JsonUnmarshallerContext context)
150156
unmarshalledObject.TaskRunStatusCounts = unmarshaller.Unmarshall(context);
151157
continue;
152158
}
159+
if (context.TestExpression("updatedAt", targetDepth))
160+
{
161+
var unmarshaller = DateTimeUnmarshaller.Instance;
162+
unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context);
163+
continue;
164+
}
165+
if (context.TestExpression("updatedBy", targetDepth))
166+
{
167+
var unmarshaller = StringUnmarshaller.Instance;
168+
unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context);
169+
continue;
170+
}
153171
}
154172
return unmarshalledObject;
155173
}

‎sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/TaskSearchSummaryUnmarshaller.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ public TaskSearchSummary Unmarshall(JsonUnmarshallerContext context)
126126
unmarshalledObject.TaskId = unmarshaller.Unmarshall(context);
127127
continue;
128128
}
129+
if (context.TestExpression("updatedAt", targetDepth))
130+
{
131+
var unmarshaller = DateTimeUnmarshaller.Instance;
132+
unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context);
133+
continue;
134+
}
135+
if (context.TestExpression("updatedBy", targetDepth))
136+
{
137+
var unmarshaller = StringUnmarshaller.Instance;
138+
unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context);
139+
continue;
140+
}
129141
}
130142
return unmarshalledObject;
131143
}

0 commit comments

Comments
 (0)