Skip to content

Commit 4fb4a9c

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Added Org support for notifications: - ListMemberAccounts gets member accounts list, AssociateOrganizationalUnit links OU to notification configuration, DisassociateOrganizationalUnit removes OU from notification configuration, ListOrganizationalUnits shows OUs configured for notifications.
1 parent bd6f477 commit 4fb4a9c

File tree

54 files changed

+4438
-413
lines changed

Some content is hidden

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

54 files changed

+4438
-413
lines changed

‎generator/ServiceModels/notifications/notifications-2018-05-10.api.json‎

Lines changed: 324 additions & 88 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/notifications/notifications-2018-05-10.docs.json‎

Lines changed: 186 additions & 162 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/notifications/notifications-2018-05-10.examples.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
22
"version": "1.0",
3-
"examples": {
4-
}
3+
"examples": {}
54
}

‎generator/ServiceModels/notifications/notifications-2018-05-10.normal.json‎

Lines changed: 396 additions & 94 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/notifications/notifications-2018-05-10.paginators.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
"limit_key": "maxResults",
3737
"result_key": "managedNotificationEvents"
3838
},
39+
"ListMemberAccounts": {
40+
"input_token": "nextToken",
41+
"output_token": "nextToken",
42+
"limit_key": "maxResults",
43+
"result_key": "memberAccounts"
44+
},
3945
"ListNotificationConfigurations": {
4046
"input_token": "nextToken",
4147
"output_token": "nextToken",
@@ -53,6 +59,12 @@
5359
"output_token": "nextToken",
5460
"limit_key": "maxResults",
5561
"result_key": "notificationHubs"
62+
},
63+
"ListOrganizationalUnits": {
64+
"input_token": "nextToken",
65+
"output_token": "nextToken",
66+
"limit_key": "maxResults",
67+
"result_key": "organizationalUnits"
5668
}
5769
}
5870
}

