From d07716fbe3a549497450bf48a5cc3077966f1331 Mon Sep 17 00:00:00 2001 From: Jeff Gollnick Date: Thu, 19 Oct 2017 18:20:07 +0000 Subject: [PATCH] fix typo in emr helptext.py --- awscli/customizations/emr/helptext.py | 70 +++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/awscli/customizations/emr/helptext.py b/awscli/customizations/emr/helptext.py index ffd1957efad8..de36e0cc4971 100755 --- a/awscli/customizations/emr/helptext.py +++ b/awscli/customizations/emr/helptext.py @@ -89,7 +89,7 @@ ' use the create-default-roles command.

' '

Specifying --use-default-roles does not include the' ' EMR_AutoScaling_DefaultRole. Use --autoscaling-role' - ' =EMR_AutoScaling_DefaultRole to specify the autoscaling ' + ' EMR_AutoScaling_DefaultRole to specify the autoscaling' ' role individually if you use an automatic scaling policy with instance groups in Amazon EMR.

') AMI_VERSION = ( @@ -99,8 +99,7 @@ ' to use when launching Amazon EC2 instances in the cluster.' ' For example, --ami-version 3.1.0.' ' For more information about compatible AMIs in earlier versions of' - ' Amazon EMR, see http://docs.aws.amazon.com/emr/latest/DeveloperGuide' - '/emr-dg.pdf.

') + ' Amazon EMR, see http://docs.aws.amazon.com/emr/latest/DeveloperGuide/emr-dg.pdf.

') RELEASE_LABEL = ( '

