aws-sdk-directoryservice 1.41.0 → 1.42.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -52,6 +52,9 @@ module Aws::DirectoryService
52
52
  CertificatesInfo = Shapes::ListShape.new(name: 'CertificatesInfo')
53
53
  CidrIp = Shapes::StringShape.new(name: 'CidrIp')
54
54
  CidrIps = Shapes::ListShape.new(name: 'CidrIps')
55
+ ClientAuthenticationSettingInfo = Shapes::StructureShape.new(name: 'ClientAuthenticationSettingInfo')
56
+ ClientAuthenticationSettingsInfo = Shapes::ListShape.new(name: 'ClientAuthenticationSettingsInfo')
57
+ ClientAuthenticationStatus = Shapes::StringShape.new(name: 'ClientAuthenticationStatus')
55
58
  ClientAuthenticationType = Shapes::StringShape.new(name: 'ClientAuthenticationType')
56
59
  ClientCertAuthSettings = Shapes::StructureShape.new(name: 'ClientCertAuthSettings')
57
60
  ClientException = Shapes::StructureShape.new(name: 'ClientException')
@@ -102,6 +105,8 @@ module Aws::DirectoryService
102
105
  DeregisterEventTopicResult = Shapes::StructureShape.new(name: 'DeregisterEventTopicResult')
103
106
  DescribeCertificateRequest = Shapes::StructureShape.new(name: 'DescribeCertificateRequest')
104
107
  DescribeCertificateResult = Shapes::StructureShape.new(name: 'DescribeCertificateResult')
108
+ DescribeClientAuthenticationSettingsRequest = Shapes::StructureShape.new(name: 'DescribeClientAuthenticationSettingsRequest')
109
+ DescribeClientAuthenticationSettingsResult = Shapes::StructureShape.new(name: 'DescribeClientAuthenticationSettingsResult')
105
110
  DescribeConditionalForwardersRequest = Shapes::StructureShape.new(name: 'DescribeConditionalForwardersRequest')
106
111
  DescribeConditionalForwardersResult = Shapes::StructureShape.new(name: 'DescribeConditionalForwardersResult')
107
112
  DescribeDirectoriesRequest = Shapes::StructureShape.new(name: 'DescribeDirectoriesRequest')
@@ -428,6 +433,13 @@ module Aws::DirectoryService
428
433
 
429
434
  CidrIps.member = Shapes::ShapeRef.new(shape: CidrIp)
430
435
 
436
+ ClientAuthenticationSettingInfo.add_member(:type, Shapes::ShapeRef.new(shape: ClientAuthenticationType, location_name: "Type"))
437
+ ClientAuthenticationSettingInfo.add_member(:status, Shapes::ShapeRef.new(shape: ClientAuthenticationStatus, location_name: "Status"))
438
+ ClientAuthenticationSettingInfo.add_member(:last_updated_date_time, Shapes::ShapeRef.new(shape: LastUpdatedDateTime, location_name: "LastUpdatedDateTime"))
439
+ ClientAuthenticationSettingInfo.struct_class = Types::ClientAuthenticationSettingInfo
440
+
441
+ ClientAuthenticationSettingsInfo.member = Shapes::ShapeRef.new(shape: ClientAuthenticationSettingInfo)
442
+
431
443
  ClientCertAuthSettings.add_member(:ocsp_url, Shapes::ShapeRef.new(shape: OCSPUrl, location_name: "OCSPUrl"))
432
444
  ClientCertAuthSettings.struct_class = Types::ClientCertAuthSettings
433
445
 
@@ -582,6 +594,16 @@ module Aws::DirectoryService
582
594
  DescribeCertificateResult.add_member(:certificate, Shapes::ShapeRef.new(shape: Certificate, location_name: "Certificate"))
583
595
  DescribeCertificateResult.struct_class = Types::DescribeCertificateResult
584
596
 
597
+ DescribeClientAuthenticationSettingsRequest.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "DirectoryId"))
598
+ DescribeClientAuthenticationSettingsRequest.add_member(:type, Shapes::ShapeRef.new(shape: ClientAuthenticationType, location_name: "Type"))
599
+ DescribeClientAuthenticationSettingsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
600
+ DescribeClientAuthenticationSettingsRequest.add_member(:limit, Shapes::ShapeRef.new(shape: PageLimit, location_name: "Limit"))
601
+ DescribeClientAuthenticationSettingsRequest.struct_class = Types::DescribeClientAuthenticationSettingsRequest
602
+
603
+ DescribeClientAuthenticationSettingsResult.add_member(:client_authentication_settings_info, Shapes::ShapeRef.new(shape: ClientAuthenticationSettingsInfo, location_name: "ClientAuthenticationSettingsInfo"))
604
+ DescribeClientAuthenticationSettingsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
605
+ DescribeClientAuthenticationSettingsResult.struct_class = Types::DescribeClientAuthenticationSettingsResult
606
+
585
607
  DescribeConditionalForwardersRequest.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "DirectoryId"))
586
608
  DescribeConditionalForwardersRequest.add_member(:remote_domain_names, Shapes::ShapeRef.new(shape: RemoteDomainNames, location_name: "RemoteDomainNames"))
587
609
  DescribeConditionalForwardersRequest.struct_class = Types::DescribeConditionalForwardersRequest
@@ -1542,6 +1564,20 @@ module Aws::DirectoryService
1542
1564
  o.errors << Shapes::ShapeRef.new(shape: ServiceException)
1543
1565
  end)
1544
1566
 
