Merge branch 'release-1.7.20'

* release-1.7.20: Bumping version to 1.7.20 Update Changelog with no features add link to lifecycle example new example for aws s3api put-bucket-lifecycle Correct the predefined section name to be plugins new CodeDeploy examples add note to get-object about outfile parameter Fix failing codedeploy tests on windows new cloudformation example new and updated ECS examples updated EC2 examples new and updated IAM examples
aws · Apr 7, 2015 · 1fa38ef · 1fa38ef
2 parents 57b2a0c + 4fce72a
commit 1fa38ef
Show file tree

Hide file tree

Showing 46 changed files with 549 additions and 124 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.7.20
+======
+
+* feature:``aws datapipeline``: Add support for deactivating pipelines.
+* feature:``aws elasticbeanstalk``: Add support for cancelling in-progress
+  environment updates or application version deployment.
+
+
 1.7.19
 ======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.7.19'
+__version__ = '1.7.20'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/customizations/configure.py b/awscli/customizations/configure.py
@@ -24,7 +24,7 @@
 logger = logging.getLogger(__name__)
 NOT_SET = '<not set>'
 
-PREDEFINED_SECTION_NAMES = ('preview', 'plugin')
+PREDEFINED_SECTION_NAMES = ('preview', 'plugins')
 
 def register_configure_cmd(cli):
     cli.register('building-command-table.main',

diff --git a/awscli/examples/cloudformation/cancel-update-stack.rst b/awscli/examples/cloudformation/cancel-update-stack.rst
@@ -0,0 +1,5 @@
+**To cancel a stack update that is in progress**
+
+The following ``cancel-update-stack`` command cancels a stack update on the ``myteststack`` stack::
+
+  aws cloudformation cancel-update-stack --stack-name myteststack
diff --git a/awscli/examples/deploy/add-tags-to-on-premises-instances.rst b/awscli/examples/deploy/add-tags-to-on-premises-instances.rst
@@ -0,0 +1,11 @@
+**To add tags to on-premises instances**
+
+This example associates in AWS CodeDeploy the same on-premises instance tag to two on-premises instances. It does not register the on-premises instances with AWS CodeDeploy.
+
+Command::
+
+  aws deploy add-tags-to-on-premises-instances --instance-names AssetTag12010298EX AssetTag23121309EX --tags Key=Name,Value=CodeDeployDemo-OnPrem
+
+Output::
+
+  This command produces no output.
diff --git a/awscli/examples/deploy/batch-get-on-premises-instances.rst b/awscli/examples/deploy/batch-get-on-premises-instances.rst
@@ -0,0 +1,38 @@
+**To get information about one or more on-premises instances**
+
+This example gets information about two on-premises instances.
+
+Command::
+
+  aws deploy batch-get-on-premises-instances --instance-names AssetTag12010298EX AssetTag23121309EX
+
+Output::
+
+  {
+    "instanceInfos": [
+      {
+        "iamUserArn": "arn:aws:iam::80398EXAMPLE:user/AWS/CodeDeploy/AssetTag12010298EX",
+        "tags": [
+          {
+            "Value": "CodeDeployDemo-OnPrem",
+            "Key": "Name"
+          }
+        ],
+        "instanceName": "AssetTag12010298EX",
+        "registerTime": 1425579465.228,
+        "instanceArn": "arn:aws:codedeploy:us-west-2:80398EXAMPLE:instance/AssetTag12010298EX_4IwLNI2Alh"
+      },
+      {
+        "iamUserArn": "arn:aws:iam::80398EXAMPLE:user/AWS/CodeDeploy/AssetTag23121309EX",
+        "tags": [
+          {
+            "Value": "CodeDeployDemo-OnPrem",
+            "Key": "Name"
+          }
+        ],
+        "instanceName": "AssetTag23121309EX",
+        "registerTime": 1425595585.988,
+        "instanceArn": "arn:aws:codedeploy:us-west-2:80398EXAMPLE:instance/AssetTag23121309EX_PomUy64Was"
+      }
+    ]
+  }
diff --git a/awscli/examples/deploy/deregister-on-premises-instance.rst b/awscli/examples/deploy/deregister-on-premises-instance.rst
@@ -0,0 +1,11 @@
+**To deregister an on-premises instance**
+
+This example deregisters an on-premises instance with AWS CodeDeploy, but it does not delete the IAM user associated with the instance, nor does it disassociate in AWS CodeDeploy the on-premises instance tags from the instance. It also does not uninstall the AWS CodeDeploy Agent from the instance nor remove the on-premises configuration file from the instance.
+
+Command::
+
+  aws deploy deregister-on-premises-instance --instance-name AssetTag12010298EX
+
+Output::
+
+  This command produces no output.
diff --git a/awscli/examples/deploy/deregister.rst b/awscli/examples/deploy/deregister.rst
@@ -0,0 +1,17 @@
+**To deregister an on-premises instance**
+
+This example deregisters an on-premises instance with AWS CodeDeploy. It does not delete the IAM user that is associated with the instance. It disassociates in AWS CodeDeploy the on-premises tags from the instance. It does not uninstall the AWS CodeDeploy Agent from the instance nor remove the on-premises configuration file from the instance.
+
+Command::
+
+  aws deploy deregister --instance-name AssetTag12010298EX --no-delete-iam-user --region us-west-2
+
+Output::
+
+  Retrieving on-premises instance information... DONE
+  IamUserArn: arn:aws:iam::80398EXAMPLE:user/AWS/CodeDeploy/AssetTag12010298EX
+  Tags: Key=Name,Value=CodeDeployDemo-OnPrem
+  Removing tags from the on-premises instance... DONE
+  Deregistering the on-premises instance... DONE
+  Run the following command on the on-premises instance to uninstall the codedeploy-agent:
+  aws deploy uninstall
diff --git a/awscli/examples/deploy/get-on-premises-instance.rst b/awscli/examples/deploy/get-on-premises-instance.rst
@@ -0,0 +1,24 @@
+**To get information about an on-premises instance**
+
+This example gets information about an on-premises instance.
+
+Command::
+
+  aws deploy get-on-premises-instance --instance-name AssetTag12010298EX
+
+Output::
+
+  {
+    "instanceInfo": {
+      "iamUserArn": "arn:aws:iam::80398EXAMPLE:user/AWS/CodeDeploy/AssetTag12010298EX",
+        "tags": [
+          {
+            "Value": "CodeDeployDemo-OnPrem",
+            "Key": "Name"
+          }
+        ],
+        "instanceName": "AssetTag12010298EX",
+        "registerTime": 1425579465.228,
+        "instanceArn": "arn:aws:codedeploy:us-east-1:80398EXAMPLE:instance/AssetTag12010298EX_4IwLNI2Alh"
+    }
+  }
diff --git a/awscli/examples/deploy/install.rst b/awscli/examples/deploy/install.rst
@@ -0,0 +1,13 @@
+**To install an on-premises instance**
+
+This example copies the on-premises configuration file from the specified location on the instance to the location on the instance that the AWS CodeDeploy Agent expects to find it. It also installs the AWS CodeDeploy Agent on the instance. It does not create any IAM user, nor register the on-premises instance with AWS CodeDeploy, nor associate any on-premises instance tags in AWS CodeDeploy for the instance.
+
+Command::
+
+  aws deploy install --override-config --config-file C:\temp\codedeploy.onpremises.yml --region us-west-2 --agent-installer s3://aws-codedeploy-us-west-2/latest/codedeploy-agent.msi
+
+
+Output::
+
+  Creating the on-premises instance configuration file... DONE
+  Installing the AWS CodeDeploy Agent... DONE
diff --git a/awscli/examples/deploy/list-on-premises-instances.rst b/awscli/examples/deploy/list-on-premises-instances.rst
@@ -0,0 +1,15 @@
+**To get information about one or more on-premises instances**
+
+This example gets a list of available on-premises instance names for instances that are registered in AWS CodeDeploy and also have the specified on-premises instance tag associated in AWS CodeDeploy with the instance.
+
+Command::
+
+  aws deploy list-on-premises-instances --registration-status Registered --tag-filters Key=Name,Value=CodeDeployDemo-OnPrem,Type=KEY_AND_VALUE
+
+Output::
+
+  {
+    "instanceNames": [
+      "AssetTag12010298EX"
+    ]
+  }
diff --git a/awscli/examples/deploy/register-on-premises-instance.rst b/awscli/examples/deploy/register-on-premises-instance.rst
@@ -0,0 +1,11 @@
+**To register an on-premises instance**
+
+This example registers an on-premises instance with AWS CodeDeploy. It does not create the specified IAM user, nor does it associate in AWS CodeDeploy any on-premises instances tags with the registered instance.
+
+Command::
+
+  aws deploy register-on-premises-instance --instance-name AssetTag12010298EX --iam-user-arn arn:aws:iam::80398EXAMPLE:user/CodeDeployDemoUser-OnPrem
+
+Output::
+
+  This command produces no output.
diff --git a/awscli/examples/deploy/register.rst b/awscli/examples/deploy/register.rst
@@ -0,0 +1,14 @@
+**To register an on-premises instance**
+
+This example registers an on-premises instance with AWS CodeDeploy, associates in AWS CodeDeploy the specified on-premises instance tag with the registered instance, and creates an on-premises configuration file that can be copied to the instance. It does not create the IAM user, nor does it install the AWS CodeDeploy Agent on the instance.
+
+Command::
+
+  aws deploy register --instance-name AssetTag12010298EX --iam-user-arn arn:aws:iam::80398EXAMPLE:user/CodeDeployUser-OnPrem --tags Key=Name,Value=CodeDeployDemo-OnPrem --region us-west-2
+
+Output::
+
+  Registering the on-premises instance... DONE
+  Adding tags to the on-premises instance... DONE
+  Copy the on-premises configuration file named codedeploy.onpremises.yml to the on-premises instance, and run the following command on the on-premises instance to install and configure the AWS CodeDeploy Agent:
+  aws deploy install --config-file codedeploy.onpremises.yml
diff --git a/awscli/examples/deploy/remove-tags-from-on-premises-instances.rst b/awscli/examples/deploy/remove-tags-from-on-premises-instances.rst
@@ -0,0 +1,11 @@
+**To remove tags from one or more on-premises instances**
+
+This example disassociates the same on-premises tag in AWS CodeDeploy from the two specified on-premises instances. It does not deregister the on-premises instances in AWS CodeDeploy, nor uninstall the AWS CodeDeploy Agent from the instance, nor remove the on-premises configuration file from the instances, nor delete the IAM users that are associated with the instances. 
+
+Command::
+
+  aws deploy remove-tags-from-on-premises-instances --instance-names AssetTag12010298EX AssetTag23121309EX --tags Key=Name,Value=CodeDeployDemo-OnPrem
+
+Output::
+
+  This command produces no output.
diff --git a/awscli/examples/deploy/uninstall.rst b/awscli/examples/deploy/uninstall.rst
@@ -0,0 +1,11 @@
+**To uninstall an on-premises instance**
+
+This example uninstalls the AWS CodeDeploy Agent from the on-premises instance, and it removes the on-premises configuration file from the instance. It does not deregister the instance in AWS CodeDeploy, nor disassociate any on-premises instance tags in AWS CodeDeploy from the instance, nor delete the IAM user that is associated with the instance. 
+
+Command::
+
+  aws deploy uninstall
+
+Output::
+
+  This command produces no output.
diff --git a/awscli/examples/ec2/authorize-security-group-ingress.rst b/awscli/examples/ec2/authorize-security-group-ingress.rst
@@ -30,6 +30,15 @@ Command::
 
   aws ec2 authorize-security-group-ingress --group-id sg-111aaa22 --protocol tcp --port 80 --source-group sg-1a2b3c4d
 
+**[EC2-VPC] To add a custom ICMP rule**
+
+This example uses the ``ip-permissions`` parameter to add an inbound rule that allows the ICMP message ``Destination Unreachable: Fragmentation Needed and Don't Fragment was Set`` (Type 3, Code 4) from anywhere. If the command succeeds, no output is returned. For more information about quoting JSON-formatted parameters, see `Quoting Strings`_.
+
+Command::
+
+  aws ec2 authorize-security-group-ingress --group-id sg-123abc12 --ip-permissions '[{"IpProtocol": "icmp", "FromPort": 3, "ToPort": 4, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]}]' 
+
 For more information, see `Using Security Groups`_ in the *AWS Command Line Interface User Guide*.
 
-.. _`Using Security Groups`: http://docs.aws.amazon.com/cli/latest/userguide/cli-ec2-sg.html
+.. _`Using Security Groups`: http://docs.aws.amazon.com/cli/latest/userguide/cli-ec2-sg.html
+.. _`Quoting Strings`: http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html#quoting-strings
diff --git a/awscli/examples/ec2/describe-volumes.rst b/awscli/examples/ec2/describe-volumes.rst
@@ -77,7 +77,7 @@ Output::
        ]
    }
  