Specifies the Amazon EMR release version, which determines' @@ -123,7 +122,7 @@ ' or stored in Amazon S3 (for example, --configurations' ' https://s3.amazonaws.com/myBucket/configurations.json).' ' Each classification usually corresponds to the xml configuration' - ' file for an application (such as yarn-site for YARN). For a list of' + ' file for an application, such as yarn-site for YARN. For a list of' ' available configuration classifications and example JSON, see' ' http://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-configure-apps.html.

') @@ -147,8 +146,7 @@ '
  • [Name] - An optional friendly name for the instance group.
    • ' '
  • InstanceGroupType - MASTER, CORE, or TASK.
    • ' '
  • InstanceType - The type of EC2 instance, for' - ' example m3.xlarge,' - ' to use for all nodes in the instance group.
    • ' + ' example m3.xlarge, to use for all nodes in the instance group.' '
  • InstanceCount - The number of EC2 instances to provision in the instance group.
    • ' '
  • [BidPrice] - If specified, indicates that the instance group uses Spot instances,' ' and establishes the bid price for the instances.
    • ' @@ -173,16 +171,18 @@ ' instance fleet, one for a CORE instance fleet,' ' and an optional TASK instance fleet.

    ' '

    The following arguments can be specified for each instance fleet. Optional arguments are shown in [square brackets].

    ' - '
  • [Name] - An optional friendly name for the instance group.
    • ' + '
  • [Name] - An optional friendly name for the instance fleet.
    • ' '
  • InstanceFleetType - MASTER, CORE, or TASK.
    • ' '
  • TargetOnDemandCapacity - The target capacity of On-Demand units' ' for the instance fleet, which determines how many On-Demand instances to provision.' ' The WeightedCapacity specified for an instance type within' - ' InstanceTypeConfigs counts toward this total when that instance type launches.
    • ' + ' InstanceTypeConfigs counts toward this total when an instance type ' + ' with the On-Demand purchasing option launches.' '
  • TargetSpotCapacity - The target capacity of Spot units' ' for the instance fleet, which determines how many Spot instances to provision.' ' The WeightedCapacity specified for an instance type within' - ' InstanceTypeConfigs counts toward this total when that instance type launches.
    • ' + ' InstanceTypeConfigs counts toward this total when an instance type' + ' with the Spot purchasing option launches.' '
  • [LaunchSpecifications] - When TargetSpotCapacity is specified,' ' specifies the block duration and timeout action for Spot instances.' '
  • InstanceTypeConfigs - Specifies up to five EC2 instance types to' @@ -190,7 +190,7 @@ INSTANCE_TYPE = ( '

    Shortcut parameter as an alternative to --instance-groups.' - ' Specifies the the type of Amazon EC2 instance to use in a cluster.' + ' Specifies the type of Amazon EC2 instance to use in a cluster.' ' If used without the --instance-count parameter,' ' the cluster consists of a single master node running on the EC2 instance type' ' specified. When used together with --instance-count,' @@ -198,8 +198,8 @@ ' are used for the core node type.

    ') INSTANCE_COUNT = ( - '

    Shortcut parameter as an alternative to --instance-groups.' - ' When used together with --instance-type, specifies the' + '

    Shortcut parameter as an alternative to --instance-groups' + ' when used together with --instance-type. Specifies the' ' number of Amazon EC2 instances to create for a cluster.' ' One instance is used for the master node, and the remainder' ' are used for the core node type.

    ') @@ -214,7 +214,7 @@ ' SSH connections to the master node and other instances on the cluster.
    • ' '
  • AvailabilityZone - Specifies the availability zone in which to launch' ' the cluster. For example, us-west-1b.
    • ' - '
  • SubnetId - Specifies the VPC subnet in which to create the cluster.
    • ' + '
  • SubnetId - Specifies the VPC subnet in which to create the cluster.
    • ' '
  • InstanceProfile - An IAM role that allows EC2 instances to' ' access other AWS services, such as Amazon S3, that' ' are required for operations.
    • ' @@ -222,8 +222,8 @@ ' security group for the master node.' '
  • EmrManagedSlaveSecurityGroup - The security group ID of the Amazon EC2' ' security group for the slave nodes.
    • ' - '
  • ServiceAccessSecurityGroup - The security group ID of the Amazon EC2 ' - 'security group for Amazon EMR access to clusters in VPC private subnets
    • ' + '
  • ServiceAccessSecurityGroup - The security group ID of the Amazon EC2' + ' security group for Amazon EMR access to clusters in VPC private subnets.
    • ' '
  • AdditionalMasterSecurityGroups - A list of additional Amazon EC2' ' security group IDs for the master node.
    • ' '
  • AdditionalSlaveSecurityGroups - A list of additional Amazon EC2' @@ -243,26 +243,26 @@ ' when an automatic scale-in activity occurs or an instance group is resized.

    ' '

    Accepted values:

    ' '
  • TERMINATE_AT_TASK_COMPLETION - Specifies that Amazon EMR' - ' blacklists and drains tasks from nodes before terminating the instance.
    • ' + ' blacklists and drains tasks from nodes before terminating the instance.' '
  • TERMINATE_AT_INSTANCE_HOUR - Specifies that Amazon EMR' ' terminate EC2 instances at the instance-hour boundary, regardless of when' ' the request to terminate was submitted.
    • ' ) VISIBILITY = ( '

    Specifies whether the cluster is visible to all IAM users of' - ' the AWS account associated with the cluster. If set to ' - '--visible-to-all-users, all IAM users of that AWS account' + ' the AWS account associated with the cluster. If set to' + ' --visible-to-all-users, all IAM users of that AWS account' ' can view and, if they have the proper policy permisions set, manage' ' the cluster. If it is set to --no-visible-to-all-users,' ' only the IAM user that created the cluster can view and manage it. ' - ' Clusters are visible by default.

    ') + ' Clusters are visible by default.

    ') DEBUGGING = ( '

    Specifies that the debugging tool is enabled for the cluster,' ' which allows you to browse log files using the EMR console.' ' Turning debugging on requires that you specify --log-uri' - ' because Amazon EMR must save the log files to Amazon S3 to index' - ' the files for viewing in the console.

    ') + ' because log files must be stored in Amazon S3 so that' + ' Amazon EMR can index them for viewing in the console.

    ') TAGS = ( '

    A list of tags to associate with a cluster, which apply to' @@ -284,7 +284,7 @@ ' enclosed in single quotation marks, or you can use a shorthand' ' syntax, specifying multiple bootstrap actions, each separated' ' by a space. When using the shorthand syntax, each bootstrap' - ' action takes the following parameters, each separated by' + ' action takes the following parameters, separated by' ' commas with no trailing space. Optional parameters' ' are shown in [square brackets].

    ' '
  • Path - The path and file name of the script' @@ -305,7 +305,7 @@ ' Available applications and their respective versions vary' ' by EMR release. For more information, see the' ' Amazon EMR Release Guide (http://docs.aws.amazon.com/emr/latest/ReleaseGuide/).

    ' - '

    When using versions of Amazon EMR earlier than 4.0,' + '

    When using versions of Amazon EMR earlier than 4.0,' ' some applications take optional arguments for configuration.' ' Arguments should either be a comma-separated list of values' ' (e.g. Args=arg1,arg2,arg3) or a bracket-enclosed list of values' @@ -318,8 +318,8 @@ ' and Amazon S3 encryption parameters. For more information about' ' configuring consistent view, see http://docs.aws.amazon.com/emr/' 'latest/ManagementGuide/emrfs-configure-consistent-view.html. When using' - ' Amazon EMR version 4.8.0 or later, configuring data encryption using' - ' security configurations is recommended. For more information' + ' Amazon EMR version 4.8.0 or later, we recommend configuring data encryption' + ' using security configurations instead. For more information' ' about using --emrfs to configure data encryption, see' ' http://integ-docs-aws.amazon.com/emr/latest/ReleaseGuide/emr-encryption-enable-security-configuration.html.

    ') @@ -333,11 +333,11 @@ STEPS = ( '

    A list of steps to be executed by the cluster. A step can be' ' specified using the shorthand syntax, by referencing a JSON file' - ' or by specifying an inline JSON structure. [Args] supplied with steps' - ' should be acomma-separated list of values--for example' - ' Args=arg1,arg2,arg3--or' + ' or by specifying an inline JSON structure. Args supplied with steps' + ' should be acomma-separated list of values (for example,' + ' Args=arg1,arg2,arg3) or' ' a bracket-enclosed list of values and/or key-value' - ' pairs--for example Args=[arg1,arg2=arg3,arg4.

    ') + ' pairs (for example, Args=[arg1,arg2=value,arg4.)

    ') INSTALL_APPLICATIONS = ( '

    The applications to be installed.' @@ -354,7 +354,7 @@ ' A security configuration defines data encryption settings and' ' other security options. For more information, see' ' http://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-encryption-enable-security-configuration.html.' - ' Use list-security-configurations to get a list of available ' + ' Use list-security-configurations to get a list of available' ' security configurations in the active account.

    ') CUSTOM_AMI_ID = ( @@ -382,21 +382,21 @@ ' listed. Alternatively, you can use the shorthand' ' form for single states or a group of states.

    ' '

    Takes the following state values:

    ' - '
  • STARTING (shorthand is --active)
    • ' + '
  • STARTING
    • ' '
  • BOOTSTRAPPING
    • ' '
  • RUNNING
    • ' '
  • WAITING
    • ' '
  • TERMINATING
    • ' '
  • TERMINATED
    • ' - '
  • TERMINATED_WITH_ERRORS (shorthand is --failed)
    • ') + '
  • TERMINATED_WITH_ERRORS
    • ') LIST_CLUSTERS_STATE_FILTERS = ( '

    Shortcut options for --cluster-states. The' ' following shortcut options can be specified:

    ' '
  • --active - list only clusters that' - ' are STARTING,' - ' BOOTSTRAPPING, RUNNING, WAITING, or TERMINATING.
    • ' - '
  • --terminated - list only clusters that are TERMINATED.
    • ' + ' are STARTING, BOOTSTRAPPING,' + ' RUNNING, WAITING, or TERMINATING.' + '
  • --terminated - list only clusters that are TERMINATED.
    • ' '
  • --failed - list only clusters that are TERMINATED_WITH_ERRORS.
    • ') LIST_CLUSTERS_CREATED_AFTER = (