‎generator/ServiceModels/notifications/notifications-2018-05-10.smoke2.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"version" : 2,
33
"testCases" : [ {
4-
"id" : "ListNotificationHubsSuccess",
5-
"operationName" : "ListNotificationHubs",
4+
"id" : "ListNotificationConfigurationsSuccess",
5+
"operationName" : "ListNotificationConfigurations",
66
"input" : {
7+
"status" : "ACTIVE",
78
"maxResults" : 3
89
},
910
"expectation" : {
@@ -16,9 +17,10 @@
1617
"useAccountIdRouting" : true
1718
}
1819
}, {
19-
"id" : "ListManagedNotificationEventsSuccess",
20-
"operationName" : "ListManagedNotificationEvents",
20+
"id" : "ListNotificationEventsSuccess",
21+
"operationName" : "ListNotificationEvents",
2122
"input" : {
23+
"includeChildEvents" : true,
2224
"maxResults" : 3
2325
},
2426
"expectation" : {
@@ -31,10 +33,9 @@
3133
"useAccountIdRouting" : true
3234
}
3335
}, {
34-
"id" : "ListNotificationConfigurationsSuccess",
35-
"operationName" : "ListNotificationConfigurations",
36+
"id" : "ListManagedNotificationEventsSuccess",
37+
"operationName" : "ListManagedNotificationEvents",
3638
"input" : {
37-
"status" : "ACTIVE",
3839
"maxResults" : 3
3940
},
4041
"expectation" : {
@@ -47,10 +48,9 @@
4748
"useAccountIdRouting" : true
4849
}
4950
}, {
50-
"id" : "ListNotificationEventsSuccess",
51-
"operationName" : "ListNotificationEvents",
51+
"id" : "ListNotificationHubsSuccess",
52+
"operationName" : "ListNotificationHubs",
5253
"input" : {
53-
"includeChildEvents" : true,
5454
"maxResults" : 3
5555
},
5656
"expectation" : {

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

Lines changed: 96 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
<property>Amazon.Notifications.Model.AssociateManagedNotificationAdditionalChannelRequest.ManagedNotificationConfigurationArn</property>
2121
<pattern>arn:[-.a-z0-9]{1,63}:notifications::[0-9]{12}:managed-notification-configuration/category/[a-zA-Z0-9\-]{3,64}/sub-category/[a-zA-Z0-9\-]{3,64}</pattern>
2222
</property-value-rule>
23+
<property-value-rule>
24+
<property>Amazon.Notifications.Model.AssociateOrganizationalUnitRequest.NotificationConfigurationArn</property>
25+
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
26+
</property-value-rule>
27+
<property-value-rule>
28+
<property>Amazon.Notifications.Model.AssociateOrganizationalUnitRequest.OrganizationalUnitId</property>
29+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
30+
</property-value-rule>
2331
<property-value-rule>
2432
<property>Amazon.Notifications.Model.CreateEventRuleRequest.EventPattern</property>
2533
<min>0</min>
@@ -105,6 +113,14 @@
105113
<property>Amazon.Notifications.Model.DisassociateManagedNotificationAdditionalChannelRequest.ManagedNotificationConfigurationArn</property>
106114
<pattern>arn:[-.a-z0-9]{1,63}:notifications::[0-9]{12}:managed-notification-configuration/category/[a-zA-Z0-9\-]{3,64}/sub-category/[a-zA-Z0-9\-]{3,64}</pattern>
107115
</property-value-rule>
116+
<property-value-rule>
117+
<property>Amazon.Notifications.Model.DisassociateOrganizationalUnitRequest.NotificationConfigurationArn</property>
118+
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
119+
</property-value-rule>
120+
<property-value-rule>
121+
<property>Amazon.Notifications.Model.DisassociateOrganizationalUnitRequest.OrganizationalUnitId</property>
122+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
123+
</property-value-rule>
108124
<property-value-rule>
109125
<property>Amazon.Notifications.Model.GetEventRuleRequest.Arn</property>
110126
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}/rule/[a-z0-9]{27}</pattern>
@@ -290,7 +306,7 @@
290306
</property-value-rule>
291307
<property-value-rule>
292308
<property>Amazon.Notifications.Model.ListManagedNotificationChildEventsRequest.OrganizationalUnitId</property>
293-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
309+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
294310
</property-value-rule>
295311
<property-value-rule>
296312
<property>Amazon.Notifications.Model.ListManagedNotificationChildEventsRequest.RelatedAccount</property>
@@ -336,7 +352,7 @@
336352
</property-value-rule>
337353
<property-value-rule>
338354
<property>Amazon.Notifications.Model.ListManagedNotificationEventsRequest.OrganizationalUnitId</property>
339-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
355+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
340356
</property-value-rule>
341357
<property-value-rule>
342358
<property>Amazon.Notifications.Model.ListManagedNotificationEventsRequest.RelatedAccount</property>
@@ -354,6 +370,35 @@
354370
<max>4096</max>
355371
<pattern>[\w+-/=]+</pattern>
356372
</property-value-rule>
373+
<property-value-rule>
374+
<property>Amazon.Notifications.Model.ListMemberAccountsRequest.MaxResults</property>
375+
<min>1</min>
376+
<max>100</max>
377+
</property-value-rule>
378+
<property-value-rule>
379+
<property>Amazon.Notifications.Model.ListMemberAccountsRequest.MemberAccount</property>
380+
<pattern>\d{12}</pattern>
381+
</property-value-rule>
382+
<property-value-rule>
383+
<property>Amazon.Notifications.Model.ListMemberAccountsRequest.NextToken</property>
384+
<min>1</min>
385+
<max>4096</max>
386+
<pattern>[\w+-/=]+</pattern>
387+
</property-value-rule>
388+
<property-value-rule>
389+
<property>Amazon.Notifications.Model.ListMemberAccountsRequest.NotificationConfigurationArn</property>
390+
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
391+
</property-value-rule>
392+
<property-value-rule>
393+
<property>Amazon.Notifications.Model.ListMemberAccountsRequest.OrganizationalUnitId</property>
394+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
395+
</property-value-rule>
396+
<property-value-rule>
397+
<property>Amazon.Notifications.Model.ListMemberAccountsResponse.NextToken</property>
398+
<min>1</min>
399+
<max>4096</max>
400+
<pattern>[\w+-/=]+</pattern>
401+
</property-value-rule>
357402
<property-value-rule>
358403
<property>Amazon.Notifications.Model.ListNotificationConfigurationsRequest.ChannelArn</property>
359404
<pattern>arn:aws:(chatbot|consoleapp|notifications-contacts):[a-zA-Z0-9-]*:[0-9]{12}:[a-zA-Z0-9-_.@]+/[a-zA-Z0-9/_.@:-]+</pattern>
@@ -396,6 +441,10 @@
396441
<max>4096</max>
397442
<pattern>[\w+-/=]+</pattern>
398443
</property-value-rule>
444+
<property-value-rule>
445+
<property>Amazon.Notifications.Model.ListNotificationEventsRequest.OrganizationalUnitId</property>
446+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
447+
</property-value-rule>
399448
<property-value-rule>
400449
<property>Amazon.Notifications.Model.ListNotificationEventsRequest.Source</property>
401450
<min>1</min>
@@ -425,6 +474,27 @@
425474
<max>4096</max>
426475
<pattern>[\w+-/=]+</pattern>
427476
</property-value-rule>
477+
<property-value-rule>
478+
<property>Amazon.Notifications.Model.ListOrganizationalUnitsRequest.MaxResults</property>
479+
<min>1</min>
480+
<max>100</max>
481+
</property-value-rule>
482+
<property-value-rule>
483+
<property>Amazon.Notifications.Model.ListOrganizationalUnitsRequest.NextToken</property>
484+
<min>1</min>
485+
<max>4096</max>
486+
<pattern>[\w+-/=]+</pattern>
487+
</property-value-rule>
488+
<property-value-rule>
489+
<property>Amazon.Notifications.Model.ListOrganizationalUnitsRequest.NotificationConfigurationArn</property>
490+
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
491+
</property-value-rule>
492+
<property-value-rule>
493+
<property>Amazon.Notifications.Model.ListOrganizationalUnitsResponse.NextToken</property>
494+
<min>1</min>
495+
<max>4096</max>
496+
<pattern>[\w+-/=]+</pattern>
497+
</property-value-rule>
428498
<property-value-rule>
429499
<property>Amazon.Notifications.Model.ListTagsForResourceRequest.Arn</property>
430500
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
@@ -521,7 +591,7 @@
521591
</property-value-rule>
522592
<property-value-rule>
523593
<property>Amazon.Notifications.Model.ManagedNotificationChildEvent.OrganizationalUnitId</property>
524-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
594+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
525595
</property-value-rule>
526596
<property-value-rule>
527597
<property>Amazon.Notifications.Model.ManagedNotificationChildEvent.SourceEventDetailUrl</property>
@@ -543,7 +613,7 @@
543613
</property-value-rule>
544614
<property-value-rule>
545615
<property>Amazon.Notifications.Model.ManagedNotificationChildEventOverview.OrganizationalUnitId</property>
546-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
616+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
547617
</property-value-rule>
548618
<property-value-rule>
549619
<property>Amazon.Notifications.Model.ManagedNotificationChildEventOverview.RelatedAccount</property>
@@ -571,7 +641,7 @@
571641
</property-value-rule>
572642
<property-value-rule>
573643
<property>Amazon.Notifications.Model.ManagedNotificationEvent.OrganizationalUnitId</property>
574-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
644+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
575645
</property-value-rule>
576646
<property-value-rule>
577647
<property>Amazon.Notifications.Model.ManagedNotificationEvent.SourceEventDetailUrl</property>
@@ -589,7 +659,7 @@
589659
</property-value-rule>
590660
<property-value-rule>
591661
<property>Amazon.Notifications.Model.ManagedNotificationEventOverview.OrganizationalUnitId</property>
592-
<pattern>Root|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}</pattern>
662+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
593663
</property-value-rule>
594664
<property-value-rule>
595665
<property>Amazon.Notifications.Model.ManagedNotificationEventOverview.RelatedAccount</property>
@@ -624,6 +694,18 @@
624694
<max>2000</max>
625695
<pattern>(https?)://.*</pattern>
626696
</property-value-rule>
697+
<property-value-rule>
698+
<property>Amazon.Notifications.Model.MemberAccount.AccountId</property>
699+
<pattern>\d{12}</pattern>
700+
</property-value-rule>
701+
<property-value-rule>
702+
<property>Amazon.Notifications.Model.MemberAccount.NotificationConfigurationArn</property>
703+
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
704+
</property-value-rule>
705+
<property-value-rule>
706+
<property>Amazon.Notifications.Model.MemberAccount.OrganizationalUnitId</property>
707+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
708+
</property-value-rule>
627709
<property-value-rule>
628710
<property>Amazon.Notifications.Model.MessageComponentsSummary.Headline</property>
629711
<min>1</min>
@@ -653,6 +735,10 @@
653735
<property>Amazon.Notifications.Model.NotificationEvent.Id</property>
654736
<pattern>[a-z0-9]{27}</pattern>
655737
</property-value-rule>
738+
<property-value-rule>
739+
<property>Amazon.Notifications.Model.NotificationEvent.OrganizationalUnitId</property>
740+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
741+
</property-value-rule>
656742
<property-value-rule>
657743
<property>Amazon.Notifications.Model.NotificationEvent.SourceEventDetailUrl</property>
658744
<min>0</min>
@@ -671,6 +757,10 @@
671757
<property>Amazon.Notifications.Model.NotificationEventOverview.NotificationConfigurationArn</property>
672758
<pattern>arn:aws:notifications::[0-9]{12}:configuration/[a-z0-9]{27}</pattern>
673759
</property-value-rule>
760+
<property-value-rule>
761+
<property>Amazon.Notifications.Model.NotificationEventOverview.OrganizationalUnitId</property>
762+
<pattern>(Root|r-[0-9a-z]{4,32}|ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})</pattern>
763+
</property-value-rule>
674764
<property-value-rule>
675765
<property>Amazon.Notifications.Model.NotificationEventOverview.RelatedAccount</property>
676766
<pattern>\d{12}</pattern>