- **To describe tagged volumes and filter the output **
+**To describe tagged volumes and filter the output **
 
 This example command describes all volumes that have the tag key ``Name`` and a value that begins with ``Test``. The output is filtered to display only the tags and IDs of the volumes. 
 

diff --git a/awscli/examples/ec2/revoke-security-group-ingress.rst b/awscli/examples/ec2/revoke-security-group-ingress.rst
@@ -5,3 +5,13 @@ This example removes TCP port 22 access for the ``203.0.113.0/24`` address range
 Command::
 
   aws ec2 revoke-security-group-ingress --group-name MySecurityGroup --protocol tcp --port 22 --cidr 203.0.113.0/24
+
+**[EC2-VPC] To remove a rule using the IP permissions set**
+
+This example uses the ``ip-permissions`` parameter to remove an inbound rule that allows the ICMP message ``Destination Unreachable: Fragmentation Needed and Don't Fragment was Set`` (Type 3, Code 4). If the command succeeds, no output is returned. For more information about quoting JSON-formatted parameters, see `Quoting Strings`_.
+
+Command::
+
+  aws ec2 revoke-security-group-ingress --group-id sg-123abc12 --ip-permissions '[{"IpProtocol": "icmp", "FromPort": 3, "ToPort": 4, "IpRanges": [{"CidrIp": "0.0.0.0/0"}]}]' 
+
+.. _`Quoting Strings`: http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html#quoting-strings
diff --git a/awscli/examples/ecs/describe-container-instances.rst b/awscli/examples/ecs/describe-container-instances.rst
@@ -49,4 +49,4 @@ Output::
 	            "ec2InstanceId": "i-0f51df05"
 	        }
 	    ]
