Skip to content

Commit d80f718

Browse files
author
AWS
committed
Amazon GuardDuty Update: Support for tagging functionality in Create and Get operations for Detector, IP Set, Threat Intel Set, and Finding Filter resources and 3 new tagging APIs: ListTagsForResource, TagResource, and UntagResource.
1 parent 586279c commit d80f718

File tree

3 files changed

+203
-7
lines changed

3 files changed

+203
-7
lines changed

‎.changes/next-release/feature-AmazonGuardDuty-2ed75df.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"type": "feature",
3+
"category": "Amazon GuardDuty",
4+
"description": "Support for tagging functionality in Create and Get operations for Detector, IP Set, Threat Intel Set, and Finding Filter resources and 3 new tagging APIs: ListTagsForResource, TagResource, and UntagResource."
5+
}

‎services/guardduty/src/main/resources/codegen-resources/paginators-1.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,44 @@
33
"ListDetectors": {
44
"input_token": "NextToken",
55
"output_token": "NextToken",
6-
"limit_key": "MaxResults"
6+
"limit_key": "MaxResults",
7+
"result_key": "DetectorIds"
78
},
89
"ListFilters": {
910
"input_token": "NextToken",
1011
"output_token": "NextToken",
11-
"limit_key": "MaxResults"
12+
"limit_key": "MaxResults",
13+
"result_key": "FilterNames"
1214
},
1315
"ListFindings": {
1416
"input_token": "NextToken",
1517
"output_token": "NextToken",
16-
"limit_key": "MaxResults"
18+
"limit_key": "MaxResults",
19+
"result_key": "FindingIds"
1720
},
1821
"ListIPSets": {
1922
"input_token": "NextToken",
2023
"output_token": "NextToken",
21-
"limit_key": "MaxResults"
24+
"limit_key": "MaxResults",
25+
"result_key": "IpSetIds"
2226
},
2327
"ListInvitations": {
2428
"input_token": "NextToken",
2529
"output_token": "NextToken",
26-
"limit_key": "MaxResults"
30+
"limit_key": "MaxResults",
31+
"result_key": "Invitations"
2732
},
2833
"ListMembers": {
2934
"input_token": "NextToken",
3035
"output_token": "NextToken",
31-
"limit_key": "MaxResults"
36+
"limit_key": "MaxResults",
37+
"result_key": "Members"
3238
},
3339
"ListThreatIntelSets": {
3440
"input_token": "NextToken",
3541
"output_token": "NextToken",
36-
"limit_key": "MaxResults"
42+
"limit_key": "MaxResults",
43+
"result_key": "ThreatIntelSetIds"
3744
}
3845
}
3946
}

