Skip to content

Commit c4d8d58

Browse files
Support tagging Agents and adjust input field validations
1 parent 96dd785 commit c4d8d58

File tree

66 files changed

+464
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+464
-225
lines changed

generator/ServiceModels/groundstation/groundstation-2019-05-23.api.json

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@
675675
"CapabilityHealth":{
676676
"type":"string",
677677
"enum":[
678-
"UNHEALTHY",
679-
"HEALTHY"
678+
"HEALTHY",
679+
"UNHEALTHY"
680680
]
681681
},
682682
"CapabilityHealthReason":{
@@ -742,15 +742,20 @@
742742
"max":20,
743743
"min":1
744744
},
745-
"ConfigArn":{"type":"string"},
745+
"ConfigArn":{
746+
"type":"string",
747+
"max":424,
748+
"min":82,
749+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:config/[a-z0-9]+(-[a-z0-9]+){0,4}/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}(/.{1,256})?$"
750+
},
746751
"ConfigCapabilityType":{
747752
"type":"string",
748753
"enum":[
749754
"antenna-downlink",
750755
"antenna-downlink-demod-decode",
751-
"antenna-uplink",
752-
"dataflow-endpoint",
753756
"tracking",
757+
"dataflow-endpoint",
758+
"antenna-uplink",
754759
"uplink-echo",
755760
"s3-recording"
756761
]
@@ -839,19 +844,19 @@
839844
"ContactStatus":{
840845
"type":"string",
841846
"enum":[
842-
"AVAILABLE",
843-
"AWS_CANCELLED",
844-
"AWS_FAILED",
845-
"CANCELLED",
846-
"CANCELLING",
847-
"COMPLETED",
848-
"FAILED",
847+
"SCHEDULING",
849848
"FAILED_TO_SCHEDULE",
849+
"SCHEDULED",
850+
"CANCELLED",
851+
"AWS_CANCELLED",
852+
"PREPASS",
850853
"PASS",
851854
"POSTPASS",
852-
"PREPASS",
853-
"SCHEDULED",
854-
"SCHEDULING"
855+
"COMPLETED",
856+
"FAILED",
857+
"AVAILABLE",
858+
"CANCELLING",
859+
"AWS_FAILED"
855860
]
856861
},
857862
"CreateConfigRequest":{
@@ -916,9 +921,9 @@
916921
"Criticality":{
917922
"type":"string",
918923
"enum":[
924+
"REQUIRED",
919925
"PREFERRED",
920-
"REMOVED",
921-
"REQUIRED"
926+
"REMOVED"
922927
]
923928
},
924929
"CustomerEphemerisPriority":{
@@ -964,7 +969,12 @@
964969
"dataflowEndpointRegion":{"shape":"String"}
965970
}
966971
},
967-
"DataflowEndpointGroupArn":{"type":"string"},
972+
"DataflowEndpointGroupArn":{
973+
"type":"string",
974+
"max":146,
975+
"min":97,
976+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:dataflow-endpoint-group/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
977+
},
968978
"DataflowEndpointGroupDurationInSeconds":{
969979
"type":"integer",
970980
"box":true,
@@ -1568,13 +1578,13 @@
15681578
"type":"string",
15691579
"max":8192,
15701580
"min":2,
1571-
"pattern":"^[{}\\[\\]:.,\"0-9A-z\\-_\\s]{2,8192}$"
1581+
"pattern":"^[{}\\[\\]:.,\"0-9A-Za-z\\-_\\s]{2,8192}$"
15721582
},
15731583
"KeyAliasArn":{
15741584
"type":"string",
15751585
"max":512,
15761586
"min":1,
1577-
"pattern":"^arn:aws[a-zA-Z-]{0,16}:kms:[a-z]{2}(-[a-z]{1,16}){1,3}-\\d{1}:\\d{12}:((alias/[a-zA-Z0-9:/_-]{1,256}))$"
1587+
"pattern":"^arn:aws[a-zA-Z-]{0,16}:kms:[-a-z0-9]{1,50}:[0-9]{12}:((alias/[a-zA-Z0-9:/_-]{1,256}))$"
15781588
},
15791589
"KeyAliasName":{
15801590
"type":"string",
@@ -1784,7 +1794,12 @@
17841794
"type":"long",
17851795
"box":true
17861796
},
1787-
"MissionProfileArn":{"type":"string"},
1797+
"MissionProfileArn":{
1798+
"type":"string",
1799+
"max":138,
1800+
"min":89,
1801+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:mission-profile/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
1802+
},
17881803
"MissionProfileIdResponse":{
17891804
"type":"structure",
17901805
"members":{
@@ -1821,7 +1836,7 @@
18211836
"type":"integer",
18221837
"box":true,
18231838
"max":100,
1824-
"min":0
1839+
"min":1
18251840
},
18261841
"PaginationToken":{
18271842
"type":"string",
@@ -1832,9 +1847,9 @@
18321847
"Polarization":{
18331848
"type":"string",
18341849
"enum":[
1850+
"RIGHT_HAND",
18351851
"LEFT_HAND",
1836-
"NONE",
1837-
"RIGHT_HAND"
1852+
"NONE"
18381853
]
18391854
},
18401855
"PositiveDurationInSeconds":{
@@ -1876,7 +1891,8 @@
18761891
],
18771892
"members":{
18781893
"agentDetails":{"shape":"AgentDetails"},
1879-
"discoveryData":{"shape":"DiscoveryData"}
1894+
"discoveryData":{"shape":"DiscoveryData"},
1895+
"tags":{"shape":"TagsMap"}
18801896
}
18811897
},
18821898
"RegisterAgentResponse":{
@@ -2286,8 +2302,8 @@
22862302
},
22872303
"Uuid":{
22882304
"type":"string",
2289-
"max":128,
2290-
"min":1,
2305+
"max":36,
2306+
"min":36,
22912307
"pattern":"^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
22922308
},
22932309
"VersionString":{
@@ -2313,6 +2329,11 @@
23132329
"max":99999,
23142330
"min":0
23152331
},
2316-
"satelliteArn":{"type":"string"}
2332+
"satelliteArn":{
2333+
"type":"string",
2334+
"max":132,
2335+
"min":82,
2336+
"pattern":"^arn:aws:groundstation:([-a-z0-9]{1,50})?:[0-9]{12}:satellite/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
2337+
}
23172338
}
23182339
}

