Skip to content

Commit b502991

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Add expectedBucketOwner parameter to ThreatIntel and IPSet APIs.
1 parent d69ea39 commit b502991

24 files changed

+358
-8
lines changed

‎generator/ServiceModels/guardduty/guardduty-2017-11-28.api.json‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
"output":{"shape":"CreateIPSetResponse"},
9898
"errors":[
9999
{"shape":"BadRequestException"},
100-
{"shape":"InternalServerErrorException"}
100+
{"shape":"InternalServerErrorException"},
101+
{"shape":"AccessDeniedException"}
101102
]
102103
},
103104
"CreateMalwareProtectionPlan":{
@@ -169,7 +170,8 @@
169170
"output":{"shape":"CreateThreatIntelSetResponse"},
170171
"errors":[
171172
{"shape":"BadRequestException"},
172-
{"shape":"InternalServerErrorException"}
173+
{"shape":"InternalServerErrorException"},
174+
{"shape":"AccessDeniedException"}
173175
]
174176
},
175177
"DeclineInvitations":{
@@ -978,7 +980,8 @@
978980
"output":{"shape":"UpdateIPSetResponse"},
979981
"errors":[
980982
{"shape":"BadRequestException"},
981-
{"shape":"InternalServerErrorException"}
983+
{"shape":"InternalServerErrorException"},
984+
{"shape":"AccessDeniedException"}
982985
]
983986
},
984987
"UpdateMalwareProtectionPlan":{
@@ -1063,7 +1066,8 @@
10631066
"output":{"shape":"UpdateThreatIntelSetResponse"},
10641067
"errors":[
10651068
{"shape":"BadRequestException"},
1066-
{"shape":"InternalServerErrorException"}
1069+
{"shape":"InternalServerErrorException"},
1070+
{"shape":"AccessDeniedException"}
10671071
]
10681072
}
10691073
},
@@ -2279,6 +2283,10 @@
22792283
"Tags":{
22802284
"shape":"TagMap",
22812285
"locationName":"tags"
2286+
},
2287+
"ExpectedBucketOwner":{
2288+
"shape":"AccountId",
2289+
"locationName":"expectedBucketOwner"
22822290
}
22832291
}
22842292
},
@@ -2477,6 +2485,10 @@
24772485
"Tags":{
24782486
"shape":"TagMap",
24792487
"locationName":"tags"
2488+
},
2489+
"ExpectedBucketOwner":{
2490+
"shape":"AccountId",
2491+
"locationName":"expectedBucketOwner"
24802492
}
24812493
}
24822494
},
@@ -4281,6 +4293,10 @@
42814293
"Tags":{
42824294
"shape":"TagMap",
42834295
"locationName":"tags"
4296+
},
4297+
"ExpectedBucketOwner":{
4298+
"shape":"AccountId",
4299+
"locationName":"expectedBucketOwner"
42844300
}
42854301
}
42864302
},
@@ -4548,6 +4564,10 @@
45484564
"Tags":{
45494565
"shape":"TagMap",
45504566
"locationName":"tags"
4567+
},
4568+
"ExpectedBucketOwner":{
4569+
"shape":"AccountId",
4570+
"locationName":"expectedBucketOwner"
45514571
}
45524572
}
45534573
},
@@ -8591,6 +8611,10 @@
85918611
"Activate":{
85928612
"shape":"Boolean",
85938613
"locationName":"activate"
8614+
},
8615+
"ExpectedBucketOwner":{
8616+
"shape":"AccountId",
8617+
"locationName":"expectedBucketOwner"
85948618
}
85958619
}
85968620
},
@@ -8790,6 +8814,10 @@
87908814
"Activate":{
87918815
"shape":"Boolean",
87928816
"locationName":"activate"
8817+
},
8818+
"ExpectedBucketOwner":{
8819+
"shape":"AccountId",
8820+
"locationName":"expectedBucketOwner"
87938821
}
87948822
}
87958823
},

