From bec929bcce801fcf5eb9812d7e2bab01174429d8 Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Tue, 16 Jun 2026 07:46:15 -0500 Subject: [PATCH 01/10] update controlcatalog cli example docs --- .../examples/controlcatalog/get-control.rst | 34 ++++++ .../controlcatalog/list-common-controls.rst | 92 ++++++++++++++ .../controlcatalog/list-control-mappings.rst | 81 +++++++++++++ .../examples/controlcatalog/list-controls.rst | 112 ++++++++++++++++++ .../examples/controlcatalog/list-domains.rst | 29 +++++ .../controlcatalog/list-objectives.rst | 76 ++++++++++++ 6 files changed, 424 insertions(+) create mode 100644 awscli/examples/controlcatalog/get-control.rst create mode 100644 awscli/examples/controlcatalog/list-common-controls.rst create mode 100644 awscli/examples/controlcatalog/list-control-mappings.rst create mode 100644 awscli/examples/controlcatalog/list-controls.rst create mode 100644 awscli/examples/controlcatalog/list-domains.rst create mode 100644 awscli/examples/controlcatalog/list-objectives.rst diff --git a/awscli/examples/controlcatalog/get-control.rst b/awscli/examples/controlcatalog/get-control.rst new file mode 100644 index 000000000000..ec1a78d6f2cb --- /dev/null +++ b/awscli/examples/controlcatalog/get-control.rst @@ -0,0 +1,34 @@ +**To get information about individual control** + +The following ``get-control`` example gets information about individual control. :: + + aws controlcatalog get-control \ + --control-arn arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav + +Output:: + + { + "Arn": "arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav", + "Aliases": [ + "AWS-GR_REGION_DENY" + ], + "Name": "Deny access to AWS based on the requested AWS Region for the landing zone", + "Description": "Disallows access to unlisted operations in global and regional services outside of the specified Regions for the landing zone.", + "Behavior": "PREVENTIVE", + "Severity": "MEDIUM", + "RegionConfiguration": { + "Scope": "GLOBAL" + }, + "Implementation": { + "Type": "AWS::Organizations::Policy::SERVICE_CONTROL_POLICY" + }, + "ParameterRequirementSummary": "NONE", + "Parameters": [], + "CreateTime": "2022-07-25T19:00:00-05:00", + "GovernedResources": [], + "GovernedProviders": [ + "AWS" + ] + } + +For more information, see `The AWS Control Tower Control Catalog `__ in the *AWS Control Tower User Guide*. diff --git a/awscli/examples/controlcatalog/list-common-controls.rst b/awscli/examples/controlcatalog/list-common-controls.rst new file mode 100644 index 000000000000..6f7aca232792 --- /dev/null +++ b/awscli/examples/controlcatalog/list-common-controls.rst @@ -0,0 +1,92 @@ +**Example 1: To list all common controls from the AWS Control Catalog** + +The following ``list-common-controls`` example lists all common controls from the AWS Control Catalog. :: + + aws controlcatalog list-common-controls + +Output:: + + { + "CommonControls": [ + { + "Arn": "arn:aws:controlcatalog:::common-control/d4s7ik8fgv8082v3x31hifzcc", + "Name": "Asset inventory reconciliation and audit", + "Description": "Reconcile the organization's asset inventory with other data sources, and conduct asset audits to verify the accuracy of the asset inventory.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "Objective": { + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Name": "Asset inventory management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::common-control/7encqm6cfsw704eoahh3ujr7y", + "Name": "Asset valuation", + "Description": "Assign a value to assets based on their cost, replacement value, or other relevant factors.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "Objective": { + "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0rtss98u", + "Name": "Asset classification" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + ... + ] + } + +For more information, see `About common controls `__ in the *AWS Control Tower User Guide*. + +**Example 2: To list common controls that have a specific objective** + +The following ``list-common-controls`` example lists common controls that have a specific objective. :: + + aws controlcatalog list-common-controls \ + --common-control-filter '{"Objectives": [{"Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn"}]}' + +Output:: + + { + "CommonControls": [ + { + "Arn": "arn:aws:controlcatalog:::common-control/d4s7ik8fgv8082v3x31hifzcc", + "Name": "Asset inventory reconciliation and audit", + "Description": "Reconcile the organization's asset inventory with other data sources, and conduct asset audits to verify the accuracy of the asset inventory.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "Objective": { + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Name": "Asset inventory management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::common-control/1ukpmkewk4i92tjmhsvewi4y7", + "Name": "Inventory of authorized assets and automated discovery", + "Description": "Maintain an asset inventory of organization authorized and existing hardware, software, and media. Where possible, utilize automated tools to facilitate the discovery and ongoing tracking of such assets.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "Objective": { + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Name": "Asset inventory management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + ... + ] + } + +For more information, see `About common controls `__ in the *AWS Control Tower User Guide*. diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst new file mode 100644 index 000000000000..df99c0e57cdb --- /dev/null +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -0,0 +1,81 @@ +**Example 1: To provide information of all control mapping types** + +The following ``list-control-mappings`` example provides information about all control mapping types. :: + + aws controlcatalog list-control-mappings + +Output:: + + { + "ControlMappings": [ + { + "ControlArn": "arn:aws:controlcatalog:::control/ckrg5g06x08c6pem7ee4is3k5", + "MappingType": "FRAMEWORK", + "Mapping": { + "Framework": { + "Name": "SSAE-18-SOC-2-Oct-2023", + "Item": "CC6.1" + } + } + }, + { + "ControlArn": "arn:aws:controlcatalog:::control/5lwgwp498974xwygy5ge7pxfz", + "MappingType": "FRAMEWORK", + "Mapping": { + "Framework": { + "Name": "CIS-v8.0", + "Item": "14.6" + } + } + }, + { + "ControlArn": "arn:aws:controlcatalog:::control/6s095tcdtgab75dd0229m5x6n", + "MappingType": "COMMON_CONTROL", + "Mapping": { + "CommonControl": { + "CommonControlArn": "arn:aws:controlcatalog:::common-control/c0kq7ddgbp8ivhicnlr0plch4" + } + } + }, + ... + ] + } + +For more information, see `ControlMapping `__ in the *AWS Control Catalog User Guide*. + +**Example 2: To provide information of a specific control mapping type** + +The following ``list-control-mappings`` example provides information about a control mapping type. :: + + aws controlcatalog list-control-mappings \ + --filter MappingTypes=FRAMEWORK + +Output:: + + { + "ControlMappings": [ + { + "ControlArn": "arn:aws:controlcatalog:::control/ckrg5g06x08c6pem7ee4is3k5", + "MappingType": "FRAMEWORK", + "Mapping": { + "Framework": { + "Name": "SSAE-18-SOC-2-Oct-2023", + "Item": "CC6.1" + } + } + }, + { + "ControlArn": "arn:aws:controlcatalog:::control/5lwgwp498974xwygy5ge7pxfz", + "MappingType": "FRAMEWORK", + "Mapping": { + "Framework": { + "Name": "CIS-v8.0", + "Item": "14.6" + } + } + }, + ... + ] + } + +For more information, see `ControlMapping `__ in the *AWS Control Catalog User Guide*. diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst new file mode 100644 index 000000000000..b6068bf552fd --- /dev/null +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -0,0 +1,112 @@ +**Example 1: To list all available controls in the Control Catalog library** + +The following ``list-controls`` example lists all available controls in the Control Catalog library. :: + + aws controlcatalog list-controls + +Output:: + + { + "Controls": [ + { + "Arn": "arn:aws:controlcatalog:::control/m7a5gbdf08wg2o0en010mkng", + "Aliases": [ + "BACKUP_RECOVERY_POINT_MINIMUM_RETENTION_CHECK" + ], + "Name": "Checks if a recovery point expires no earlier than after the specified period", + "Description": "Checks if a recovery point expires no earlier than after the specified period. The rule is NON_COMPLIANT if the recovery point has a retention point that is less than the required retention period.", + "Behavior": "DETECTIVE", + "Severity": "MEDIUM", + "ParameterRequirementSummary": "OPTIONAL", + "Implementation": { + "Type": "AWS::Config::ConfigRule", + "Identifier": "BACKUP_RECOVERY_POINT_MINIMUM_RETENTION_CHECK" + }, + "CreateTime": "2021-07-22T19:00:00-05:00", + "GovernedResources": [], + "GovernedProviders": [ + "AWS" + ] + }, + { + "Arn": "arn:aws:controlcatalog:::control/4b0nsxnd47747up54ytdqesxi", + "Aliases": [ + "CT.CODEBUILD.PR.3" + ], + "Name": "Require any AWS CodeBuild project environment to have logging configured", + "Description": "This control checks whether AWS CodeBuild projects environment has at least one logging option enabled.", + "Behavior": "PROACTIVE", + "Severity": "MEDIUM", + "ParameterRequirementSummary": "NONE", + "Implementation": { + "Type": "AWS::CloudFormation::Type::HOOK" + }, + "CreateTime": "2022-11-27T18:00:00-06:00", + "GovernedProviders": [ + "AWS" + ] + }, + ... + ] + } + +For more information, see `The AWS Control Tower Control Catalog `__ in the *AWS Control Tower User Guide*. + +**Example 2: To list specific controls in the Control Catalog library** + +The following ``list-controls`` example lists specific controls in the Control Catalog library. :: + + aws controlcatalog list-controls \ + —filter '{"Implementations": {"Types": ["AWS::CloudFormation::Type::HOOK"]}}' + +Output:: + + { + "Controls": [ + { + "Arn": "arn:aws:controlcatalog:::control/4b0nsxnd47747up54ytdqesxi", + "Aliases": [ + "CT.CODEBUILD.PR.3" + ], + "Name": "Require any AWS CodeBuild project environment to have logging configured", + "Description": "This control checks whether AWS CodeBuild projects environment has at least one logging option enabled.", + "Behavior": "PROACTIVE", + "Severity": "MEDIUM", + "ParameterRequirementSummary": "NONE", + "Implementation": { + "Type": "AWS::CloudFormation::Type::HOOK" + }, + "CreateTime": "2022-11-27T18:00:00-06:00", + "GovernedResources": [ + "AWS::CodeBuild::Project" + ], + "GovernedProviders": [ + "AWS" + ] + }, + { + "Arn": "arn:aws:controlcatalog:::control/6unff4za5vtu72g08jic7cetr", + "Aliases": [ + "CT.RDS.PR.5" + ], + "Name": "Require an Amazon RDS database instance to have minor version upgrades configured", + "Description": "This control checks whether automatic minor version upgrades are enabled for an Amazon RDS database instance.", + "Behavior": "PROACTIVE", + "Severity": "HIGH", + "ParameterRequirementSummary": "NONE", + "Implementation": { + "Type": "AWS::CloudFormation::Type::HOOK" + }, + "CreateTime": "2022-11-27T18:00:00-06:00", + "GovernedResources": [ + "AWS::RDS::DBInstance" + ], + "GovernedProviders": [ + "AWS" + ] + }, + ... + ] + } + +For more information, see `The AWS Control Tower Control Catalog `__ in the *AWS Control Tower User Guide*. diff --git a/awscli/examples/controlcatalog/list-domains.rst b/awscli/examples/controlcatalog/list-domains.rst new file mode 100644 index 000000000000..f96c2250a367 --- /dev/null +++ b/awscli/examples/controlcatalog/list-domains.rst @@ -0,0 +1,29 @@ +**To list domains from the Control Catalog** + +The following ``list-domains` example lists domains from the Control Catalog. :: + + aws controlcatalog list-domains + +Output:: + +{ + "Domains": [ + { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management", + "Description": "This control domain focuses on asset management and the systematic tracking and maintenance of physical or digital assets throughout their lifecycle, including acquisition, utilization, and disposal. This reduces risks related to accidents, malfunctions, and other issues that may cause damage to property or harm to people.", + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery", + "Description": "This control domain focuses on planning and preparation of procedures and resources to ensure the continued operation of critical business functions in the event of a disruption, and to facilitate the recovery of normal operations afterwards.", + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + ... + ] +} + +For more information, see `DomainSummary `__ in the *AWS Control Catalog User Guide*. \ No newline at end of file diff --git a/awscli/examples/controlcatalog/list-objectives.rst b/awscli/examples/controlcatalog/list-objectives.rst new file mode 100644 index 000000000000..5e968f28cf79 --- /dev/null +++ b/awscli/examples/controlcatalog/list-objectives.rst @@ -0,0 +1,76 @@ +**Example 1: To list objectives from the Control Catalog** + +The following ``list-objectives`` example lists control objectives in the Control catalog. :: + + aws controlcatalog list-objectives + +Output:: + +{ + "Objectives": [ + { + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Name": "Asset inventory management", + "Description": "This control objective focuses on maintaining an accurate and up-to-date inventory of assets, including hardware, software, and data, to protect organization investments from harm or loss.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0rtss98u", + "Name": "Asset classification", + "Description": "This control objective focuses on classifying assets based on their value, sensitivity, and criticality to the organization to manage investment risk and unauthorized access to assets and information.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + ... + ] +} + +For more information, see `Control catalog: control objectives `__ in the *AWS Control Catalog User Guide*. + +**Example 2: To list specific objectives from the Control Catalog** + +The following ``list-objectives`` example lists specific control objectives in the Control catalog. :: + + aws controlcatalog list-objectives \ + --objective-filter '{"Domains": [{"Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i"}]}' + +Output:: + +{ + "Objectives": [ + { + "Arn": "arn:aws:controlcatalog:::objective/9l3arklghxiyc6ehiknf70gti", + "Name": "Business continuity", + "Description": "This control objective focuses on developing and maintaining plans, procedures, and protocols that support an organization's ability to recover critical business functions in the event of a disruption, including backup and recovery and business impact analysis.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::objective/8fub2rjbldjmrseky5zqny6b0", + "Name": "Disaster recovery", + "Description": "This control objective focuses on the steps and technologies necessary to recover critical information resources in the event of a natural disaster, security event and/or incident, and/or system outage and ensure critical business functions can continue.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + ... + ] + } + +For more information, see `Control catalog: control objectives `__ in the *AWS Control Catalog User Guide*. From 93772014f4f84cb03f65508997209d23d607bb7a Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Tue, 16 Jun 2026 16:41:59 -0500 Subject: [PATCH 02/10] updated the cli examples --- .../examples/controlcatalog/get-control.rst | 7 ++- .../controlcatalog/list-common-controls.rst | 8 +-- .../controlcatalog/list-control-mappings.rst | 11 ++-- .../examples/controlcatalog/list-controls.rst | 57 +++++++------------ .../examples/controlcatalog/list-domains.rst | 4 +- .../controlcatalog/list-objectives.rst | 8 +-- 6 files changed, 39 insertions(+), 56 deletions(-) diff --git a/awscli/examples/controlcatalog/get-control.rst b/awscli/examples/controlcatalog/get-control.rst index ec1a78d6f2cb..b1495770b2d8 100644 --- a/awscli/examples/controlcatalog/get-control.rst +++ b/awscli/examples/controlcatalog/get-control.rst @@ -1,9 +1,10 @@ -**To get information about individual control** +**To show information about an individual control** -The following ``get-control`` example gets information about individual control. :: +The following ``get-control`` example shows information about an individual control. :: aws controlcatalog get-control \ - --control-arn arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav + --control-arn arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav \ + --region us-east-1 Output:: diff --git a/awscli/examples/controlcatalog/list-common-controls.rst b/awscli/examples/controlcatalog/list-common-controls.rst index 6f7aca232792..58db9b0a5d55 100644 --- a/awscli/examples/controlcatalog/list-common-controls.rst +++ b/awscli/examples/controlcatalog/list-common-controls.rst @@ -1,6 +1,6 @@ -**Example 1: To list all common controls from the AWS Control Catalog** +**Example 1: To display all common controls from the AWS Control Catalog** -The following ``list-common-controls`` example lists all common controls from the AWS Control Catalog. :: +The following ``list-common-controls`` example displays all common controls from the AWS Control Catalog. :: aws controlcatalog list-common-controls @@ -44,9 +44,9 @@ Output:: For more information, see `About common controls `__ in the *AWS Control Tower User Guide*. -**Example 2: To list common controls that have a specific objective** +**Example 2: To display common controls that have a specific objective** -The following ``list-common-controls`` example lists common controls that have a specific objective. :: +The following ``list-common-controls`` example displays common controls that have a specific objective. :: aws controlcatalog list-common-controls \ --common-control-filter '{"Objectives": [{"Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn"}]}' diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index df99c0e57cdb..471ca96ecbce 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -1,8 +1,9 @@ -**Example 1: To provide information of all control mapping types** +**Example 1: To retrieve information of all control mapping types** -The following ``list-control-mappings`` example provides information about all control mapping types. :: +The following ``list-control-mappings`` example retrieves information about all control mapping types. :: - aws controlcatalog list-control-mappings + aws controlcatalog list-control-mappings \ + --region us-east-1 Output:: @@ -43,9 +44,9 @@ Output:: For more information, see `ControlMapping `__ in the *AWS Control Catalog User Guide*. -**Example 2: To provide information of a specific control mapping type** +**Example 2: To retrieve information of a specific control mapping type** -The following ``list-control-mappings`` example provides information about a control mapping type. :: +The following ``list-control-mappings`` example retrieves information about a control mapping type. :: aws controlcatalog list-control-mappings \ --filter MappingTypes=FRAMEWORK diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst index b6068bf552fd..808b9e3ddecd 100644 --- a/awscli/examples/controlcatalog/list-controls.rst +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -1,8 +1,9 @@ -**Example 1: To list all available controls in the Control Catalog library** +**Example 1: To retrieve a list of available controls in the Control Catalog library** -The following ``list-controls`` example lists all available controls in the Control Catalog library. :: +The following ``list-controls`` example retrieves a list of available controls in the Control Catalog library. :: - aws controlcatalog list-controls + aws controlcatalog list-controls \ + --region us-east-1 Output:: @@ -52,60 +53,40 @@ Output:: For more information, see `The AWS Control Tower Control Catalog `__ in the *AWS Control Tower User Guide*. -**Example 2: To list specific controls in the Control Catalog library** +**Example 2: To retrieve a list available controls filtered by identifier and implementation type** -The following ``list-controls`` example lists specific controls in the Control Catalog library. :: +The following ``list-controls`` example retrieves a list of available controls filtered by identifier and implementation type. :: aws controlcatalog list-controls \ - —filter '{"Implementations": {"Types": ["AWS::CloudFormation::Type::HOOK"]}}' + --filter "{\"Implementations\":{\"Identifiers\":[\"CODEPIPELINE_DEPLOYMENT_COUNT_CHECK\"], \"Types\":[\"AWS::Config::ConfigRule\"]}}" \ + --region us-east-1 Output:: { "Controls": [ { - "Arn": "arn:aws:controlcatalog:::control/4b0nsxnd47747up54ytdqesxi", + "Arn": "arn:aws:controlcatalog:::control/8k65jh499ji8qa5tb3it7tdi5", "Aliases": [ - "CT.CODEBUILD.PR.3" + "CONFIG.CODEPIPELINE.DT.1" ], - "Name": "Require any AWS CodeBuild project environment to have logging configured", - "Description": "This control checks whether AWS CodeBuild projects environment has at least one logging option enabled.", - "Behavior": "PROACTIVE", + "Name": "Checks if the first deployment stage of AWS CodePipeline performs more than one deployment", + "Description": "Checks if the first deployment stage of AWS CodePipeline performs more than one deployment. Optionally checks if each of the subsequent remaining stages deploy to more than the specified number of deployments (deploymentLimit).", + "Behavior": "DETECTIVE", "Severity": "MEDIUM", - "ParameterRequirementSummary": "NONE", - "Implementation": { - "Type": "AWS::CloudFormation::Type::HOOK" - }, - "CreateTime": "2022-11-27T18:00:00-06:00", - "GovernedResources": [ - "AWS::CodeBuild::Project" - ], - "GovernedProviders": [ - "AWS" - ] - }, - { - "Arn": "arn:aws:controlcatalog:::control/6unff4za5vtu72g08jic7cetr", - "Aliases": [ - "CT.RDS.PR.5" - ], - "Name": "Require an Amazon RDS database instance to have minor version upgrades configured", - "Description": "This control checks whether automatic minor version upgrades are enabled for an Amazon RDS database instance.", - "Behavior": "PROACTIVE", - "Severity": "HIGH", - "ParameterRequirementSummary": "NONE", + "ParameterRequirementSummary": "OPTIONAL", "Implementation": { - "Type": "AWS::CloudFormation::Type::HOOK" + "Type": "AWS::Config::ConfigRule", + "Identifier": "CODEPIPELINE_DEPLOYMENT_COUNT_CHECK" }, - "CreateTime": "2022-11-27T18:00:00-06:00", + "CreateTime": "2018-10-31T19:00:00-05:00", "GovernedResources": [ - "AWS::RDS::DBInstance" + "AWS::CodePipeline::Pipeline" ], "GovernedProviders": [ "AWS" ] - }, - ... + } ] } diff --git a/awscli/examples/controlcatalog/list-domains.rst b/awscli/examples/controlcatalog/list-domains.rst index f96c2250a367..975f1cd0d31e 100644 --- a/awscli/examples/controlcatalog/list-domains.rst +++ b/awscli/examples/controlcatalog/list-domains.rst @@ -1,6 +1,6 @@ -**To list domains from the Control Catalog** +**To show a list of domains from the Control Catalog** -The following ``list-domains` example lists domains from the Control Catalog. :: +The following ``list-domains` example shows a list of domains from the Control Catalog. :: aws controlcatalog list-domains diff --git a/awscli/examples/controlcatalog/list-objectives.rst b/awscli/examples/controlcatalog/list-objectives.rst index 5e968f28cf79..dd633072f5a6 100644 --- a/awscli/examples/controlcatalog/list-objectives.rst +++ b/awscli/examples/controlcatalog/list-objectives.rst @@ -1,6 +1,6 @@ -**Example 1: To list objectives from the Control Catalog** +**Example 1: To display a list objectives from the Control Catalog** -The following ``list-objectives`` example lists control objectives in the Control catalog. :: +The following ``list-objectives`` example displays a list of control objectives in the Control catalog. :: aws controlcatalog list-objectives @@ -36,9 +36,9 @@ Output:: For more information, see `Control catalog: control objectives `__ in the *AWS Control Catalog User Guide*. -**Example 2: To list specific objectives from the Control Catalog** +**Example 2: To display a list of specific objectives filtered by domain** -The following ``list-objectives`` example lists specific control objectives in the Control catalog. :: +The following ``list-objectives`` example displays a list of specific control objectives filtered by domain. :: aws controlcatalog list-objectives \ --objective-filter '{"Domains": [{"Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i"}]}' From b9384bb29289d3e8f5c677e03e0d9d62f79f4300 Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Mon, 22 Jun 2026 08:24:58 -0500 Subject: [PATCH 03/10] fix indentation on code block --- .../controlcatalog/list-common-controls.rst | 6 +- .../controlcatalog/list-control-mappings.rst | 6 +- .../examples/controlcatalog/list-controls.rst | 3 +- .../examples/controlcatalog/list-domains.rst | 37 ++++--- .../controlcatalog/list-objectives.rst | 98 +++++++++---------- 5 files changed, 71 insertions(+), 79 deletions(-) diff --git a/awscli/examples/controlcatalog/list-common-controls.rst b/awscli/examples/controlcatalog/list-common-controls.rst index 58db9b0a5d55..c3735fd5e5cc 100644 --- a/awscli/examples/controlcatalog/list-common-controls.rst +++ b/awscli/examples/controlcatalog/list-common-controls.rst @@ -37,8 +37,7 @@ Output:: }, "CreateTime": "2024-03-12T19:00:00-05:00", "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - ... + } ] } @@ -84,8 +83,7 @@ Output:: }, "CreateTime": "2024-03-12T19:00:00-05:00", "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - ... + } ] } diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index 471ca96ecbce..2bdbe5c117f4 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -37,8 +37,7 @@ Output:: "CommonControlArn": "arn:aws:controlcatalog:::common-control/c0kq7ddgbp8ivhicnlr0plch4" } } - }, - ... + } ] } @@ -74,8 +73,7 @@ Output:: "Item": "14.6" } } - }, - ... + } ] } diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst index 808b9e3ddecd..1359852f5ec3 100644 --- a/awscli/examples/controlcatalog/list-controls.rst +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -46,8 +46,7 @@ Output:: "GovernedProviders": [ "AWS" ] - }, - ... + } ] } diff --git a/awscli/examples/controlcatalog/list-domains.rst b/awscli/examples/controlcatalog/list-domains.rst index 975f1cd0d31e..b3b7dfac2a57 100644 --- a/awscli/examples/controlcatalog/list-domains.rst +++ b/awscli/examples/controlcatalog/list-domains.rst @@ -6,24 +6,23 @@ The following ``list-domains` example shows a list of domains from the Control C Output:: -{ - "Domains": [ - { - "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", - "Name": "Asset management", - "Description": "This control domain focuses on asset management and the systematic tracking and maintenance of physical or digital assets throughout their lifecycle, including acquisition, utilization, and disposal. This reduces risks related to accidents, malfunctions, and other issues that may cause damage to property or harm to people.", - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - { - "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", - "Name": "Business continuity and recovery", - "Description": "This control domain focuses on planning and preparation of procedures and resources to ensure the continued operation of critical business functions in the event of a disruption, and to facilitate the recovery of normal operations afterwards.", - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - ... - ] -} + { + "Domains": [ + { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management", + "Description": "This control domain focuses on asset management and the systematic tracking and maintenance of physical or digital assets throughout their lifecycle, including acquisition, utilization, and disposal. This reduces risks related to accidents, malfunctions, and other issues that may cause damage to property or harm to people.", + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + }, + { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery", + "Description": "This control domain focuses on planning and preparation of procedures and resources to ensure the continued operation of critical business functions in the event of a disruption, and to facilitate the recovery of normal operations afterwards.", + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + } + ] + } For more information, see `DomainSummary `__ in the *AWS Control Catalog User Guide*. \ No newline at end of file diff --git a/awscli/examples/controlcatalog/list-objectives.rst b/awscli/examples/controlcatalog/list-objectives.rst index dd633072f5a6..8ffc6593d371 100644 --- a/awscli/examples/controlcatalog/list-objectives.rst +++ b/awscli/examples/controlcatalog/list-objectives.rst @@ -6,33 +6,32 @@ The following ``list-objectives`` example displays a list of control objectives Output:: -{ - "Objectives": [ - { - "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", - "Name": "Asset inventory management", - "Description": "This control objective focuses on maintaining an accurate and up-to-date inventory of assets, including hardware, software, and data, to protect organization investments from harm or loss.", - "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", - "Name": "Asset management" + { + "Objectives": [ + { + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Name": "Asset inventory management", + "Description": "This control objective focuses on maintaining an accurate and up-to-date inventory of assets, including hardware, software, and data, to protect organization investments from harm or loss.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" }, - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - { - "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0rtss98u", - "Name": "Asset classification", - "Description": "This control objective focuses on classifying assets based on their value, sensitivity, and criticality to the organization to manage investment risk and unauthorized access to assets and information.", - "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", - "Name": "Asset management" - }, - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - ... - ] -} + { + "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0rtss98u", + "Name": "Asset classification", + "Description": "This control objective focuses on classifying assets based on their value, sensitivity, and criticality to the organization to manage investment risk and unauthorized access to assets and information.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Name": "Asset management" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + } + ] + } For more information, see `Control catalog: control objectives `__ in the *AWS Control Catalog User Guide*. @@ -45,31 +44,30 @@ The following ``list-objectives`` example displays a list of specific control ob Output:: -{ - "Objectives": [ - { - "Arn": "arn:aws:controlcatalog:::objective/9l3arklghxiyc6ehiknf70gti", - "Name": "Business continuity", - "Description": "This control objective focuses on developing and maintaining plans, procedures, and protocols that support an organization's ability to recover critical business functions in the event of a disruption, including backup and recovery and business impact analysis.", - "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", - "Name": "Business continuity and recovery" - }, - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - { - "Arn": "arn:aws:controlcatalog:::objective/8fub2rjbldjmrseky5zqny6b0", - "Name": "Disaster recovery", - "Description": "This control objective focuses on the steps and technologies necessary to recover critical information resources in the event of a natural disaster, security event and/or incident, and/or system outage and ensure critical business functions can continue.", - "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", - "Name": "Business continuity and recovery" + { + "Objectives": [ + { + "Arn": "arn:aws:controlcatalog:::objective/9l3arklghxiyc6ehiknf70gti", + "Name": "Business continuity", + "Description": "This control objective focuses on developing and maintaining plans, procedures, and protocols that support an organization's ability to recover critical business functions in the event of a disruption, including backup and recovery and business impact analysis.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" }, - "CreateTime": "2024-03-12T19:00:00-05:00", - "LastUpdateTime": "2024-03-12T19:00:00-05:00" - }, - ... + { + "Arn": "arn:aws:controlcatalog:::objective/8fub2rjbldjmrseky5zqny6b0", + "Name": "Disaster recovery", + "Description": "This control objective focuses on the steps and technologies necessary to recover critical information resources in the event of a natural disaster, security event and/or incident, and/or system outage and ensure critical business functions can continue.", + "Domain": { + "Arn": "arn:aws:controlcatalog:::domain/33mjpzadrlwo1by3c1012ai5i", + "Name": "Business continuity and recovery" + }, + "CreateTime": "2024-03-12T19:00:00-05:00", + "LastUpdateTime": "2024-03-12T19:00:00-05:00" + } ] } From 3cc17c611669081521b3dd8654a97eab656ef943 Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Mon, 22 Jun 2026 14:22:15 -0500 Subject: [PATCH 04/10] fix formatting --- awscli/examples/controlcatalog/list-control-mappings.rst | 2 +- awscli/examples/controlcatalog/list-controls.rst | 2 +- awscli/examples/controlcatalog/list-domains.rst | 2 +- awscli/examples/controlcatalog/list-objectives.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index 2bdbe5c117f4..11388f131a3c 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -1,6 +1,6 @@ **Example 1: To retrieve information of all control mapping types** -The following ``list-control-mappings`` example retrieves information about all control mapping types. :: +The following ``list-control-mappings`` example retrieves information about all control mapping types. :: aws controlcatalog list-control-mappings \ --region us-east-1 diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst index 1359852f5ec3..0d43abb9fdcf 100644 --- a/awscli/examples/controlcatalog/list-controls.rst +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -1,6 +1,6 @@ **Example 1: To retrieve a list of available controls in the Control Catalog library** -The following ``list-controls`` example retrieves a list of available controls in the Control Catalog library. :: +The following ``list-controls`` example retrieves a list of available controls in the Control Catalog library. :: aws controlcatalog list-controls \ --region us-east-1 diff --git a/awscli/examples/controlcatalog/list-domains.rst b/awscli/examples/controlcatalog/list-domains.rst index b3b7dfac2a57..16cea3db144e 100644 --- a/awscli/examples/controlcatalog/list-domains.rst +++ b/awscli/examples/controlcatalog/list-domains.rst @@ -1,6 +1,6 @@ **To show a list of domains from the Control Catalog** -The following ``list-domains` example shows a list of domains from the Control Catalog. :: +The following ``list-domains`` example shows a list of domains from the Control Catalog. :: aws controlcatalog list-domains diff --git a/awscli/examples/controlcatalog/list-objectives.rst b/awscli/examples/controlcatalog/list-objectives.rst index 8ffc6593d371..b067c43cb73a 100644 --- a/awscli/examples/controlcatalog/list-objectives.rst +++ b/awscli/examples/controlcatalog/list-objectives.rst @@ -1,6 +1,6 @@ **Example 1: To display a list objectives from the Control Catalog** -The following ``list-objectives`` example displays a list of control objectives in the Control catalog. :: +The following ``list-objectives`` example displays a list of control objectives in the Control catalog. :: aws controlcatalog list-objectives From e713d734142a9faa78027864e068660e5343528b Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Tue, 23 Jun 2026 08:44:21 -0500 Subject: [PATCH 05/10] fix grammar and suggestions --- awscli/examples/controlcatalog/list-control-mappings.rst | 7 +++---- awscli/examples/controlcatalog/list-controls.rst | 8 +++----- awscli/examples/controlcatalog/list-objectives.rst | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index 11388f131a3c..2b116d81de3a 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -2,8 +2,7 @@ The following ``list-control-mappings`` example retrieves information about all control mapping types. :: - aws controlcatalog list-control-mappings \ - --region us-east-1 + aws controlcatalog list-control-mappings Output:: @@ -41,7 +40,7 @@ Output:: ] } -For more information, see `ControlMapping `__ in the *AWS Control Catalog User Guide*. +For more information, see `Ontology overview `__ in the *AWS Control Catalog User Guide*. **Example 2: To retrieve information of a specific control mapping type** @@ -77,4 +76,4 @@ Output:: ] } -For more information, see `ControlMapping `__ in the *AWS Control Catalog User Guide*. +For more information, see `Ontology overview `__ in the *AWS Control Catalog User Guide*. diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst index 0d43abb9fdcf..3d67a92b8e17 100644 --- a/awscli/examples/controlcatalog/list-controls.rst +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -2,8 +2,7 @@ The following ``list-controls`` example retrieves a list of available controls in the Control Catalog library. :: - aws controlcatalog list-controls \ - --region us-east-1 + aws controlcatalog list-controls Output:: @@ -52,13 +51,12 @@ Output:: For more information, see `The AWS Control Tower Control Catalog `__ in the *AWS Control Tower User Guide*. -**Example 2: To retrieve a list available controls filtered by identifier and implementation type** +**Example 2: To retrieve a list of available controls filtered by identifier and implementation type** The following ``list-controls`` example retrieves a list of available controls filtered by identifier and implementation type. :: aws controlcatalog list-controls \ - --filter "{\"Implementations\":{\"Identifiers\":[\"CODEPIPELINE_DEPLOYMENT_COUNT_CHECK\"], \"Types\":[\"AWS::Config::ConfigRule\"]}}" \ - --region us-east-1 + --filter "{\"Implementations\":{\"Identifiers\":[\"CODEPIPELINE_DEPLOYMENT_COUNT_CHECK\"], \"Types\":[\"AWS::Config::ConfigRule\"]}}" Output:: diff --git a/awscli/examples/controlcatalog/list-objectives.rst b/awscli/examples/controlcatalog/list-objectives.rst index b067c43cb73a..9aa4417f9228 100644 --- a/awscli/examples/controlcatalog/list-objectives.rst +++ b/awscli/examples/controlcatalog/list-objectives.rst @@ -1,6 +1,6 @@ -**Example 1: To display a list objectives from the Control Catalog** +**Example 1: To display a list of objectives from the Control Catalog** -The following ``list-objectives`` example displays a list of control objectives in the Control catalog. :: +The following ``list-objectives`` example displays a list of control objectives in the Control Catalog. :: aws controlcatalog list-objectives From 4cd54f3ce72c09a6a583f586138b2398cffe0c12 Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Tue, 23 Jun 2026 08:52:00 -0500 Subject: [PATCH 06/10] fix grammar and suggestions --- awscli/examples/controlcatalog/list-domains.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awscli/examples/controlcatalog/list-domains.rst b/awscli/examples/controlcatalog/list-domains.rst index 16cea3db144e..ec4918e2684e 100644 --- a/awscli/examples/controlcatalog/list-domains.rst +++ b/awscli/examples/controlcatalog/list-domains.rst @@ -25,4 +25,4 @@ Output:: ] } -For more information, see `DomainSummary `__ in the *AWS Control Catalog User Guide*. \ No newline at end of file +For more information, see `Ontology overview `__ in the *AWS Control Catalog User Guide*. \ No newline at end of file From 84af4cd38210226ff491e9bad5d3439bbd85407c Mon Sep 17 00:00:00 2001 From: eodeyemi14 <84422131+eodeyemi14@users.noreply.github.com> Date: Wed, 24 Jun 2026 10:29:27 -0500 Subject: [PATCH 07/10] Update awscli/examples/controlcatalog/list-controls.rst Co-authored-by: Kenneth Daily --- awscli/examples/controlcatalog/list-controls.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awscli/examples/controlcatalog/list-controls.rst b/awscli/examples/controlcatalog/list-controls.rst index 3d67a92b8e17..24e301bf3610 100644 --- a/awscli/examples/controlcatalog/list-controls.rst +++ b/awscli/examples/controlcatalog/list-controls.rst @@ -56,7 +56,7 @@ For more information, see `The AWS Control Tower Control Catalog Date: Wed, 24 Jun 2026 10:29:44 -0500 Subject: [PATCH 08/10] Update awscli/examples/controlcatalog/list-control-mappings.rst Co-authored-by: Kenneth Daily --- awscli/examples/controlcatalog/list-control-mappings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index 2b116d81de3a..ca68d169707e 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -1,6 +1,6 @@ -**Example 1: To retrieve information of all control mapping types** +**Example 1: To retrieve a list of all control mapping types** -The following ``list-control-mappings`` example retrieves information about all control mapping types. :: +The following ``list-control-mappings`` example retrieves a list of all control mapping types. :: aws controlcatalog list-control-mappings From 38d878c7a9008f6ed2adac90185bec423a88ea4c Mon Sep 17 00:00:00 2001 From: eodeyemi14 <84422131+eodeyemi14@users.noreply.github.com> Date: Wed, 24 Jun 2026 10:29:57 -0500 Subject: [PATCH 09/10] Update awscli/examples/controlcatalog/list-control-mappings.rst Co-authored-by: Kenneth Daily --- awscli/examples/controlcatalog/list-control-mappings.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awscli/examples/controlcatalog/list-control-mappings.rst b/awscli/examples/controlcatalog/list-control-mappings.rst index ca68d169707e..b01b236d324a 100644 --- a/awscli/examples/controlcatalog/list-control-mappings.rst +++ b/awscli/examples/controlcatalog/list-control-mappings.rst @@ -42,9 +42,9 @@ Output:: For more information, see `Ontology overview `__ in the *AWS Control Catalog User Guide*. -**Example 2: To retrieve information of a specific control mapping type** +**Example 2: To retrieve a list of control mappings of a specific control mapping type** -The following ``list-control-mappings`` example retrieves information about a control mapping type. :: +The following ``list-control-mappings`` example retrieves a list of control mappings of a specific control mapping type. :: aws controlcatalog list-control-mappings \ --filter MappingTypes=FRAMEWORK From 6c754e589837c531a7537e73620dc2a880a9f23e Mon Sep 17 00:00:00 2001 From: eodeyemi14 Date: Wed, 24 Jun 2026 10:47:54 -0500 Subject: [PATCH 10/10] fix grammar and suggestions --- .../examples/controlcatalog/get-control.rst | 5 ++-- .../controlcatalog/list-common-controls.rst | 26 +++++++++---------- .../controlcatalog/list-control-mappings.rst | 12 ++++----- .../examples/controlcatalog/list-controls.rst | 6 ++--- .../examples/controlcatalog/list-domains.rst | 4 +-- .../controlcatalog/list-objectives.rst | 18 ++++++------- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/awscli/examples/controlcatalog/get-control.rst b/awscli/examples/controlcatalog/get-control.rst index b1495770b2d8..b02e196e5c2d 100644 --- a/awscli/examples/controlcatalog/get-control.rst +++ b/awscli/examples/controlcatalog/get-control.rst @@ -3,13 +3,12 @@ The following ``get-control`` example shows information about an individual control. :: aws controlcatalog get-control \ - --control-arn arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav \ - --region us-east-1 + --control-arn arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdEXAMPLE Output:: { - "Arn": "arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdw2z0zav", + "Arn": "arn:aws:controlcatalog:::control/cwlixshc8c8mw9qiwdEXAMPLE", "Aliases": [ "AWS-GR_REGION_DENY" ], diff --git a/awscli/examples/controlcatalog/list-common-controls.rst b/awscli/examples/controlcatalog/list-common-controls.rst index c3735fd5e5cc..964afd3d0e4b 100644 --- a/awscli/examples/controlcatalog/list-common-controls.rst +++ b/awscli/examples/controlcatalog/list-common-controls.rst @@ -9,30 +9,30 @@ Output:: { "CommonControls": [ { - "Arn": "arn:aws:controlcatalog:::common-control/d4s7ik8fgv8082v3x31hifzcc", + "Arn": "arn:aws:controlcatalog:::common-control/d4s7ik8fgv8082v3x3EXAMPLE", "Name": "Asset inventory reconciliation and audit", "Description": "Reconcile the organization's asset inventory with other data sources, and conduct asset audits to verify the accuracy of the asset inventory.", "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlvEXAMPLE", "Name": "Asset management" }, "Objective": { - "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m185wa1nn", + "Arn": "arn:aws:controlcatalog:::objective/ad11p1961s8erra9m1EXAMPLE", "Name": "Asset inventory management" }, "CreateTime": "2024-03-12T19:00:00-05:00", "LastUpdateTime": "2024-03-12T19:00:00-05:00" }, { - "Arn": "arn:aws:controlcatalog:::common-control/7encqm6cfsw704eoahh3ujr7y", + "Arn": "arn:aws:controlcatalog:::common-control/7encqm6cfsw704eoahEXAMPLE", "Name": "Asset valuation", "Description": "Assign a value to assets based on their cost, replacement value, or other relevant factors.", "Domain": { - "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlv06m92uq", + "Arn": "arn:aws:controlcatalog:::domain/d4msesd9vvmzmmuvlvEXAMPLE", "Name": "Asset management" }, "Objective": { - "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0rtss98u", + "Arn": "arn:aws:controlcatalog:::objective/90gifwthorhxhxq7m0EXAMPLE", "Name": "Asset classification" }, "CreateTime": "2024-03-12T19:00:00-05:00", @@ -48,37 +48,37 @@ For more information, see `About common controls