1567
+ api.add_operation(:describe_client_authentication_settings, Seahorse::Model::Operation.new.tap do |o|
1568
+ o.name = "DescribeClientAuthenticationSettings"
1569
+ o.http_method = "POST"
1570
+ o.http_request_uri = "/"
1571
+ o.input = Shapes::ShapeRef.new(shape: DescribeClientAuthenticationSettingsRequest)
1572
+ o.output = Shapes::ShapeRef.new(shape: DescribeClientAuthenticationSettingsResult)
1573
+ o.errors << Shapes::ShapeRef.new(shape: DirectoryDoesNotExistException)
1574
+ o.errors << Shapes::ShapeRef.new(shape: UnsupportedOperationException)
1575
+ o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
1576
+ o.errors << Shapes::ShapeRef.new(shape: InvalidParameterException)
1577
+ o.errors << Shapes::ShapeRef.new(shape: ClientException)
1578
+ o.errors << Shapes::ShapeRef.new(shape: ServiceException)
1579
+ end)
1580
+
1545
1581
  api.add_operation(:describe_conditional_forwarders, Seahorse::Model::Operation.new.tap do |o|
1546
1582
  o.name = "DescribeConditionalForwarders"
1547
1583
  o.http_method = "POST"
@@ -50,7 +50,7 @@ module Aws::DirectoryService
50
50
  # @return [String]
51
51
  #
52
52
  # @!attribute [rw] request_id
53
- # The AWS request identifier.
53
+ # The Amazon Web Services request identifier.
54
54
  # @return [String]
55
55
  #
56
56
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/AccessDeniedException AWS API Documentation
@@ -83,14 +83,14 @@ module Aws::DirectoryService
83
83
  # @!attribute [rw] ip_routes
84
84
  # IP address blocks, using CIDR format, of the traffic to route. This
85
85
  # is often the IP address block of the DNS server used for your
86
- # on-premises domain.
86
+ # self-managed domain.
87
87
  # @return [Array<Types::IpRoute>]
88
88
  #
89
89
  # @!attribute [rw] update_security_group_for_directory_controllers
90
90
  # If set to true, updates the inbound and outbound rules of the
91
- # security group that has the description: "AWS created security
92
- # group for *directory ID* directory controllers." Following are the
93
- # new rules:
91
+ # security group that has the description: "Amazon Web Services
92
+ # created security group for *directory ID* directory controllers."
93
+ # Following are the new rules:
94
94
  #
95
95
  # Inbound:
96
96
  #
@@ -376,7 +376,7 @@ module Aws::DirectoryService
376
376
  # @return [String]
377
377
  #
378
378
  # @!attribute [rw] request_id
379
- # The AWS request identifier.
379
+ # The Amazon Web Services request identifier.
380
380
  # @return [String]
381
381
  #
382
382
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CertificateAlreadyExistsException AWS API Documentation
@@ -396,7 +396,7 @@ module Aws::DirectoryService
396
396
  # @return [String]
397
397
  #
398
398
  # @!attribute [rw] request_id
399
- # The AWS request identifier.
399
+ # The Amazon Web Services request identifier.
400
400
  # @return [String]
401
401
  #
402
402
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CertificateDoesNotExistException AWS API Documentation
@@ -416,7 +416,7 @@ module Aws::DirectoryService
416
416
  # @return [String]
417
417
  #
418
418
  # @!attribute [rw] request_id
419
- # The AWS request identifier.
419
+ # The Amazon Web Services request identifier.
420
420
  # @return [String]
421
421
  #
422
422
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CertificateInUseException AWS API Documentation
@@ -472,7 +472,7 @@ module Aws::DirectoryService
472
472
  # @return [String]
473
473
  #
474
474
  # @!attribute [rw] request_id
475
- # The AWS request identifier.
475
+ # The Amazon Web Services request identifier.
476
476
  # @return [String]
477
477
  #
478
478
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CertificateLimitExceededException AWS API Documentation
@@ -484,6 +484,35 @@ module Aws::DirectoryService
484
484
  include Aws::Structure
485
485
  end
486
486
 
487
+ # Contains information about a client authentication method for a
488
+ # directory.
489
+ #
490
+ # @!attribute [rw] type
491
+ # The type of client authentication for the specified directory. If no
492
+ # type is specified, a list of all client authentication types that
493
+ # are supported for the directory is retrieved.
494
+ # @return [String]
495
+ #
496
+ # @!attribute [rw] status
497
+ # Whether the client authentication type is enabled or disabled for
498
+ # the specified directory.
499
+ # @return [String]
500
+ #
501
+ # @!attribute [rw] last_updated_date_time
502
+ # The date and time when the status of the client authentication type
503
+ # was last updated.
504
+ # @return [Time]
505
+ #
506
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ClientAuthenticationSettingInfo AWS API Documentation
507
+ #
508
+ class ClientAuthenticationSettingInfo < Struct.new(
509
+ :type,
510
+ :status,
511
+ :last_updated_date_time)
512
+ SENSITIVE = []
513
+ include Aws::Structure
514
+ end
515
+
487
516
  # Contains information about the client certificate authentication
488
517
  # settings for the `RegisterCertificate` and `DescribeCertificate`
489
518
  # operations.
@@ -516,7 +545,7 @@ module Aws::DirectoryService
516
545
  # @return [String]
517
546
  #
518
547
  # @!attribute [rw] request_id
519
- # The AWS request identifier.
548
+ # The Amazon Web Services request identifier.
520
549
  # @return [String]
521
550
  #
522
551
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ClientException AWS API Documentation
@@ -571,7 +600,8 @@ module Aws::DirectoryService
571
600
  # @!attribute [rw] replication_scope
572
601
  # The replication scope of the conditional forwarder. The only allowed
573
602
  # value is `Domain`, which will replicate the conditional forwarder to
574
- # all of the domain controllers for your AWS directory.
603
+ # all of the domain controllers for your Amazon Web Services
604
+ # directory.
575
605
  # @return [String]
576
606
  #
577
607
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ConditionalForwarder AWS API Documentation
@@ -610,16 +640,16 @@ module Aws::DirectoryService
610
640
  # }
611
641
  #
612
642
  # @!attribute [rw] name
613
- # The fully qualified name of the on-premises directory, such as
643
+ # The fully qualified name of your self-managed directory, such as
614
644
  # `corp.example.com`.
615
645
  # @return [String]
616
646
  #
617
647
  # @!attribute [rw] short_name
618
- # The NetBIOS name of the on-premises directory, such as `CORP`.
648
+ # The NetBIOS name of your self-managed directory, such as `CORP`.
619
649
  # @return [String]
620
650
  #
621
651
  # @!attribute [rw] password
622
- # The password for the on-premises user account.
652
+ # The password for your self-managed user account.
623
653
  # @return [String]
624
654
  #
625
655
  # @!attribute [rw] description
@@ -684,9 +714,9 @@ module Aws::DirectoryService
684
714
  # @!attribute [rw] alias
685
715
  # The requested alias.
686
716
  #
687
- # The alias must be unique amongst all aliases in AWS. This operation
688
- # throws an `EntityAlreadyExistsException` error if the alias already
689
- # exists.
717
+ # The alias must be unique amongst all aliases in Amazon Web Services.
718
+ # This operation throws an `EntityAlreadyExistsException` error if the
719
+ # alias already exists.
690
720
  # @return [String]
691
721
  #
692
722
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CreateAliasRequest AWS API Documentation
@@ -786,10 +816,9 @@ module Aws::DirectoryService
786
816
  include Aws::Structure
787
817
  end
788
818
 
789
- # Initiates the creation of a conditional forwarder for your AWS
790
- # Directory Service for Microsoft Active Directory. Conditional
791
- # forwarders are required in order to set up a trust relationship with
792
- # another domain.
819
+ # Initiates the creation of a conditional forwarder for your Directory
820
+ # Service for Microsoft Active Directory. Conditional forwarders are
821
+ # required in order to set up a trust relationship with another domain.
793
822
  #
794
823
  # @note When making an API call, you may pass CreateConditionalForwarderRequest
795
824
  # data as a hash:
@@ -801,8 +830,8 @@ module Aws::DirectoryService
801
830
  # }
802
831
  #
803
832
  # @!attribute [rw] directory_id
804
- # The directory ID of the AWS directory for which you are creating the
805
- # conditional forwarder.
833
+ # The directory ID of the Amazon Web Services directory for which you
834
+ # are creating the conditional forwarder.
806
835
  # @return [String]
807
836
  #
808
837
  # @!attribute [rw] remote_domain_name
@@ -978,7 +1007,7 @@ module Aws::DirectoryService
978
1007
  #
979
1008
  class CreateLogSubscriptionResult < Aws::EmptyStructure; end
980
1009
 
981
- # Creates an AWS Managed Microsoft AD directory.
1010
+ # Creates an Managed Microsoft AD directory.
982
1011
  #
983
1012
  # @note When making an API call, you may pass CreateMicrosoftADRequest
984
1013
  # data as a hash:
@@ -1002,7 +1031,7 @@ module Aws::DirectoryService
1002
1031
  # }
1003
1032
  #
1004
1033
  # @!attribute [rw] name
1005
- # The fully qualified domain name for the AWS Managed Microsoft AD
1034
+ # The fully qualified domain name for the Managed Microsoft AD
1006
1035
  # directory, such as `corp.example.com`. This name will resolve inside
1007
1036
  # your VPC only. It does not need to be publicly resolvable.
1008
1037
  # @return [String]
@@ -1022,8 +1051,9 @@ module Aws::DirectoryService
1022
1051
  # @return [String]
1023
1052
  #
1024
1053
  # @!attribute [rw] description
1025
- # A description for the directory. This label will appear on the AWS
1026
- # console `Directory Details` page after the directory is created.
1054
+ # A description for the directory. This label will appear on the
1055
+ # Amazon Web Services console `Directory Details` page after the
1056
+ # directory is created.
1027
1057
  # @return [String]
1028
1058
  #
1029
1059
  # @!attribute [rw] vpc_settings
@@ -1032,12 +1062,12 @@ module Aws::DirectoryService
1032
1062
  # @return [Types::DirectoryVpcSettings]
1033
1063
  #
1034
1064
  # @!attribute [rw] edition
1035
- # AWS Managed Microsoft AD is available in two editions: `Standard`
1036
- # and `Enterprise`. `Enterprise` is the default.
1065
+ # Managed Microsoft AD is available in two editions: `Standard` and
1066
+ # `Enterprise`. `Enterprise` is the default.
1037
1067
  # @return [String]
1038
1068
  #
1039
1069
  # @!attribute [rw] tags
1040
- # The tags to be assigned to the AWS Managed Microsoft AD directory.
1070
+ # The tags to be assigned to the Managed Microsoft AD directory.
1041
1071
  # @return [Array<Types::Tag>]
1042
1072
  #
1043
1073
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/CreateMicrosoftADRequest AWS API Documentation
@@ -1109,15 +1139,15 @@ module Aws::DirectoryService
1109
1139
  include Aws::Structure
1110
1140
  end
1111
1141
 
1112
- # AWS Directory Service for Microsoft Active Directory allows you to
1142
+ # Directory Service for Microsoft Active Directory allows you to
1113
1143
  # configure trust relationships. For example, you can establish a trust
1114
- # between your AWS Managed Microsoft AD directory, and your existing
1115
- # on-premises Microsoft Active Directory. This would allow you to
1144
+ # between your Managed Microsoft AD directory, and your existing
1145
+ # self-managed Microsoft Active Directory. This would allow you to
1116
1146
  # provide users and groups access to resources in either domain, with a
1117
1147
  # single set of credentials.
1118
1148
  #
1119
- # This action initiates the creation of the AWS side of a trust
1120
- # relationship between an AWS Managed Microsoft AD directory and an
1149
+ # This action initiates the creation of the Amazon Web Services side of
1150
+ # a trust relationship between an Managed Microsoft AD directory and an
1121
1151
  # external domain.
1122
1152
  #
1123
1153
  # @note When making an API call, you may pass CreateTrustRequest
@@ -1134,8 +1164,8 @@ module Aws::DirectoryService
1134
1164
  # }
1135
1165
  #
1136
1166
  # @!attribute [rw] directory_id
1137
- # The Directory ID of the AWS Managed Microsoft AD directory for which
1138
- # to establish the trust relationship.
1167
+ # The Directory ID of the Managed Microsoft AD directory for which to
1168
+ # establish the trust relationship.
1139
1169
  # @return [String]
1140
1170
  #
1141
1171
  # @!attribute [rw] remote_domain_name
@@ -1323,7 +1353,7 @@ module Aws::DirectoryService
1323
1353
  end
1324
1354
 
1325
1355
  # Deletes the local side of an existing trust relationship between the
1326
- # AWS Managed Microsoft AD directory and the external domain.
1356
+ # Managed Microsoft AD directory and the external domain.
1327
1357
  #
1328
1358
  # @note When making an API call, you may pass DeleteTrustRequest
1329
1359
  # data as a hash:
@@ -1393,8 +1423,8 @@ module Aws::DirectoryService
1393
1423
  #
1394
1424
  class DeregisterCertificateResult < Aws::EmptyStructure; end
1395
1425
 
1396
- # Removes the specified directory as a publisher to the specified SNS
1397
- # topic.
1426
+ # Removes the specified directory as a publisher to the specified Amazon
1427
+ # SNS topic.
1398
1428
  #
1399
1429
  # @note When making an API call, you may pass DeregisterEventTopicRequest
1400
1430
  # data as a hash:
@@ -1406,12 +1436,12 @@ module Aws::DirectoryService
1406
1436
  #
1407
1437
  # @!attribute [rw] directory_id
1408
1438
  # The Directory ID to remove as a publisher. This directory will no
1409
- # longer send messages to the specified SNS topic.
1439
+ # longer send messages to the specified Amazon SNS topic.
1410
1440
  # @return [String]
1411
1441
  #
1412
1442
  # @!attribute [rw] topic_name
1413
- # The name of the SNS topic from which to remove the directory as a
1414
- # publisher.
1443
+ # The name of the Amazon SNS topic from which to remove the directory
1444
+ # as a publisher.
1415
1445
  # @return [String]
1416
1446
  #
1417
1447
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DeregisterEventTopicRequest AWS API Documentation
@@ -1468,6 +1498,72 @@ module Aws::DirectoryService
1468
1498
  include Aws::Structure
1469
1499
  end
1470
1500
 
1501
+ # @note When making an API call, you may pass DescribeClientAuthenticationSettingsRequest
1502
+ # data as a hash:
1503
+ #
1504
+ # {
1505
+ # directory_id: "DirectoryId", # required
1506
+ # type: "SmartCard", # accepts SmartCard
1507
+ # next_token: "NextToken",
1508
+ # limit: 1,
1509
+ # }
1510
+ #
1511
+ # @!attribute [rw] directory_id
1512
+ # The identifier of the directory for which to retrieve information.
1513
+ # @return [String]
1514
+ #
1515
+ # @!attribute [rw] type
1516
+ # The type of client authentication for which to retrieve information.
1517
+ # If no type is specified, a list of all client authentication types
1518
+ # that are supported for the specified directory is retrieved.
1519
+ # @return [String]
1520
+ #
1521
+ # @!attribute [rw] next_token
1522
+ # The *DescribeClientAuthenticationSettingsResult.NextToken* value
1523
+ # from a previous call to DescribeClientAuthenticationSettings. Pass
1524
+ # null if this is the first call.
1525
+ # @return [String]
1526
+ #
1527
+ # @!attribute [rw] limit
1528
+ # The maximum number of items to return. If this value is zero, the
1529
+ # maximum number of items is specified by the limitations of the
1530
+ # operation.
1531
+ # @return [Integer]
1532
+ #
1533
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DescribeClientAuthenticationSettingsRequest AWS API Documentation
1534
+ #
1535
+ class DescribeClientAuthenticationSettingsRequest < Struct.new(
1536
+ :directory_id,
1537
+ :type,
1538
+ :next_token,
1539
+ :limit)
1540
+ SENSITIVE = []
1541
+ include Aws::Structure
1542
+ end
1543
+
1544
+ # @!attribute [rw] client_authentication_settings_info
1545
+ # Information about the type of client authentication for the
1546
+ # specified directory. The following information is retrieved: The
1547
+ # date and time when the status of the client authentication type was
1548
+ # last updated, whether the client authentication type is enabled or
1549
+ # disabled, and the type of client authentication.
1550
+ # @return [Array<Types::ClientAuthenticationSettingInfo>]
1551
+ #
1552
+ # @!attribute [rw] next_token
1553
+ # The next token used to retrieve the client authentication settings
1554
+ # if the number of setting types exceeds page limit and there is
1555
+ # another page.
1556
+ # @return [String]
1557
+ #
1558
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DescribeClientAuthenticationSettingsResult AWS API Documentation
1559
+ #
1560
+ class DescribeClientAuthenticationSettingsResult < Struct.new(
1561
+ :client_authentication_settings_info,
1562
+ :next_token)
1563
+ SENSITIVE = []
1564
+ include Aws::Structure
1565
+ end
1566
+
1471
1567
  # Describes a conditional forwarder.
1472
1568
  #
1473
1569
  # @note When making an API call, you may pass DescribeConditionalForwardersRequest
@@ -1649,15 +1745,15 @@ module Aws::DirectoryService
1649
1745
  # }
1650
1746
  #
1651
1747
  # @!attribute [rw] directory_id
1652
- # The Directory ID for which to get the list of associated SNS topics.
1653
- # If this member is null, associations for all Directory IDs are
1654
- # returned.
1748
+ # The Directory ID for which to get the list of associated Amazon SNS
1749
+ # topics. If this member is null, associations for all Directory IDs
1750
+ # are returned.
1655
1751
  # @return [String]
1656
1752
  #
1657
1753
  # @!attribute [rw] topic_names
1658
- # A list of SNS topic names for which to obtain the information. If
1659
- # this member is null, all associations for the specified Directory ID
1660
- # are returned.
1754
+ # A list of Amazon SNS topic names for which to obtain the
1755
+ # information. If this member is null, all associations for the
1756
+ # specified Directory ID are returned.
1661
1757
  #
1662
1758
  # An empty list results in an `InvalidParameterException` being
1663
1759
  # thrown.
@@ -1675,8 +1771,8 @@ module Aws::DirectoryService
1675
1771
  # The result of a DescribeEventTopic request.
1676
1772
  #
1677
1773
  # @!attribute [rw] event_topics
1678
- # A list of SNS topic names that receive status messages from the
1679
- # specified Directory ID.
1774
+ # A list of Amazon SNS topic names that receive status messages from
1775
+ # the specified Directory ID.
1680
1776
  # @return [Array<Types::EventTopic>]
1681
1777
  #
1682
1778
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DescribeEventTopicsResult AWS API Documentation
@@ -1924,10 +2020,9 @@ module Aws::DirectoryService
1924
2020
  include Aws::Structure
1925
2021
  end
1926
2022
 
1927
- # Describes the trust relationships for a particular AWS Managed
1928
- # Microsoft AD directory. If no input parameters are are provided, such
1929
- # as directory ID or trust ID, this request describes all the trust
1930
- # relationships.
2023
+ # Describes the trust relationships for a particular Managed Microsoft
2024
+ # AD directory. If no input parameters are provided, such as directory
2025
+ # ID or trust ID, this request describes all the trust relationships.
1931
2026
  #
1932
2027
  # @note When making an API call, you may pass DescribeTrustsRequest
1933
2028
  # data as a hash:
@@ -1940,8 +2035,8 @@ module Aws::DirectoryService
1940
2035
  # }
1941
2036
  #
1942
2037
  # @!attribute [rw] directory_id
1943
- # The Directory ID of the AWS directory that is a part of the
1944
- # requested trust relationship.
2038
+ # The Directory ID of the Amazon Web Services directory that is a part
2039
+ # of the requested trust relationship.
1945
2040
  # @return [String]
1946
2041
  #
1947
2042
  # @!attribute [rw] trust_ids
@@ -1999,7 +2094,7 @@ module Aws::DirectoryService
1999
2094
  include Aws::Structure
2000
2095
  end
2001
2096
 
2002
- # The Region you specified is the same Region where the AWS Managed
2097
+ # The Region you specified is the same Region where the Managed
2003
2098
  # Microsoft AD directory was created. Specify a different Region and try
2004
2099
  # again.
2005
2100
  #
@@ -2008,7 +2103,7 @@ module Aws::DirectoryService
2008
2103
  # @return [String]
2009
2104
  #
2010
2105
  # @!attribute [rw] request_id
2011
- # The AWS request identifier.
2106
+ # The Amazon Web Services request identifier.
2012
2107
  # @return [String]
2013
2108
  #
2014
2109
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryAlreadyInRegionException AWS API Documentation
@@ -2020,14 +2115,15 @@ module Aws::DirectoryService
2020
2115
  include Aws::Structure
2021
2116
  end
2022
2117
 
2023
- # The specified directory has already been shared with this AWS account.
2118
+ # The specified directory has already been shared with this Amazon Web
2119
+ # Services account.
2024
2120
  #
2025
2121
  # @!attribute [rw] message
2026
2122
  # The descriptive message for the exception.
2027
2123
  # @return [String]
2028
2124
  #
2029
2125
  # @!attribute [rw] request_id
2030
- # The AWS request identifier.
2126
+ # The Amazon Web Services request identifier.
2031
2127
  # @return [String]
2032
2128
  #
2033
2129
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryAlreadySharedException AWS API Documentation
@@ -2063,11 +2159,11 @@ module Aws::DirectoryService
2063
2159
  #
2064
2160
  # @!attribute [rw] customer_dns_ips
2065
2161
  # A list of one or more IP addresses of DNS servers or domain
2066
- # controllers in the on-premises directory.
2162
+ # controllers in your self-managed directory.
2067
2163
  # @return [Array<String>]
2068
2164
  #
2069
2165
  # @!attribute [rw] customer_user_name
2070
- # The user name of an account in the on-premises directory that is
2166
+ # The user name of an account in your self-managed directory that is
2071
2167
  # used to connect to the directory. This account must have the
2072
2168
  # following permissions:
2073
2169
  #
@@ -2100,7 +2196,7 @@ module Aws::DirectoryService
2100
2196
  # @return [Array<String>]
2101
2197
  #
2102
2198
  # @!attribute [rw] customer_user_name
2103
- # The user name of the service account in the on-premises directory.
2199
+ # The user name of the service account in your self-managed directory.
2104
2200
  # @return [String]
2105
2201
  #
2106
2202
  # @!attribute [rw] security_group_id
@@ -2128,7 +2224,7 @@ module Aws::DirectoryService
2128
2224
  include Aws::Structure
2129
2225
  end
2130
2226
 
2131
- # Contains information about an AWS Directory Service directory.
2227
+ # Contains information about an Directory Service directory.
2132
2228
  #
2133
2229
  # @!attribute [rw] directory_id
2134
2230
  # The directory identifier.
@@ -2172,7 +2268,7 @@ module Aws::DirectoryService
2172
2268
  # AD or Microsoft AD directory, these are the IP addresses of the
2173
2269
  # Simple AD or Microsoft AD directory servers. For an AD Connector
2174
2270
  # directory, these are the IP addresses of the DNS servers or domain
2175
- # controllers in the on-premises directory to which the AD Connector
2271
+ # controllers in your self-managed directory to which the AD Connector
2176
2272
  # is connected.
2177
2273
  # @return [Array<String>]
2178
2274
  #
@@ -2181,15 +2277,15 @@ module Aws::DirectoryService
2181
2277
  # @return [String]
2182
2278
  #
2183
2279
  # @!attribute [rw] share_status
2184
- # Current directory status of the shared AWS Managed Microsoft AD
2280
+ # Current directory status of the shared Managed Microsoft AD
2185
2281
  # directory.
2186
2282
  # @return [String]
2187
2283
  #
2188
2284
  # @!attribute [rw] share_method
2189
2285
  # The method used when sharing a directory to determine whether the
2190
- # directory should be shared within your AWS organization
2191
- # (`ORGANIZATIONS`) or with any AWS account by sending a shared
2192
- # directory request (`HANDSHAKE`).
2286
+ # directory should be shared within your Amazon Web Services
2287
+ # organization (`ORGANIZATIONS`) or with any Amazon Web Services
2288
+ # account by sending a shared directory request (`HANDSHAKE`).
2193
2289
  # @return [String]
2194
2290
  #
2195
2291
  # @!attribute [rw] share_notes
@@ -2214,7 +2310,7 @@ module Aws::DirectoryService
2214
2310
  # @!attribute [rw] vpc_settings
2215
2311
  # A DirectoryVpcSettingsDescription object that contains additional
2216
2312
  # information about a directory. This member is only present if the
2217
- # directory is a Simple AD or Managed AD directory.
2313
+ # directory is a Simple AD or Managed Microsoft AD directory.
2218
2314
  # @return [Types::DirectoryVpcSettingsDescription]
2219
2315
  #
2220
2316
  # @!attribute [rw] connect_settings
@@ -2247,8 +2343,8 @@ module Aws::DirectoryService
2247
2343
  # @return [Integer]
2248
2344
  #
2249
2345
  # @!attribute [rw] owner_directory_description
2250
- # Describes the AWS Managed Microsoft AD directory in the directory
2251
- # owner account.
2346
+ # Describes the Managed Microsoft AD directory in the directory owner
2347
+ # account.
2252
2348
  # @return [Types::OwnerDirectoryDescription]
2253
2349
  #
2254
2350
  # @!attribute [rw] regions_info
@@ -2294,7 +2390,7 @@ module Aws::DirectoryService
2294
2390
  # @return [String]
2295
2391
  #
2296
2392
  # @!attribute [rw] request_id
2297
- # The AWS request identifier.
2393
+ # The Amazon Web Services request identifier.
2298
2394
  # @return [String]
2299
2395
  #
2300
2396
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryDoesNotExistException AWS API Documentation
@@ -2315,7 +2411,7 @@ module Aws::DirectoryService
2315
2411
  # @return [String]
2316
2412
  #
2317
2413
  # @!attribute [rw] request_id
2318
- # The AWS request identifier.
2414
+ # The Amazon Web Services request identifier.
2319
2415
  # @return [String]
2320
2416
  #
2321
2417
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryLimitExceededException AWS API Documentation
@@ -2342,17 +2438,17 @@ module Aws::DirectoryService
2342
2438
  # @return [Boolean]
2343
2439
  #
2344
2440
  # @!attribute [rw] cloud_only_microsoft_ad_limit
2345
- # The maximum number of AWS Managed Microsoft AD directories allowed
2346
- # in the region.
2441
+ # The maximum number of Managed Microsoft AD directories allowed in
2442
+ # the region.
2347
2443
  # @return [Integer]
2348
2444
  #
2349
2445
  # @!attribute [rw] cloud_only_microsoft_ad_current_count
2350
- # The current number of AWS Managed Microsoft AD directories in the
2446
+ # The current number of Managed Microsoft AD directories in the
2351
2447
  # region.
2352
2448
  # @return [Integer]
2353
2449
  #
2354
2450
  # @!attribute [rw] cloud_only_microsoft_ad_limit_reached
2355
- # Indicates if the AWS Managed Microsoft AD directory limit has been
2451
+ # Indicates if the Managed Microsoft AD directory limit has been
2356
2452
  # reached.
2357
2453
  # @return [Boolean]
2358
2454
  #
@@ -2384,14 +2480,15 @@ module Aws::DirectoryService
2384
2480
  include Aws::Structure
2385
2481
  end
2386
2482
 
2387
- # The specified directory has not been shared with this AWS account.
2483
+ # The specified directory has not been shared with this Amazon Web
2484
+ # Services account.
2388
2485
  #
2389
2486
  # @!attribute [rw] message
2390
2487
  # The descriptive message for the exception.
2391
2488
  # @return [String]
2392
2489
  #
2393
2490
  # @!attribute [rw] request_id
2394
- # The AWS request identifier.
2491
+ # The Amazon Web Services request identifier.
2395
2492
  # @return [String]
2396
2493
  #
2397
2494
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryNotSharedException AWS API Documentation
@@ -2410,7 +2507,7 @@ module Aws::DirectoryService
2410
2507
  # @return [String]
2411
2508
  #
2412
2509
  # @!attribute [rw] request_id
2413
- # The AWS request identifier.
2510
+ # The Amazon Web Services request identifier.
2414
2511
  # @return [String]
2415
2512
  #
2416
2513
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DirectoryUnavailableException AWS API Documentation
@@ -2439,8 +2536,8 @@ module Aws::DirectoryService
2439
2536
  #
2440
2537
  # @!attribute [rw] subnet_ids
2441
2538
  # The identifiers of the subnets for the directory servers. The two
2442
- # subnets must be in different Availability Zones. AWS Directory
2443
- # Service creates a directory server and a DNS server in each of these
2539
+ # subnets must be in different Availability Zones. Directory Service
2540
+ # creates a directory server and a DNS server in each of these
2444
2541
  # subnets.
2445
2542
  # @return [Array<String>]
2446
2543
  #
@@ -2688,7 +2785,7 @@ module Aws::DirectoryService
2688
2785
  # @return [String]
2689
2786
  #
2690
2787
  # @!attribute [rw] request_id
2691
- # The AWS request identifier.
2788
+ # The Amazon Web Services request identifier.
2692
2789
  # @return [String]
2693
2790
  #
2694
2791
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/DomainControllerLimitExceededException AWS API Documentation
@@ -2716,7 +2813,7 @@ module Aws::DirectoryService
2716
2813
  # The type of client authentication to enable. Currently only the
2717
2814
  # value `SmartCard` is supported. Smart card authentication in AD
2718
2815
  # Connector requires that you enable Kerberos Constrained Delegation
2719
- # for the Service User to the LDAP service in the on-premises AD.
2816
+ # for the Service User to the LDAP service in your self-managed AD.
2720
2817
  # @return [String]
2721
2818
  #
2722
2819
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/EnableClientAuthenticationRequest AWS API Documentation
@@ -2861,7 +2958,7 @@ module Aws::DirectoryService
2861
2958
  # @return [String]
2862
2959
  #
2863
2960
  # @!attribute [rw] request_id
2864
- # The AWS request identifier.
2961
+ # The Amazon Web Services request identifier.
2865
2962
  # @return [String]
2866
2963
  #
2867
2964
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/EntityAlreadyExistsException AWS API Documentation
@@ -2880,7 +2977,7 @@ module Aws::DirectoryService
2880
2977
  # @return [String]
2881
2978
  #
2882
2979
  # @!attribute [rw] request_id
2883
- # The AWS request identifier.
2980
+ # The Amazon Web Services request identifier.
2884
2981
  # @return [String]
2885
2982
  #
2886
2983
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/EntityDoesNotExistException AWS API Documentation
@@ -2892,26 +2989,26 @@ module Aws::DirectoryService
2892
2989
  include Aws::Structure
2893
2990
  end
2894
2991
 
2895
- # Information about SNS topic and AWS Directory Service directory
2992
+ # Information about Amazon SNS topic and Directory Service directory
2896
2993
  # associations.
2897
2994
  #
2898
2995
  # @!attribute [rw] directory_id
2899
- # The Directory ID of an AWS Directory Service directory that will
2900
- # publish status messages to an SNS topic.
2996
+ # The Directory ID of an Directory Service directory that will publish
2997
+ # status messages to an Amazon SNS topic.
2901
2998
  # @return [String]
2902
2999
  #
2903
3000
  # @!attribute [rw] topic_name
2904
- # The name of an AWS SNS topic the receives status messages from the
2905
- # directory.
3001
+ # The name of an Amazon SNS topic the receives status messages from
3002
+ # the directory.
2906
3003
  # @return [String]
2907
3004
  #
2908
3005
  # @!attribute [rw] topic_arn
2909
- # The SNS topic ARN (Amazon Resource Name).
3006
+ # The Amazon SNS topic ARN (Amazon Resource Name).
2910
3007
  # @return [String]
2911
3008
  #
2912
3009
  # @!attribute [rw] created_date_time
2913
- # The date and time of when you associated your directory with the SNS
2914
- # topic.
3010
+ # The date and time of when you associated your directory with the
3011
+ # Amazon SNS topic.
2915
3012
  # @return [Time]
2916
3013
  #
2917
3014
  # @!attribute [rw] status
@@ -2942,7 +3039,7 @@ module Aws::DirectoryService
2942
3039
  #
2943
3040
  # @!attribute [rw] directory_limits
2944
3041
  # A DirectoryLimits object that contains the directory limits for the
2945
- # current rRegion.
3042
+ # current Region.
2946
3043
  # @return [Types::DirectoryLimits]
2947
3044
  #
2948
3045
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/GetDirectoryLimitsResult AWS API Documentation
@@ -2997,7 +3094,7 @@ module Aws::DirectoryService
2997
3094
  # @return [String]
2998
3095
  #
2999
3096
  # @!attribute [rw] request_id
3000
- # The AWS request identifier.
3097
+ # The Amazon Web Services request identifier.
3001
3098
  # @return [String]
3002
3099
  #
3003
3100
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InsufficientPermissionsException AWS API Documentation
@@ -3016,7 +3113,7 @@ module Aws::DirectoryService
3016
3113
  # @return [String]
3017
3114
  #
3018
3115
  # @!attribute [rw] request_id
3019
- # The AWS request identifier.
3116
+ # The Amazon Web Services request identifier.
3020
3117
  # @return [String]
3021
3118
  #
3022
3119
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidCertificateException AWS API Documentation
@@ -3035,7 +3132,7 @@ module Aws::DirectoryService
3035
3132
  # @return [String]
3036
3133
  #
3037
3134
  # @!attribute [rw] request_id
3038
- # The AWS request identifier.
3135
+ # The Amazon Web Services request identifier.
3039
3136
  # @return [String]
3040
3137
  #
3041
3138
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidClientAuthStatusException AWS API Documentation
@@ -3055,7 +3152,7 @@ module Aws::DirectoryService
3055
3152
  # @return [String]
3056
3153
  #
3057
3154
  # @!attribute [rw] request_id
3058
- # The AWS request identifier.
3155
+ # The Amazon Web Services request identifier.
3059
3156
  # @return [String]
3060
3157
  #
3061
3158
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidLDAPSStatusException AWS API Documentation
@@ -3074,7 +3171,7 @@ module Aws::DirectoryService
3074
3171
  # @return [String]
3075
3172
  #
3076
3173
  # @!attribute [rw] request_id
3077
- # The AWS request identifier.
3174
+ # The Amazon Web Services request identifier.
3078
3175
  # @return [String]
3079
3176
  #
3080
3177
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidNextTokenException AWS API Documentation
@@ -3093,7 +3190,7 @@ module Aws::DirectoryService
3093
3190
  # @return [String]
3094
3191
  #
3095
3192
  # @!attribute [rw] request_id
3096
- # The AWS request identifier.
3193
+ # The Amazon Web Services request identifier.
3097
3194
  # @return [String]
3098
3195
  #
3099
3196
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidParameterException AWS API Documentation
@@ -3113,7 +3210,7 @@ module Aws::DirectoryService
3113
3210
  # @return [String]
3114
3211
  #
3115
3212
  # @!attribute [rw] request_id
3116
- # The AWS request identifier.
3213
+ # The Amazon Web Services request identifier.
3117
3214
  # @return [String]
3118
3215
  #
3119
3216
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidPasswordException AWS API Documentation
@@ -3132,7 +3229,7 @@ module Aws::DirectoryService
3132
3229
  # @return [String]
3133
3230
  #
3134
3231
  # @!attribute [rw] request_id
3135
- # The AWS request identifier.
3232
+ # The Amazon Web Services request identifier.
3136
3233
  # @return [String]
3137
3234
  #
3138
3235
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/InvalidTargetException AWS API Documentation
@@ -3145,7 +3242,7 @@ module Aws::DirectoryService
3145
3242
  end
3146
3243
 
3147
3244
  # IP address block. This is often the address block of the DNS server
3148
- # used for your on-premises domain.
3245
+ # used for your self-managed domain.
3149
3246
  #
3150
3247
  # @note When making an API call, you may pass IpRoute
3151
3248
  # data as a hash:
@@ -3157,7 +3254,7 @@ module Aws::DirectoryService
3157
3254
  #
3158
3255
  # @!attribute [rw] cidr_ip
3159
3256
  # IP address block using CIDR format, for example 10.0.0.0/24. This is
3160
- # often the address block of the DNS server used for your on-premises
3257
+ # often the address block of the DNS server used for your self-managed
3161
3258
  # domain. For a single IP address use a CIDR address block with /32.
3162
3259
  # For example 10.0.0.0/32.
3163
3260
  # @return [String]
@@ -3222,7 +3319,7 @@ module Aws::DirectoryService
3222
3319
  # @return [String]
3223
3320
  #
3224
3321
  # @!attribute [rw] request_id
3225
- # The AWS request identifier.
3322
+ # The Amazon Web Services request identifier.
3226
3323
  # @return [String]
3227
3324
  #
3228
3325
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/IpRouteLimitExceededException AWS API Documentation
@@ -3378,9 +3475,9 @@ module Aws::DirectoryService
3378
3475
  # @!attribute [rw] directory_id
3379
3476
  # If a *DirectoryID* is provided, lists only the log subscription
3380
3477
  # associated with that directory. If no *DirectoryId* is provided,
3381
- # lists all log subscriptions associated with your AWS account. If
3382
- # there are no log subscriptions for the AWS account or the directory,
3383
- # an empty list will be returned.
3478
+ # lists all log subscriptions associated with your Amazon Web Services
3479
+ # account. If there are no log subscriptions for the Amazon Web
3480
+ # Services account or the directory, an empty list will be returned.
3384
3481
  # @return [String]
3385
3482
  #
3386
3483
  # @!attribute [rw] next_token
@@ -3402,8 +3499,8 @@ module Aws::DirectoryService
3402
3499
  end
3403
3500
 
3404
3501
  # @!attribute [rw] log_subscriptions
3405
- # A list of active LogSubscription objects for calling the AWS
3406
- # account.
3502
+ # A list of active LogSubscription objects for calling the Amazon Web
3503
+ # Services account.
3407
3504
  # @return [Array<Types::LogSubscription>]
3408
3505
  #
3409
3506
  # @!attribute [rw] next_token
@@ -3554,7 +3651,7 @@ module Aws::DirectoryService
3554
3651
  # @return [String]
3555
3652
  #
3556
3653
  # @!attribute [rw] request_id
3557
- # The AWS request identifier.
3654
+ # The Amazon Web Services request identifier.
3558
3655
  # @return [String]
3559
3656
  #
3560
3657
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/NoAvailableCertificateException AWS API Documentation
@@ -3566,14 +3663,15 @@ module Aws::DirectoryService
3566
3663
  include Aws::Structure
3567
3664
  end
3568
3665
 
3569
- # Exception encountered while trying to access your AWS organization.
3666
+ # Exception encountered while trying to access your Amazon Web Services
3667
+ # organization.
3570
3668
  #
3571
3669
  # @!attribute [rw] message
3572
3670
  # The descriptive message for the exception.
3573
3671
  # @return [String]
3574
3672
  #
3575
3673
  # @!attribute [rw] request_id
3576
- # The AWS request identifier.
3674
+ # The Amazon Web Services request identifier.
3577
3675
  # @return [String]
3578
3676
  #
3579
3677
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/OrganizationsException AWS API Documentation
@@ -3589,8 +3687,8 @@ module Aws::DirectoryService
3589
3687
  # the directory consumer account.
3590
3688
  #
3591
3689
  # @!attribute [rw] directory_id
3592
- # Identifier of the AWS Managed Microsoft AD directory in the
3593
- # directory owner account.
3690
+ # Identifier of the Managed Microsoft AD directory in the directory
3691
+ # owner account.
3594
3692
  # @return [String]
3595
3693
  #
3596
3694
  # @!attribute [rw] account_id
@@ -3652,8 +3750,8 @@ module Aws::DirectoryService
3652
3750
  #
3653
3751
  # @!attribute [rw] radius_port
3654
3752
  # The port that your RADIUS server is using for communications. Your
3655
- # on-premises network must allow inbound traffic over this port from
3656
- # the AWS Directory Service servers.
3753
+ # self-managed network must allow inbound traffic over this port from
3754
+ # the Directory Service servers.
3657
3755
  # @return [Integer]
3658
3756
  #
3659
3757
  # @!attribute [rw] radius_timeout
@@ -3762,7 +3860,7 @@ module Aws::DirectoryService
3762
3860
  # @return [String]
3763
3861
  #
3764
3862
  # @!attribute [rw] request_id
3765
- # The AWS request identifier.
3863
+ # The Amazon Web Services request identifier.
3766
3864
  # @return [String]
3767
3865
  #
3768
3866
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/RegionLimitExceededException AWS API Documentation
@@ -3778,8 +3876,8 @@ module Aws::DirectoryService
3778
3876
  # multi-Region replication.
3779
3877
  #
3780
3878
  # @!attribute [rw] primary_region
3781
- # The Region where the AWS Managed Microsoft AD directory was
3782
- # originally created.
3879
+ # The Region where the Managed Microsoft AD directory was originally
3880
+ # created.
3783
3881
  # @return [String]
3784
3882
  #
3785
3883
  # @!attribute [rw] additional_regions
@@ -3861,13 +3959,14 @@ module Aws::DirectoryService
3861
3959
  # }
3862
3960
  #
3863
3961
  # @!attribute [rw] directory_id
3864
- # The Directory ID that will publish status messages to the SNS topic.
3962
+ # The Directory ID that will publish status messages to the Amazon SNS
3963
+ # topic.
3865
3964
  # @return [String]
3866
3965
  #
3867
3966
  # @!attribute [rw] topic_name
3868
- # The SNS topic name to which the directory will publish status
3869
- # messages. This SNS topic must be in the same region as the specified
3870
- # Directory ID.
3967
+ # The Amazon SNS topic name to which the directory will publish status
3968
+ # messages. This Amazon SNS topic must be in the same region as the
3969
+ # specified Directory ID.
3871
3970
  # @return [String]
3872
3971
  #
3873
3972
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/RegisterEventTopicRequest AWS API Documentation
@@ -4012,7 +4111,7 @@ module Aws::DirectoryService
4012
4111
  # }
4013
4112
  #
4014
4113
  # @!attribute [rw] directory_id
4015
- # Identifier of the AWS Managed Microsoft AD or Simple AD directory in
4114
+ # Identifier of the Managed Microsoft AD or Simple AD directory in
4016
4115
  # which the user resides.
4017
4116
  # @return [String]
4018
4117
  #
@@ -4112,14 +4211,14 @@ module Aws::DirectoryService
4112
4211
  include Aws::Structure
4113
4212
  end
4114
4213
 
4115
- # An exception has occurred in AWS Directory Service.
4214
+ # An exception has occurred in Directory Service.
4116
4215
  #
4117
4216
  # @!attribute [rw] message
4118
4217
  # The descriptive message for the exception.
4119
4218
  # @return [String]
4120
4219
  #
4121
4220
  # @!attribute [rw] request_id
4122
- # The AWS request identifier.
4221
+ # The Amazon Web Services request identifier.
4123
4222
  # @return [String]
4124
4223
  #
4125
4224
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ServiceException AWS API Documentation
@@ -4145,8 +4244,8 @@ module Aws::DirectoryService
4145
4244
  # }
4146
4245
  #
4147
4246
  # @!attribute [rw] directory_id
4148
- # Identifier of the AWS Managed Microsoft AD directory that you want
4149
- # to share with other AWS accounts.
4247
+ # Identifier of the Managed Microsoft AD directory that you want to
4248
+ # share with other Amazon Web Services accounts.
4150
4249
  # @return [String]
4151
4250
  #
4152
4251
  # @!attribute [rw] share_notes
@@ -4163,9 +4262,9 @@ module Aws::DirectoryService
4163
4262
  #
4164
4263
  # @!attribute [rw] share_method
4165
4264
  # The method used when sharing a directory to determine whether the
4166
- # directory should be shared within your AWS organization
4167
- # (`ORGANIZATIONS`) or with any AWS account by sending a directory
4168
- # sharing request (`HANDSHAKE`).
4265
+ # directory should be shared within your Amazon Web Services
4266
+ # organization (`ORGANIZATIONS`) or with any Amazon Web Services
4267
+ # account by sending a directory sharing request (`HANDSHAKE`).
4169
4268
  # @return [String]
4170
4269
  #
4171
4270
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ShareDirectoryRequest AWS API Documentation
@@ -4192,15 +4291,15 @@ module Aws::DirectoryService
4192
4291
  include Aws::Structure
4193
4292
  end
4194
4293
 
4195
- # The maximum number of AWS accounts that you can share with this
4196
- # directory has been reached.
4294
+ # The maximum number of Amazon Web Services accounts that you can share
4295
+ # with this directory has been reached.
4197
4296
  #
4198
4297
  # @!attribute [rw] message
4199
4298
  # The descriptive message for the exception.
4200
4299
  # @return [String]
4201
4300
  #
4202
4301
  # @!attribute [rw] request_id
4203
- # The AWS request identifier.
4302
+ # The Amazon Web Services request identifier.
4204
4303
  # @return [String]
4205
4304
  #
4206
4305
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/ShareLimitExceededException AWS API Documentation
@@ -4254,9 +4353,9 @@ module Aws::DirectoryService
4254
4353
  #
4255
4354
  # @!attribute [rw] share_method
4256
4355
  # The method used when sharing a directory to determine whether the
4257
- # directory should be shared within your AWS organization
4258
- # (`ORGANIZATIONS`) or with any AWS account by sending a shared
4259
- # directory request (`HANDSHAKE`).
4356
+ # directory should be shared within your Amazon Web Services
4357
+ # organization (`ORGANIZATIONS`) or with any Amazon Web Services
4358
+ # account by sending a shared directory request (`HANDSHAKE`).
4260
4359
  # @return [String]
4261
4360
  #
4262
4361
  # @!attribute [rw] shared_account_id
@@ -4272,7 +4371,7 @@ module Aws::DirectoryService
4272
4371
  # @return [String]
4273
4372
  #
4274
4373
  # @!attribute [rw] share_status
4275
- # Current directory status of the shared AWS Managed Microsoft AD
4374
+ # Current directory status of the shared Managed Microsoft AD
4276
4375
  # directory.
4277
4376
  # @return [String]
4278
4377
  #
@@ -4355,7 +4454,7 @@ module Aws::DirectoryService
4355
4454
  # @return [String]
4356
4455
  #
4357
4456
  # @!attribute [rw] request_id
4358
- # The AWS request identifier.
4457
+ # The Amazon Web Services request identifier.
4359
4458
  # @return [String]
4360
4459
  #
4361
4460
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/SnapshotLimitExceededException AWS API Documentation
@@ -4487,7 +4586,7 @@ module Aws::DirectoryService
4487
4586
  # @return [String]
4488
4587
  #
4489
4588
  # @!attribute [rw] request_id
4490
- # The AWS request identifier.
4589
+ # The Amazon Web Services request identifier.
4491
4590
  # @return [String]
4492
4591
  #
4493
4592
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/TagLimitExceededException AWS API Documentation
@@ -4499,12 +4598,12 @@ module Aws::DirectoryService
4499
4598
  include Aws::Structure
4500
4599
  end
4501
4600
 
4502
- # Describes a trust relationship between an AWS Managed Microsoft AD
4601
+ # Describes a trust relationship between an Managed Microsoft AD
4503
4602
  # directory and an external domain.
4504
4603
  #
4505
4604
  # @!attribute [rw] directory_id
4506
- # The Directory ID of the AWS directory involved in the trust
4507
- # relationship.
4605
+ # The Directory ID of the Amazon Web Services directory involved in
4606
+ # the trust relationship.
4508
4607
  # @return [String]
4509
4608
  #
4510
4609
  # @!attribute [rw] trust_id
@@ -4578,8 +4677,8 @@ module Aws::DirectoryService
4578
4677
  # }
4579
4678
  #
4580
4679
  # @!attribute [rw] directory_id
4581
- # The identifier of the AWS Managed Microsoft AD directory that you
4582
- # want to stop sharing.
4680
+ # The identifier of the Managed Microsoft AD directory that you want
4681
+ # to stop sharing.
4583
4682
  # @return [String]
4584
4683
  #
4585
4684
  # @!attribute [rw] unshare_target
@@ -4644,7 +4743,7 @@ module Aws::DirectoryService
4644
4743
  # @return [String]
4645
4744
  #
4646
4745
  # @!attribute [rw] request_id
4647
- # The AWS request identifier.
4746
+ # The Amazon Web Services request identifier.
4648
4747
  # @return [String]
4649
4748
  #
4650
4749
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/UnsupportedOperationException AWS API Documentation
@@ -4668,8 +4767,8 @@ module Aws::DirectoryService
4668
4767
  # }
4669
4768
  #
4670
4769
  # @!attribute [rw] directory_id
4671
- # The directory ID of the AWS directory for which to update the
4672
- # conditional forwarder.
4770
+ # The directory ID of the Amazon Web Services directory for which to
4771
+ # update the conditional forwarder.
4673
4772
  # @return [String]
4674
4773
  #
4675
4774
  # @!attribute [rw] remote_domain_name
@@ -4798,7 +4897,7 @@ module Aws::DirectoryService
4798
4897
  end
4799
4898
 
4800
4899
  # @!attribute [rw] request_id
4801
- # The AWS request identifier.
4900
+ # The Amazon Web Services request identifier.
4802
4901
  # @return [String]
4803
4902
  #
4804
4903
  # @!attribute [rw] trust_id
@@ -4821,7 +4920,7 @@ module Aws::DirectoryService
4821
4920
  # @return [String]
4822
4921
  #
4823
4922
  # @!attribute [rw] request_id
4824
- # The AWS request identifier.
4923
+ # The Amazon Web Services request identifier.
4825
4924
  # @return [String]
4826
4925
  #
4827
4926
  # @see http://docs.aws.amazon.com/goto/WebAPI/ds-2015-04-16/UserDoesNotExistException AWS API Documentation
@@ -4834,7 +4933,7 @@ module Aws::DirectoryService
4834
4933
  end
4835
4934
 
4836
4935
  # Initiates the verification of an existing trust relationship between
4837
- # an AWS Managed Microsoft AD directory and an external domain.
4936
+ # an Managed Microsoft AD directory and an external domain.
4838
4937
  #
4839
4938
  # @note When making an API call, you may pass VerifyTrustRequest
4840
4939
  # data as a hash: