Skip to content

Commit adae33e

Browse files
test and verified, safe to release
1 parent 5c629d6 commit adae33e

File tree

9 files changed

+70
-118
lines changed

9 files changed

+70
-118
lines changed

generator/ServiceModels/wafv2/wafv2-2019-07-29.api.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@
11051105
"AttributeValues":{
11061106
"type":"list",
11071107
"member":{"shape":"AttributeValue"},
1108-
"max":10,
1108+
"max":50,
11091109
"min":1
11101110
},
11111111
"BlockAction":{
@@ -4336,7 +4336,8 @@
43364336
"ChallengeConfig":{"shape":"ChallengeConfig"},
43374337
"TokenDomains":{"shape":"TokenDomains"},
43384338
"AssociationConfig":{"shape":"AssociationConfig"},
4339-
"OnSourceDDoSProtectionConfig":{"shape":"OnSourceDDoSProtectionConfig"}
4339+
"OnSourceDDoSProtectionConfig":{"shape":"OnSourceDDoSProtectionConfig"},
4340+
"ApplicationConfig":{"shape":"ApplicationConfig"}
43404341
}
43414342
},
43424343
"UpdateWebACLResponse":{

generator/ServiceModels/wafv2/wafv2-2019-07-29.docs.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@
195195
"base": "<p>A list of <code>ApplicationAttribute</code>s that contains information about the application.</p>",
196196
"refs": {
197197
"CreateWebACLRequest$ApplicationConfig": "<p>Configures the ability for the WAF console to store and retrieve application attributes during the web ACL creation process. Application attributes help WAF give recommendations for protection packs.</p>",
198+
"UpdateWebACLRequest$ApplicationConfig": "<p>Configures the ability for the WAF console to store and retrieve application attributes. Application attributes help WAF give recommendations for protection packs.</p> <p>When using <code>UpdateWebACL</code>, <code>ApplicationConfig</code> follows these rules:</p> <ul> <li> <p>If you omit <code>ApplicationConfig</code> from the request, all existing entries in the web ACL are retained.</p> </li> <li> <p>If you include <code>ApplicationConfig</code>, entries must match the existing values exactly. Any attempt to modify existing entries will result in an error.</p> </li> </ul>",
198199
"WebACL$ApplicationConfig": "<p>Returns a list of <code>ApplicationAttribute</code>s.</p>"
199200
}
200201
},
@@ -774,7 +775,7 @@
774775
"RegexPatternSet$Name": "<p>The name of the set. You cannot change the name after you create the set.</p>",
775776
"RegexPatternSetSummary$Name": "<p>The name of the data type instance. You cannot change the name after you create the instance.</p>",
776777
"Rule$Name": "<p>The name of the rule. </p> <p>If you change the name of a <code>Rule</code> after you create it and you want the rule's metric name to reflect the change, update the metric name in the rule's <code>VisibilityConfig</code> settings. WAF doesn't automatically update the metric name when you update the rule name. </p>",
777-
"RuleActionOverride$Name": "<p>The name of the rule to override.</p> <note> <p>Take care to verify the rule names in your overrides. If you provide a rule name that doesn't match the name of any rule in the rule group, WAF doesn't return an error and doesn't apply the override setting.</p> </note>",
778+
"RuleActionOverride$Name": "<p>The name of the rule to override.</p> <note> <p>Verify the rule names in your overrides carefully. With managed rule groups, WAF silently ignores any override that uses an invalid rule name. With customer-owned rule groups, invalid rule names in your overrides will cause web ACL updates to fail. An invalid rule name is any name that doesn't exactly match the case-sensitive name of an existing rule in the rule group.</p> </note>",
778779
"RuleGroup$Name": "<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>",
779780
"RuleGroupSummary$Name": "<p>The name of the data type instance. You cannot change the name after you create the instance.</p>",
780781
"RuleSummary$Name": "<p>The name of the rule. </p>",
@@ -2271,7 +2272,7 @@
22712272
}
22722273
},
22732274
"RuleActionOverride": {
2274-
"base": "<p>Action setting to use in the place of a rule action that is configured inside the rule group. You specify one override for each rule whose action you want to change. </p> <note> <p>Take care to verify the rule names in your overrides. If you provide a rule name that doesn't match the name of any rule in the rule group, WAF doesn't return an error and doesn't apply the override setting.</p> </note> <p>You can use overrides for testing, for example you can override all of rule actions to <code>Count</code> and then monitor the resulting count metrics to understand how the rule group would handle your web traffic. You can also permanently override some or all actions, to modify how the rule group manages your web traffic.</p>",
2275+
"base": "<p>Action setting to use in the place of a rule action that is configured inside the rule group. You specify one override for each rule whose action you want to change. </p> <note> <p>Verify the rule names in your overrides carefully. With managed rule groups, WAF silently ignores any override that uses an invalid rule name. With customer-owned rule groups, invalid rule names in your overrides will cause web ACL updates to fail. An invalid rule name is any name that doesn't exactly match the case-sensitive name of an existing rule in the rule group.</p> </note> <p>You can use overrides for testing, for example you can override all of rule actions to <code>Count</code> and then monitor the resulting count metrics to understand how the rule group would handle your web traffic. You can also permanently override some or all actions, to modify how the rule group manages your web traffic.</p>",
22752276
"refs": {
22762277
"RuleActionOverrides$member": null
22772278
}

generator/ServiceModels/wafv2/wafv2-2019-07-29.endpoint-tests.json

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -754,17 +754,6 @@
754754
"UseDualStack": true
755755
}
756756
},
757-
{
758-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
759-
"expect": {
760-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
761-
},
762-
"params": {
763-
"Region": "us-iso-east-1",
764-
"UseFIPS": true,
765-
"UseDualStack": true
766-
}
767-
},
768757
{
769758
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
770759
"expect": {
@@ -778,17 +767,6 @@
778767
"UseDualStack": false
779768
}
780769
},
781-
{
782-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
783-
"expect": {
784-
"error": "DualStack is enabled but this partition does not support DualStack"
785-
},
786-
"params": {
787-
"Region": "us-iso-east-1",
788-
"UseFIPS": false,
789-
"UseDualStack": true
790-
}
791-
},
792770
{
793771
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
794772
"expect": {
@@ -802,17 +780,6 @@
802780
"UseDualStack": false
803781
}
804782
},
805-
{
806-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
807-
"expect": {
808-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
809-
},
810-
"params": {
811-
"Region": "us-isob-east-1",
812-
"UseFIPS": true,
813-
"UseDualStack": true
814-
}
815-
},
816783
{
817784
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
818785
"expect": {
@@ -826,17 +793,6 @@
826793
"UseDualStack": false
827794
}
828795
},
829-
{
830-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
831-
"expect": {
832-
"error": "DualStack is enabled but this partition does not support DualStack"
833-
},
834-
"params": {
835-
"Region": "us-isob-east-1",
836-
"UseFIPS": false,
837-
"UseDualStack": true
838-
}
839-
},
840796
{
841797
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
842798
"expect": {

generator/ServiceModels/wafv2/wafv2-2019-07-29.normal.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@
12611261
"AttributeValues":{
12621262
"type":"list",
12631263
"member":{"shape":"AttributeValue"},
1264-
"max":10,
1264+
"max":50,
12651265
"min":1
12661266
},
12671267
"BlockAction":{
@@ -5584,14 +5584,14 @@
55845584
"members":{
55855585
"Name":{
55865586
"shape":"EntityName",
5587-
"documentation":"<p>The name of the rule to override.</p> <note> <p>Take care to verify the rule names in your overrides. If you provide a rule name that doesn't match the name of any rule in the rule group, WAF doesn't return an error and doesn't apply the override setting.</p> </note>"
5587+
"documentation":"<p>The name of the rule to override.</p> <note> <p>Verify the rule names in your overrides carefully. With managed rule groups, WAF silently ignores any override that uses an invalid rule name. With customer-owned rule groups, invalid rule names in your overrides will cause web ACL updates to fail. An invalid rule name is any name that doesn't exactly match the case-sensitive name of an existing rule in the rule group.</p> </note>"
55885588
},
55895589
"ActionToUse":{
55905590
"shape":"RuleAction",
55915591
"documentation":"<p>The override action to use, in place of the configured action of the rule in the rule group. </p>"
55925592
}
55935593
},
5594-
"documentation":"<p>Action setting to use in the place of a rule action that is configured inside the rule group. You specify one override for each rule whose action you want to change. </p> <note> <p>Take care to verify the rule names in your overrides. If you provide a rule name that doesn't match the name of any rule in the rule group, WAF doesn't return an error and doesn't apply the override setting.</p> </note> <p>You can use overrides for testing, for example you can override all of rule actions to <code>Count</code> and then monitor the resulting count metrics to understand how the rule group would handle your web traffic. You can also permanently override some or all actions, to modify how the rule group manages your web traffic.</p>"
5594+
"documentation":"<p>Action setting to use in the place of a rule action that is configured inside the rule group. You specify one override for each rule whose action you want to change. </p> <note> <p>Verify the rule names in your overrides carefully. With managed rule groups, WAF silently ignores any override that uses an invalid rule name. With customer-owned rule groups, invalid rule names in your overrides will cause web ACL updates to fail. An invalid rule name is any name that doesn't exactly match the case-sensitive name of an existing rule in the rule group.</p> </note> <p>You can use overrides for testing, for example you can override all of rule actions to <code>Count</code> and then monitor the resulting count metrics to understand how the rule group would handle your web traffic. You can also permanently override some or all actions, to modify how the rule group manages your web traffic.</p>"
55955595
},
55965596
"RuleActionOverrides":{
55975597
"type":"list",
@@ -6450,6 +6450,10 @@
64506450
"OnSourceDDoSProtectionConfig":{
64516451
"shape":"OnSourceDDoSProtectionConfig",
64526452
"documentation":"<p>Specifies the type of DDoS protection to apply to web request data for a web ACL. For most scenarios, it is recommended to use the default protection level, <code>ACTIVE_UNDER_DDOS</code>. If a web ACL is associated with multiple Application Load Balancers, the changes you make to DDoS protection in that web ACL will apply to all associated Application Load Balancers.</p>"
6453+
},
6454+
"ApplicationConfig":{
6455+
"shape":"ApplicationConfig",
6456+
"documentation":"<p>Configures the ability for the WAF console to store and retrieve application attributes. Application attributes help WAF give recommendations for protection packs.</p> <p>When using <code>UpdateWebACL</code>, <code>ApplicationConfig</code> follows these rules:</p> <ul> <li> <p>If you omit <code>ApplicationConfig</code> from the request, all existing entries in the web ACL are retained.</p> </li> <li> <p>If you include <code>ApplicationConfig</code>, entries must match the existing values exactly. Any attempt to modify existing entries will result in an error.</p> </li> </ul>"
64536457
}
64546458
}
64556459
},

sdk/src/Services/WAFV2/Generated/Model/ApplicationAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ internal bool IsSetName()
6363
/// Specifies the attribute value.
6464
/// </para>
6565
/// </summary>
66-
[AWSProperty(Min=1, Max=10)]
66+
[AWSProperty(Min=1, Max=50)]
6767
public List<string> Values
6868
{
6969
get { return this._values; }

sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/UpdateWebACLRequestMarshaller.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ public IRequest Marshall(UpdateWebACLRequest publicRequest)
6969
writer.Validate = false;
7070
writer.WriteObjectStart();
7171
var context = new JsonMarshallerContext(request, writer);
72+
if(publicRequest.IsSetApplicationConfig())
73+
{
74+
context.Writer.WritePropertyName("ApplicationConfig");
75+
context.Writer.WriteObjectStart();
76+
77+
var marshaller = ApplicationConfigMarshaller.Instance;
78+
marshaller.Marshall(publicRequest.ApplicationConfig, context);
79+
80+
context.Writer.WriteObjectEnd();
81+
}
82+
7283
if(publicRequest.IsSetAssociationConfig())
7384
{
7485
context.Writer.WritePropertyName("AssociationConfig");

sdk/src/Services/WAFV2/Generated/Model/RuleActionOverride.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ namespace Amazon.WAFV2.Model
3636
///
3737
/// <note>
3838
/// <para>
39-
/// Take care to verify the rule names in your overrides. If you provide a rule name that
40-
/// doesn't match the name of any rule in the rule group, WAF doesn't return an error
41-
/// and doesn't apply the override setting.
39+
/// Verify the rule names in your overrides carefully. With managed rule groups, WAF silently
40+
/// ignores any override that uses an invalid rule name. With customer-owned rule groups,
41+
/// invalid rule names in your overrides will cause web ACL updates to fail. An invalid
42+
/// rule name is any name that doesn't exactly match the case-sensitive name of an existing
43+
/// rule in the rule group.
4244
/// </para>
4345
/// </note>
4446
/// <para>
@@ -80,9 +82,11 @@ internal bool IsSetActionToUse()
8082
/// </para>
8183
/// <note>
8284
/// <para>
83-
/// Take care to verify the rule names in your overrides. If you provide a rule name that
84-
/// doesn't match the name of any rule in the rule group, WAF doesn't return an error
85-
/// and doesn't apply the override setting.
85+
/// Verify the rule names in your overrides carefully. With managed rule groups, WAF silently
86+
/// ignores any override that uses an invalid rule name. With customer-owned rule groups,
87+
/// invalid rule names in your overrides will cause web ACL updates to fail. An invalid
88+
/// rule name is any name that doesn't exactly match the case-sensitive name of an existing
89+
/// rule in the rule group.
8690
/// </para>
8791
/// </note>
8892
/// </summary>

sdk/src/Services/WAFV2/Generated/Model/UpdateWebACLRequest.cs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ namespace Amazon.WAFV2.Model
107107
/// </summary>
108108
public partial class UpdateWebACLRequest : AmazonWAFV2Request
109109
{
110+
private ApplicationConfig _applicationConfig;
110111
private AssociationConfig _associationConfig;
111112
private CaptchaConfig _captchaConfig;
112113
private ChallengeConfig _challengeConfig;
@@ -123,6 +124,40 @@ public partial class UpdateWebACLRequest : AmazonWAFV2Request
123124
private List<string> _tokenDomains = AWSConfigs.InitializeCollections ? new List<string>() : null;
124125
private VisibilityConfig _visibilityConfig;
125126

127+
/// <summary>
128+
/// Gets and sets the property ApplicationConfig.
129+
/// <para>
130+
/// Configures the ability for the WAF console to store and retrieve application attributes.
131+
/// Application attributes help WAF give recommendations for protection packs.
132+
/// </para>
133+
///
134+
/// <para>
135+
/// When using <c>UpdateWebACL</c>, <c>ApplicationConfig</c> follows these rules:
136+
/// </para>
137+
/// <ul> <li>
138+
/// <para>
139+
/// If you omit <c>ApplicationConfig</c> from the request, all existing entries in the
140+
/// web ACL are retained.
141+
/// </para>
142+
/// </li> <li>
143+
/// <para>
144+
/// If you include <c>ApplicationConfig</c>, entries must match the existing values exactly.
145+
/// Any attempt to modify existing entries will result in an error.
146+
/// </para>
147+
/// </li> </ul>
148+
/// </summary>
149+
public ApplicationConfig ApplicationConfig
150+
{
151+
get { return this._applicationConfig; }
152+
set { this._applicationConfig = value; }
153+
}
154+
155+
// Check to see if ApplicationConfig property is set
156+
internal bool IsSetApplicationConfig()
157+
{
158+
return this._applicationConfig != null;
159+
}
160+
126161
/// <summary>
127162
/// Gets and sets the property AssociationConfig.
128163
/// <para>

0 commit comments

Comments
 (0)