‎generator/ServiceModels/guardduty/guardduty-2017-11-28.docs.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,18 @@
153153
"AccountIds$member": null,
154154
"Administrator$AccountId": "<p>The ID of the account used as the administrator account.</p>",
155155
"CoverageResource$AccountId": "<p>The unique ID of the Amazon Web Services account.</p>",
156+
"CreateIPSetRequest$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
157+
"CreateThreatIntelSetRequest$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
158+
"GetIPSetResponse$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter. This field appears in the response only if it was provided during IPSet creation or update.</p>",
159+
"GetThreatIntelSetResponse$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter. This field appears in the response only if it was provided during ThreatIntelSet creation or update.</p>",
156160
"Invitation$AccountId": "<p>The ID of the account that the invitation was sent from.</p>",
157161
"Master$AccountId": "<p>The ID of the account used as the administrator account.</p>",
158162
"Member$AccountId": "<p>The ID of the member account.</p>",
159163
"MemberDataSourceConfiguration$AccountId": "<p>The account ID for the member account.</p>",
160164
"Scan$AccountId": "<p>The ID for the account that belongs to the scan.</p>",
161165
"UnprocessedAccount$AccountId": "<p>The Amazon Web Services account ID.</p>",
166+
"UpdateIPSetRequest$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
167+
"UpdateThreatIntelSetRequest$ExpectedBucketOwner": "<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
162168
"UsageAccountResult$AccountId": "<p>The Account ID that generated usage.</p>",
163169
"UsageTopAccountResult$AccountId": "<p>The unique account ID.</p>"
164170
}

‎generator/ServiceModels/guardduty/guardduty-2017-11-28.normal.json‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@
102102
"output":{"shape":"CreateIPSetResponse"},
103103
"errors":[
104104
{"shape":"BadRequestException"},
105-
{"shape":"InternalServerErrorException"}
105+
{"shape":"InternalServerErrorException"},
106+
{"shape":"AccessDeniedException"}
106107
],
107108
"documentation":"<p>Creates a new IPSet, which is called a trusted IP list in the console user interface. An IPSet is a list of IP addresses that are trusted for secure communication with Amazon Web Services infrastructure and applications. GuardDuty doesn't generate findings for IP addresses that are included in IPSets. Only users from the administrator account can use this operation.</p>"
108109
},
@@ -179,7 +180,8 @@
179180
"output":{"shape":"CreateThreatIntelSetResponse"},
180181
"errors":[
181182
{"shape":"BadRequestException"},
182-
{"shape":"InternalServerErrorException"}
183+
{"shape":"InternalServerErrorException"},
184+
{"shape":"AccessDeniedException"}
183185
],
184186
"documentation":"<p>Creates a new ThreatIntelSet. ThreatIntelSets consist of known malicious IP addresses. GuardDuty generates findings based on ThreatIntelSets. Only users of the administrator account can use this operation.</p>"
185187
},
@@ -1045,7 +1047,8 @@
10451047
"output":{"shape":"UpdateIPSetResponse"},
10461048
"errors":[
10471049
{"shape":"BadRequestException"},
1048-
{"shape":"InternalServerErrorException"}
1050+
{"shape":"InternalServerErrorException"},
1051+
{"shape":"AccessDeniedException"}
10491052
],
10501053
"documentation":"<p>Updates the IPSet specified by the IPSet ID.</p>"
10511054
},
@@ -1136,7 +1139,8 @@
11361139
"output":{"shape":"UpdateThreatIntelSetResponse"},
11371140
"errors":[
11381141
{"shape":"BadRequestException"},
1139-
{"shape":"InternalServerErrorException"}
1142+
{"shape":"InternalServerErrorException"},
1143+
{"shape":"AccessDeniedException"}
11401144
],
11411145
"documentation":"<p>Updates the ThreatIntelSet specified by the ThreatIntelSet ID.</p>"
11421146
}
@@ -2566,6 +2570,11 @@
25662570
"shape":"TagMap",
25672571
"documentation":"<p>The tags to be added to a new IP set resource.</p>",
25682572
"locationName":"tags"
2573+
},
2574+
"ExpectedBucketOwner":{
2575+
"shape":"AccountId",
2576+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
2577+
"locationName":"expectedBucketOwner"
25692578
}
25702579
}
25712580
},
@@ -2793,6 +2802,11 @@
27932802
"shape":"TagMap",
27942803
"documentation":"<p>The tags to be added to a new threat list resource.</p>",
27952804
"locationName":"tags"
2805+
},
2806+
"ExpectedBucketOwner":{
2807+
"shape":"AccountId",
2808+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
2809+
"locationName":"expectedBucketOwner"
27962810
}
27972811
}
27982812
},
@@ -4864,6 +4878,11 @@
48644878
"shape":"TagMap",
48654879
"documentation":"<p>The tags of the IPSet resource.</p>",
48664880
"locationName":"tags"
4881+
},
4882+
"ExpectedBucketOwner":{
4883+
"shape":"AccountId",
4884+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter. This field appears in the response only if it was provided during IPSet creation or update.</p>",
4885+
"locationName":"expectedBucketOwner"
48674886
}
48684887
}
48694888
},
@@ -5166,6 +5185,11 @@
51665185
"shape":"TagMap",
51675186
"documentation":"<p>The tags of the threat list resource.</p>",
51685187
"locationName":"tags"
5188+
},
5189+
"ExpectedBucketOwner":{
5190+
"shape":"AccountId",
5191+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter. This field appears in the response only if it was provided during ThreatIntelSet creation or update.</p>",
5192+
"locationName":"expectedBucketOwner"
51695193
}
51705194
}
51715195
},
@@ -9928,6 +9952,11 @@
99289952
"shape":"Boolean",
99299953
"documentation":"<p>The updated Boolean value that specifies whether the IPSet is active or not.</p>",
99309954
"locationName":"activate"
9955+
},
9956+
"ExpectedBucketOwner":{
9957+
"shape":"AccountId",
9958+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
9959+
"locationName":"expectedBucketOwner"
99319960
}
99329961
}
99339962
},
@@ -10156,6 +10185,11 @@
1015610185
"shape":"Boolean",
1015710186
"documentation":"<p>The updated Boolean value that specifies whether the ThreateIntelSet is active or not.</p>",
1015810187
"locationName":"activate"
10188+
},
10189+
"ExpectedBucketOwner":{
10190+
"shape":"AccountId",
10191+
"documentation":"<p>The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the <b>location</b> parameter.</p>",
10192+
"locationName":"expectedBucketOwner"
1015910193
}
1016010194
}
1016110195
},