‎services/guardduty/src/main/resources/codegen-resources/service-2.json

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,21 @@
507507
],
508508
"documentation":"<p>Lists details about all member accounts for the current GuardDuty master account.</p>"
509509
},
510+
"ListTagsForResource":{
511+
"name":"ListTagsForResource",
512+
"http":{
513+
"method":"GET",
514+
"requestUri":"/tags/{resourceArn}",
515+
"responseCode":200
516+
},
517+
"input":{"shape":"ListTagsForResourceRequest"},
518+
"output":{"shape":"ListTagsForResourceResponse"},
519+
"errors":[
520+
{"shape":"BadRequestException"},
521+
{"shape":"InternalServerErrorException"}
522+
],
523+
"documentation":"<p>Lists tags for a resource. Tagging is currently supported for detectors, finding filters, IP sets, and Threat Intel sets, with a limit of 50 tags per resource. When invoked, this operation returns all assigned tags for a given resource..</p>"
524+
},
510525
"ListThreatIntelSets":{
511526
"name":"ListThreatIntelSets",
512527
"http":{
@@ -552,6 +567,21 @@
552567
],
553568
"documentation":"<p>Disables GuardDuty from monitoring findings of the member accounts specified by the account IDs. After running this command, a master GuardDuty account can run StartMonitoringMembers to re-enable GuardDuty to monitor these members’ findings.</p>"
554569
},
570+
"TagResource":{
571+
"name":"TagResource",
572+
"http":{
573+
"method":"POST",
574+
"requestUri":"/tags/{resourceArn}",
575+
"responseCode":204
576+
},
577+
"input":{"shape":"TagResourceRequest"},
578+
"output":{"shape":"TagResourceResponse"},
579+
"errors":[
580+
{"shape":"BadRequestException"},
581+
{"shape":"InternalServerErrorException"}
582+
],
583+
"documentation":"<p>Adds tags to a resource.</p>"
584+
},
555585
"UnarchiveFindings":{
556586
"name":"UnarchiveFindings",
557587
"http":{
@@ -567,6 +597,21 @@
567597
],
568598
"documentation":"<p>Unarchives Amazon GuardDuty findings specified by the list of finding IDs.</p>"
569599
},
600+
"UntagResource":{
601+
"name":"UntagResource",
602+
"http":{
603+
"method":"DELETE",
604+
"requestUri":"/tags/{resourceArn}",
605+
"responseCode":204
606+
},
607+
"input":{"shape":"UntagResourceRequest"},
608+
"output":{"shape":"UntagResourceResponse"},
609+
"errors":[
610+
{"shape":"BadRequestException"},
611+
{"shape":"InternalServerErrorException"}
612+
],
613+
"documentation":"<p>Removes tags from a resource.</p>"
614+
},
570615
"UpdateDetector":{
571616
"name":"UpdateDetector",
572617
"http":{
@@ -963,6 +1008,11 @@
9631008
"shape":"FindingPublishingFrequency",
9641009
"documentation":"<p>A enum value that specifies how frequently customer got Finding updates published.</p>",
9651010
"locationName":"findingPublishingFrequency"
1011+
},
1012+
"Tags":{
1013+
"shape":"TagMap",
1014+
"documentation":"<p>The tags to be added to a new detector resource.</p>",
1015+
"locationName":"tags"
9661016
}
9671017
}
9681018
},
@@ -1020,6 +1070,11 @@
10201070
"documentation":"<p>The idempotency token for the create request.</p>",
10211071
"idempotencyToken":true,
10221072
"locationName":"clientToken"
1073+
},
1074+
"Tags":{
1075+
"shape":"TagMap",
1076+
"documentation":"<p>The tags to be added to a new filter resource.</p>",
1077+
"locationName":"tags"
10231078
}
10241079
}
10251080
},
@@ -1075,6 +1130,11 @@
10751130
"documentation":"<p>The idempotency token for the create request.</p>",
10761131
"idempotencyToken":true,
10771132
"locationName":"clientToken"
1133+
},
1134+
"Tags":{
1135+
"shape":"TagMap",
1136+
"documentation":"<p>The tags to be added to a new IP set resource.</p>",
1137+
"locationName":"tags"
10781138
}
10791139
}
10801140
},
@@ -1183,6 +1243,11 @@
11831243
"documentation":"<p>The idempotency token for the create request.</p>",
11841244
"idempotencyToken":true,
11851245
"locationName":"clientToken"
1246+
},
1247+
"Tags":{
1248+
"shape":"TagMap",
1249+
"documentation":"<p>The tags to be added to a new Threat List resource.</p>",
1250+
"locationName":"tags"
11861251
}
11871252
}
11881253
},
@@ -1727,6 +1792,11 @@
17271792
"shape":"String",
17281793
"documentation":"<p>Detector last update timestamp.</p>",
17291794
"locationName":"updatedAt"
1795+
},
1796+
"Tags":{
1797+
"shape":"TagMap",
1798+
"documentation":"<p>The tags of the detector resource.</p>",
1799+
"locationName":"tags"
17301800
}
17311801
}
17321802
},
@@ -1783,6 +1853,11 @@
17831853
"shape":"FindingCriteria",
17841854
"documentation":"<p>Represents the criteria to be used in the filter for querying findings.</p>",
17851855
"locationName":"findingCriteria"
1856+
},
1857+
"Tags":{
1858+
"shape":"TagMap",
1859+
"documentation":"<p>The tags of the filter resource.</p>",
1860+
"locationName":"tags"
17861861
}
17871862
}
17881863
},
@@ -1907,6 +1982,11 @@
19071982
"shape":"IpSetStatus",
19081983
"documentation":"<p>The status of ipSet file uploaded.</p>",
19091984
"locationName":"status"
1985+
},
1986+
"Tags":{
1987+
"shape":"TagMap",
1988+
"documentation":"<p>The tags of the IP set resource.</p>",
1989+
"locationName":"tags"
19101990
}
19111991
}
19121992
},
@@ -2036,9 +2116,18 @@
20362116
"shape":"ThreatIntelSetStatus",
20372117
"documentation":"<p>The status of threatIntelSet file uploaded.</p>",
20382118
"locationName":"status"
2119+
},
2120+
"Tags":{
2121+
"shape":"TagMap",
2122+
"documentation":"<p>The tags of the Threat List resource.</p>",
2123+
"locationName":"tags"
20392124
}
20402125
}
20412126
},
2127+
"GuardDutyArn":{
2128+
"type":"string",
2129+
"pattern":"^arn:[A-Za-z_.-]{1,20}:guardduty:[A-Za-z0-9_/.-]{0,63}:\\d+:detector/[A-Za-z0-9_/.-]{32,264}$"
2130+
},
20422131
"IamInstanceProfile":{
20432132
"type":"structure",
20442133
"members":{
@@ -2485,6 +2574,27 @@
24852574
}
24862575
}
24872576
},
2577+
"ListTagsForResourceRequest":{
2578+
"type":"structure",
2579+
"required":["ResourceArn"],
2580+
"members":{
2581+
"ResourceArn":{
2582+
"shape":"GuardDutyArn",
2583+
"documentation":"<p>The Amazon Resource Name (ARN) for the given GuardDuty resource </p>",
2584+
"location":"uri",
2585+
"locationName":"resourceArn"
2586+
}
2587+
}
2588+
},
2589+
"ListTagsForResourceResponse":{
2590+
"type":"structure",
2591+
"members":{
2592+
"Tags":{
2593+
"shape":"TagMap",
2594+
"locationName":"tags"
2595+
}
2596+
}
2597+
},
24882598
"ListThreatIntelSetsRequest":{
24892599
"type":"structure",
24902600
"required":["DetectorId"],
@@ -3067,6 +3177,54 @@
30673177
}
30683178
}
30693179
},
3180+
"TagKey":{
3181+
"type":"string",
3182+
"max":128,
3183+
"min":1,
3184+
"pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$"
3185+
},
3186+
"TagKeyList":{
3187+
"type":"list",
3188+
"member":{"shape":"TagKey"},
3189+
"max":200,
3190+
"min":1
3191+
},
3192+
"TagMap":{
3193+
"type":"map",
3194+
"key":{"shape":"TagKey"},
3195+
"value":{"shape":"TagValue"},
3196+
"max":200,
3197+
"min":1
3198+
},
3199+
"TagResourceRequest":{
3200+
"type":"structure",
3201+
"required":[
3202+
"ResourceArn",
3203+
"Tags"
3204+
],
3205+
"members":{
3206+
"ResourceArn":{
3207+
"shape":"GuardDutyArn",
3208+
"documentation":"<p>The Amazon Resource Name (ARN) for the given GuardDuty resource </p>",
3209+
"location":"uri",
3210+
"locationName":"resourceArn"
3211+
},
3212+
"Tags":{
3213+
"shape":"TagMap",
3214+
"documentation":"<p>The tags to be added to a resource.</p>",
3215+
"locationName":"tags"
3216+
}
3217+
}
3218+
},
3219+
"TagResourceResponse":{
3220+
"type":"structure",
3221+
"members":{
3222+
}
3223+
},
3224+
"TagValue":{
3225+
"type":"string",
3226+
"max":256
3227+
},
30703228
"Tags":{
30713229
"type":"list",
30723230
"member":{"shape":"Tag"}
@@ -3154,6 +3312,32 @@
31543312
"max":50,
31553313
"min":0
31563314
},
3315+
"UntagResourceRequest":{
3316+
"type":"structure",
3317+
"required":[
3318+
"ResourceArn",
3319+
"TagKeys"
3320+
],
3321+
"members":{
3322+
"ResourceArn":{
3323+
"shape":"GuardDutyArn",
3324+
"documentation":"<p>The Amazon Resource Name (ARN) for the given GuardDuty resource </p>",
3325+
"location":"uri",
3326+
"locationName":"resourceArn"
3327+
},
3328+
"TagKeys":{
3329+
"shape":"TagKeyList",
3330+
"documentation":"<p>The tag keys to remove from a resource.</p>",
3331+
"location":"querystring",
3332+
"locationName":"tagKeys"
3333+
}
3334+
}
3335+
},
3336+
"UntagResourceResponse":{
3337+
"type":"structure",
3338+
"members":{
3339+
}
3340+
},
31573341
"UpdateDetectorRequest":{
31583342
"type":"structure",
31593343
"required":["DetectorId"],

0 commit comments

Comments
 (0)