‎sdk/src/Services/Notifications/Generated/Model/AssociateChannelRequest.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ namespace Amazon.Notifications.Model
3232
/// <summary>
3333
/// Container for the parameters to the AssociateChannel operation.
3434
/// Associates a delivery <a href="https://docs.aws.amazon.com/notifications/latest/userguide/managing-delivery-channels.html">Channel</a>
35-
/// with a particular <c>NotificationConfiguration</c>. Supported Channels include Chatbot,
36-
/// the Console Mobile Application, and emails (notifications-contacts).
35+
/// with a particular <c>NotificationConfiguration</c>. Supported Channels include Amazon
36+
/// Q Developer in chat applications, the Console Mobile Application, and emails (notifications-contacts).
3737
/// </summary>
3838
public partial class AssociateChannelRequest : AmazonNotificationsRequest
3939
{
@@ -47,7 +47,8 @@ public partial class AssociateChannelRequest : AmazonNotificationsRequest
4747
/// </para>
4848
///
4949
/// <para>
50-
/// Supported ARNs include Chatbot, the Console Mobile Application, and notifications-contacts.
50+
/// Supported ARNs include Amazon Q Developer in chat applications, the Console Mobile
51+
/// Application, and notifications-contacts.
5152
/// </para>
5253
/// </summary>
5354
[AWSProperty(Required=true)]

‎sdk/src/Services/Notifications/Generated/Model/AssociateManagedNotificationAdditionalChannelRequest.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ namespace Amazon.Notifications.Model
3535
///
3636
///
3737
/// <para>
38-
/// Supported Channels include Chatbot, the Console Mobile Application, and emails (notifications-contacts).
38+
/// Supported Channels include Amazon Q Developer in chat applications, the Console Mobile
39+
/// Application, and emails (notifications-contacts).
3940
/// </para>
4041
/// </summary>
4142
public partial class AssociateManagedNotificationAdditionalChannelRequest : AmazonNotificationsRequest
@@ -50,7 +51,8 @@ public partial class AssociateManagedNotificationAdditionalChannelRequest : Amaz
5051
/// </para>
5152
///
5253
/// <para>
53-
/// Supported ARNs include Chatbot, the Console Mobile Application, and email (notifications-contacts).
54+
/// Supported ARNs include Amazon Q Developer in chat applications, the Console Mobile
55+
/// Application, and email (notifications-contacts).
5456
/// </para>
5557
/// </summary>
5658
[AWSProperty(Required=true)]

0 commit comments

Comments
 (0)