‎sdk/code-analysis/ServiceAnalysis/GuardDuty/Generated/PropertyValueRules.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
<min>1</min>
7171
<max>300</max>
7272
</property-value-rule>
73+
<property-value-rule>
74+
<property>Amazon.GuardDuty.Model.CreateIPSetRequest.ExpectedBucketOwner</property>
75+
<min>12</min>
76+
<max>12</max>
77+
</property-value-rule>
7378
<property-value-rule>
7479
<property>Amazon.GuardDuty.Model.CreateIPSetRequest.Format</property>
7580
<min>1</min>
@@ -125,6 +130,11 @@
125130
<min>1</min>
126131
<max>300</max>
127132
</property-value-rule>
133+
<property-value-rule>
134+
<property>Amazon.GuardDuty.Model.CreateThreatIntelSetRequest.ExpectedBucketOwner</property>
135+
<min>12</min>
136+
<max>12</max>
137+
</property-value-rule>
128138
<property-value-rule>
129139
<property>Amazon.GuardDuty.Model.CreateThreatIntelSetRequest.Format</property>
130140
<min>1</min>
@@ -285,6 +295,11 @@
285295
<min>1</min>
286296
<max>300</max>
287297
</property-value-rule>
298+
<property-value-rule>
299+
<property>Amazon.GuardDuty.Model.GetIPSetResponse.ExpectedBucketOwner</property>
300+
<min>12</min>
301+
<max>12</max>
302+
</property-value-rule>
288303
<property-value-rule>
289304
<property>Amazon.GuardDuty.Model.GetIPSetResponse.Format</property>
290305
<min>1</min>
@@ -335,6 +350,11 @@
335350
<min>1</min>
336351
<max>300</max>
337352
</property-value-rule>
353+
<property-value-rule>
354+
<property>Amazon.GuardDuty.Model.GetThreatIntelSetResponse.ExpectedBucketOwner</property>
355+
<min>12</min>
356+
<max>12</max>
357+
</property-value-rule>
338358
<property-value-rule>
339359
<property>Amazon.GuardDuty.Model.GetThreatIntelSetResponse.Format</property>
340360
<min>1</min>
@@ -531,6 +551,11 @@
531551
<min>1</min>
532552
<max>300</max>
533553
</property-value-rule>
554+
<property-value-rule>
555+
<property>Amazon.GuardDuty.Model.UpdateIPSetRequest.ExpectedBucketOwner</property>
556+
<min>12</min>
557+
<max>12</max>
558+
</property-value-rule>
534559
<property-value-rule>
535560
<property>Amazon.GuardDuty.Model.UpdateIPSetRequest.Location</property>
536561
<min>1</min>
@@ -566,6 +591,11 @@
566591
<min>1</min>
567592
<max>300</max>
568593
</property-value-rule>
594+
<property-value-rule>
595+
<property>Amazon.GuardDuty.Model.UpdateThreatIntelSetRequest.ExpectedBucketOwner</property>
596+
<min>12</min>
597+
<max>12</max>
598+
</property-value-rule>
569599
<property-value-rule>
570600
<property>Amazon.GuardDuty.Model.UpdateThreatIntelSetRequest.Location</property>
571601
<min>1</min>