-	}
+	}
diff --git a/awscli/examples/ecs/describe-task-definition.rst b/awscli/examples/ecs/describe-task-definition.rst
@@ -10,6 +10,7 @@ Output::
 
 	{
 	    "taskDefinition": {
+	        "volumes": [],
 	        "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/hello_world:8",
 	        "containerDefinitions": [
 	            {
@@ -18,6 +19,7 @@ Output::
 	                "links": [
 	                    "mysql"
 	                ],
+	                "mountPoints": [],
 	                "image": "wordpress",
 	                "essential": true,
 	                "portMappings": [
@@ -27,7 +29,8 @@ Output::
 	                    }
 	                ],
 	                "memory": 500,
-	                "cpu": 10
+	                "cpu": 10,
+	                "volumesFrom": []
 	            },
 	            {
 	                "environment": [
@@ -37,11 +40,13 @@ Output::
 	                    }
 	                ],
 	                "name": "mysql",
+	                "mountPoints": [],
 	                "image": "mysql",
 	                "cpu": 10,
 	                "portMappings": [],
 	                "memory": 500,
-	                "essential": true
+	                "essential": true,
+	                "volumesFrom": []
 	            }
 	        ],
 	        "family": "hello_world",

diff --git a/awscli/examples/ecs/describe-tasks.rst b/awscli/examples/ecs/describe-tasks.rst
@@ -4,32 +4,49 @@ This example command provides a description of the specified task, using the tas
 
 Command::
 