generator/ServiceModels/groundstation/groundstation-2019-05-23.docs.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@
531531
"EndpointDetailsList": {
532532
"base": null,
533533
"refs": {
534-
"CreateDataflowEndpointGroupRequest$endpointDetails": "<p>Endpoint details of each endpoint in the dataflow endpoint group.</p>",
534+
"CreateDataflowEndpointGroupRequest$endpointDetails": "<p>Endpoint details of each endpoint in the dataflow endpoint group. <pre><code> All dataflow endpoints within a single dataflow endpoint group must be of the same type. You cannot mix &lt;a href=&quot;https://docs.aws.amazon.com/ground-station/latest/APIReference/API_AwsGroundStationAgentEndpoint.html&quot;&gt; AWS Ground Station Agent endpoints&lt;/a&gt; with &lt;a href=&quot;https://docs.aws.amazon.com/ground-station/latest/APIReference/API_DataflowEndpoint.html&quot;&gt;Dataflow endpoints&lt;/a&gt; in the same group. If your use case requires both types of endpoints, you must create separate dataflow endpoint groups for each type. &lt;/p&gt; </code></pre>",
535535
"GetDataflowEndpointGroupResponse$endpointsDetails": "<p>Details of a dataflow endpoint.</p>"
536536
}
537537
},
@@ -804,7 +804,7 @@
804804
}
805805
},
806806
"KmsKey": {
807-
"base": "<p>AWS Key Management Service (KMS) Key.</p>",
807+
"base": "<p>KMS key info.</p>",
808808
"refs": {
809809
"CreateMissionProfileRequest$streamsKmsKey": "<p>KMS key to use for encrypting streams.</p>",
810810
"GetMissionProfileResponse$streamsKmsKey": "<p>KMS key to use for encrypting streams.</p>",
@@ -1249,6 +1249,7 @@
12491249
"GetDataflowEndpointGroupResponse$tags": "<p>Tags assigned to a dataflow endpoint group.</p>",
12501250
"GetMissionProfileResponse$tags": "<p>Tags assigned to a mission profile.</p>",
12511251
"ListTagsForResourceResponse$tags": "<p>Tags assigned to a resource.</p>",
1252+
"RegisterAgentRequest$tags": "<p>Tags assigned to an <code>Agent</code>.</p>",
12521253
"ReserveContactRequest$tags": "<p>Tags assigned to a contact.</p>",
12531254
"TagResourceRequest$tags": "<p>Tags assigned to a resource.</p>"
12541255
}

generator/ServiceModels/groundstation/groundstation-2019-05-23.normal.json

Lines changed: 53 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,8 @@
780780
"CapabilityHealth":{
781781
"type":"string",
782782
"enum":[
783-
"UNHEALTHY",
784-
"HEALTHY"
783+
"HEALTHY",
784+
"UNHEALTHY"
785785
]
786786
},
787787
"CapabilityHealthReason":{
@@ -876,15 +876,20 @@
876876
"max":20,
877877
"min":1
878878
},
879-
"ConfigArn":{"type":"string"},
879+
"ConfigArn":{
880+
"type":"string",
881+
"max":424,
882+
"min":82,
883+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:config/[a-z0-9]+(-[a-z0-9]+){0,4}/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}(/.{1,256})?$"
884+
},
880885
"ConfigCapabilityType":{
881886
"type":"string",
882887
"enum":[
883888
"antenna-downlink",
884889
"antenna-downlink-demod-decode",
885-
"antenna-uplink",
886-
"dataflow-endpoint",
887890
"tracking",
891+
"dataflow-endpoint",
892+
"antenna-uplink",
888893
"uplink-echo",
889894
"s3-recording"
890895
]
@@ -1082,19 +1087,19 @@
10821087
"ContactStatus":{
10831088
"type":"string",
10841089
"enum":[
1085-
"AVAILABLE",
1086-
"AWS_CANCELLED",
1087-
"AWS_FAILED",
1088-
"CANCELLED",
1089-
"CANCELLING",
1090-
"COMPLETED",
1091-
"FAILED",
1090+
"SCHEDULING",
10921091
"FAILED_TO_SCHEDULE",
1092+
"SCHEDULED",
1093+
"CANCELLED",
1094+
"AWS_CANCELLED",
1095+
"PREPASS",
10931096
"PASS",
10941097
"POSTPASS",
1095-
"PREPASS",
1096-
"SCHEDULED",
1097-
"SCHEDULING"
1098+
"COMPLETED",
1099+
"FAILED",
1100+
"AVAILABLE",
1101+
"CANCELLING",
1102+
"AWS_FAILED"
10981103
]
10991104
},
11001105
"CreateConfigRequest":{
@@ -1133,7 +1138,7 @@
11331138
},
11341139
"endpointDetails":{
11351140
"shape":"EndpointDetailsList",
1136-
"documentation":"<p>Endpoint details of each endpoint in the dataflow endpoint group.</p>"
1141+
"documentation":"<p>Endpoint details of each endpoint in the dataflow endpoint group. <pre><code> All dataflow endpoints within a single dataflow endpoint group must be of the same type. You cannot mix &lt;a href=&quot;https://docs.aws.amazon.com/ground-station/latest/APIReference/API_AwsGroundStationAgentEndpoint.html&quot;&gt; AWS Ground Station Agent endpoints&lt;/a&gt; with &lt;a href=&quot;https://docs.aws.amazon.com/ground-station/latest/APIReference/API_DataflowEndpoint.html&quot;&gt;Dataflow endpoints&lt;/a&gt; in the same group. If your use case requires both types of endpoints, you must create separate dataflow endpoint groups for each type. &lt;/p&gt; </code></pre>"
11371142
},
11381143
"tags":{
11391144
"shape":"TagsMap",
@@ -1234,9 +1239,9 @@
12341239
"Criticality":{
12351240
"type":"string",
12361241
"enum":[
1242+
"REQUIRED",
12371243
"PREFERRED",
1238-
"REMOVED",
1239-
"REQUIRED"
1244+
"REMOVED"
12401245
]
12411246
},
12421247
"CustomerEphemerisPriority":{
@@ -1306,7 +1311,12 @@
13061311
},
13071312
"documentation":"<p>Information about the dataflow endpoint <code>Config</code>.</p>"
13081313
},
1309-
"DataflowEndpointGroupArn":{"type":"string"},
1314+
"DataflowEndpointGroupArn":{
1315+
"type":"string",
1316+
"max":146,
1317+
"min":97,
1318+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:dataflow-endpoint-group/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
1319+
},
13101320
"DataflowEndpointGroupDurationInSeconds":{
13111321
"type":"integer",
13121322
"box":true,
@@ -2288,13 +2298,13 @@
22882298
"type":"string",
22892299
"max":8192,
22902300
"min":2,
2291-
"pattern":"^[{}\\[\\]:.,\"0-9A-z\\-_\\s]{2,8192}$"
2301+
"pattern":"^[{}\\[\\]:.,\"0-9A-Za-z\\-_\\s]{2,8192}$"
22922302
},
22932303
"KeyAliasArn":{
22942304
"type":"string",
22952305
"max":512,
22962306
"min":1,
2297-
"pattern":"^arn:aws[a-zA-Z-]{0,16}:kms:[a-z]{2}(-[a-z]{1,16}){1,3}-\\d{1}:\\d{12}:((alias/[a-zA-Z0-9:/_-]{1,256}))$"
2307+
"pattern":"^arn:aws[a-zA-Z-]{0,16}:kms:[-a-z0-9]{1,50}:[0-9]{12}:((alias/[a-zA-Z0-9:/_-]{1,256}))$"
22982308
},
22992309
"KeyAliasName":{
23002310
"type":"string",
@@ -2319,7 +2329,7 @@
23192329
"documentation":"<p>KMS Key Arn.</p>"
23202330
}
23212331
},
2322-
"documentation":"<p>AWS Key Management Service (KMS) Key.</p>",
2332+
"documentation":"<p>KMS key info.</p>",
23232333
"union":true
23242334
},
23252335
"ListConfigsRequest":{
@@ -2623,7 +2633,12 @@
26232633
"type":"long",
26242634
"box":true
26252635
},
2626-
"MissionProfileArn":{"type":"string"},
2636+
"MissionProfileArn":{
2637+
"type":"string",
2638+
"max":138,
2639+
"min":89,
2640+
"pattern":"^arn:aws:groundstation:[-a-z0-9]{1,50}:[0-9]{12}:mission-profile/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
2641+
},
26272642
"MissionProfileIdResponse":{
26282643
"type":"structure",
26292644
"members":{
@@ -2684,7 +2699,7 @@
26842699
"type":"integer",
26852700
"box":true,
26862701
"max":100,
2687-
"min":0
2702+
"min":1
26882703
},
26892704
"PaginationToken":{
26902705
"type":"string",
@@ -2695,9 +2710,9 @@
26952710
"Polarization":{
26962711
"type":"string",
26972712
"enum":[
2713+
"RIGHT_HAND",
26982714
"LEFT_HAND",
2699-
"NONE",
2700-
"RIGHT_HAND"
2715+
"NONE"
27012716
]
27022717
},
27032718
"PositiveDurationInSeconds":{
@@ -2759,6 +2774,10 @@
27592774
"discoveryData":{
27602775
"shape":"DiscoveryData",
27612776
"documentation":"<p>Data for associating an agent with the capabilities it is managing.</p>"
2777+
},
2778+
"tags":{
2779+
"shape":"TagsMap",
2780+
"documentation":"<p>Tags assigned to an <code>Agent</code>.</p>"
27622781
}
27632782
}
27642783
},
@@ -3389,8 +3408,8 @@
33893408
},
33903409
"Uuid":{
33913410
"type":"string",
3392-
"max":128,
3393-
"min":1,
3411+
"max":36,
3412+
"min":36,
33943413
"pattern":"^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
33953414
},
33963415
"VersionString":{
@@ -3416,7 +3435,12 @@
34163435
"max":99999,
34173436
"min":0
34183437
},
3419-
"satelliteArn":{"type":"string"}
3438+
"satelliteArn":{
3439+
"type":"string",
3440+
"max":132,
3441+
"min":82,
3442+
"pattern":"^arn:aws:groundstation:([-a-z0-9]{1,50})?:[0-9]{12}:satellite/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
3443+
}
34203444
},
34213445
"documentation":"<p>Welcome to the AWS Ground Station API Reference. AWS Ground Station is a fully managed service that enables you to control satellite communications, downlink and process satellite data, and scale your satellite operations efficiently and cost-effectively without having to build or manage your own ground station infrastructure.</p>"
34223446
}

0 commit comments

Comments
 (0)