‎sdk/src/Services/GuardDuty/Generated/Model/CreateIPSetRequest.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public partial class CreateIPSetRequest : AmazonGuardDutyRequest
4242
private bool? _activate;
4343
private string _clientToken;
4444
private string _detectorId;
45+
private string _expectedBucketOwner;
4546
private IpSetFormat _format;
4647
private string _location;
4748
private string _name;
@@ -111,6 +112,26 @@ internal bool IsSetDetectorId()
111112
return this._detectorId != null;
112113
}
113114

115+
/// <summary>
116+
/// Gets and sets the property ExpectedBucketOwner.
117+
/// <para>
118+
/// The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the
119+
/// <b>location</b> parameter.
120+
/// </para>
121+
/// </summary>
122+
[AWSProperty(Min=12, Max=12)]
123+
public string ExpectedBucketOwner
124+
{
125+
get { return this._expectedBucketOwner; }
126+
set { this._expectedBucketOwner = value; }
127+
}
128+
129+
// Check to see if ExpectedBucketOwner property is set
130+
internal bool IsSetExpectedBucketOwner()
131+
{
132+
return this._expectedBucketOwner != null;
133+
}
134+
114135
/// <summary>
115136
/// Gets and sets the property Format.
116137
/// <para>

‎sdk/src/Services/GuardDuty/Generated/Model/CreateThreatIntelSetRequest.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public partial class CreateThreatIntelSetRequest : AmazonGuardDutyRequest
4040
private bool? _activate;
4141
private string _clientToken;
4242
private string _detectorId;
43+
private string _expectedBucketOwner;
4344
private ThreatIntelSetFormat _format;
4445
private string _location;
4546
private string _name;
@@ -109,6 +110,26 @@ internal bool IsSetDetectorId()
109110
return this._detectorId != null;
110111
}
111112

113+
/// <summary>
114+
/// Gets and sets the property ExpectedBucketOwner.
115+
/// <para>
116+
/// The Amazon Web Services account ID that owns the Amazon S3 bucket specified in the
117+
/// <b>location</b> parameter.
118+
/// </para>
119+
/// </summary>
120+
[AWSProperty(Min=12, Max=12)]
121+
public string ExpectedBucketOwner
122+
{
123+
get { return this._expectedBucketOwner; }
124+
set { this._expectedBucketOwner = value; }
125+
}
126+
127+
// Check to see if ExpectedBucketOwner property is set
128+
internal bool IsSetExpectedBucketOwner()
129+
{
130+
return this._expectedBucketOwner != null;
131+
}
132+
112133
/// <summary>
113134
/// Gets and sets the property Format.
114135
/// <para>

0 commit comments

Comments
 (0)