-  aws ecs describe-task --cluster default --task 0cc43cdb-3bee-4407-9c26-c0e6ea5bee84
+  aws ecs describe-tasks --tasks 68ef0f55-2ac3-420a-962f-a64d587fd38d
 
 Output::
 
 	{
 	    "failures": [],
 	    "tasks": [
 	        {
-	            "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
+	            "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/68ef0f55-2ac3-420a-962f-a64d587fd38d",
 	            "overrides": {
 	                "containerOverrides": [
 	                    {
-	                        "name": "sleep"
+	                        "name": "timer"
+	                    },
+	                    {
+	                        "name": "web"
 	                    }
 	                ]
 	            },
-	            "lastStatus": "PENDING",
-	            "containerInstanceArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container-instance/f6bbb147-5370-4ace-8c73-c7181ded911f",
+	            "lastStatus": "RUNNING",
+	            "containerInstanceArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container-instance/22878e8e-25f1-4868-8bee-6a36a8bee7c1",
 	            "desiredStatus": "RUNNING",
-	            "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/sleep360:1",
+	            "taskDefinitionArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task-definition/web-timer:2",
 	            "containers": [
 	                {
-	                    "containerArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container/291bb057-f49c-4bd7-9b50-9c891359083b",
-	                    "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/0cc43cdb-3bee-4407-9c26-c0e6ea5bee84",
-	                    "lastStatus": "PENDING",
-	                    "name": "sleep"
+	                    "containerArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container/87539a7c-5769-4860-863c-e0d48da8a855",
+	                    "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/68ef0f55-2ac3-420a-962f-a64d587fd38d",
+	                    "lastStatus": "RUNNING",
+	                    "name": "timer",
+	                    "networkBindings": []
+	                },
+	                {
+	                    "containerArn": "arn:aws:ecs:us-east-1:<aws_account_id>:container/8e899803-b471-4d74-a9d9-3081c76b23fd",
+	                    "taskArn": "arn:aws:ecs:us-east-1:<aws_account_id>:task/68ef0f55-2ac3-420a-962f-a64d587fd38d",
+	                    "lastStatus": "RUNNING",
+	                    "name": "web",
+	                    "networkBindings": [
+	                        {
+	                            "bindIP": "0.0.0.0",
+	                            "containerPort": 80,
+	                            "hostPort": 80
+	                        }
+	                    ]
 	                }
 	            ]
 	        }