Fixed AWS SDK examples.

Author: Paul Cornell

doc_source/conf.py

@@ -45,7 +45,7 @@
 
 # The link to the top of the doc source tree on GitHub. This allows generation
 # of per-page "Edit on GitHub" links.
-#github_doc_url = 'https://github.com/awsdocs/aws-cloud9-ug/tree/master/doc_source'
+github_doc_url = 'https://github.com/awsdocs/aws-cloud9-user-guide/tree/master/doc_source'
 
 # This allows the "Feedback" button to create a new issue on GitHub.
 #doc_feedback_url = 'https://github.com/awsdocs/aws-java-developer-guide/issues/new'

doc_source/sample-cplusplus.rst

@@ -1,3 +1,4 @@
+eifjccfvciuhdbchfggrcldbkkrhlrndvheelieckhfr
 .. Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
    This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0
@@ -184,7 +185,8 @@ you must set up credentials management in your |env|. The |sdk-cpp| needs these
 
 .. topic:: To build the |sdk-cpp|
 
-   .. note:: This step could take up to one or more hours to complete, depending on the computing resources available to your |EC2| instance or your own server.
+   .. note:: This step could take up to one or more hours to complete, depending on the computing resources available to your |EC2| instance or your own server and 
+      how much of the |sdk-cpp| you choose to build.
 
    #. Create a folder to build the |sdk-cpp| into.
 
@@ -204,6 +206,12 @@ you must set up credentials management in your |env|. The |sdk-cpp| needs these
 
          cmake3 ../aws-sdk-cpp-master
 
+      .. note:: To build only the |S3| portion of the |sdk-cpp| and its dependencies, run this command instead:
+
+         .. code-block:: sh
+
+            cmake3 ../aws-sdk-cpp-master -DBUILD_ONLY="s3"
+
    #. Build the |sdk-cpp| into this folder.
 
       .. code-block:: sh
@@ -234,7 +242,7 @@ Step 5: Add AWS SDK Code
 In this step, you add some more code, this time to interact with |s3| to create a bucket, list your available buckets, and then delete the bucket you just created. You
 will run this code later.
 
-#. In the |AC9IDE|, create a file with this content, and save the file with the name :file:`s3.cpp` at the root (:file:`/`) of your |env|.
+#. In the |AC9IDE|, create a file with this content, and save the file with the name :file:`s3-demo.cpp` at the root (:file:`/`) of your |env|.
 
    .. code-block:: cpp
 
@@ -391,7 +399,7 @@ Step 6: Build and Run the AWS SDK Code
 
    .. code-block:: sh
 
-      cmake -Daws-sdk-cpp_DIR=sdk_build .
+      cmake3 -Daws-sdk-cpp_DIR=sdk_build .
 
 #. Build your source code.
 

doc_source/sample-go.rst

@@ -180,7 +180,7 @@ you must set up credentials management in your |env|. The |sdk-go| needs these c
          . ~/.bashrc
 
    #. Confirm that the :code:`GOPATH` environment variable is successfully set by running the :command:`echo
-   $GOPATH` command. If successful, :code:`/home/ec2-user/environment/go` should be output.
+      $GOPATH` command. If successful, :code:`/home/ec2-user/environment/go` should be output.
 
 .. topic:: To install the |sdk-go|
 
@@ -229,13 +229,13 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
      sess := session.Must(session.NewSessionWithOptions(session.Options{
        SharedConfigState: session.SharedConfigEnable,
      }))
-
+     region := "YOUR_REGION"
      svc := s3.New(sess, &aws.Config{
-       Region: aws.String("YOUR_REGION"),
+       Region: aws.String(region),
      })
 
      listMyBuckets(svc)
-     createMyBucket(svc, os.Args[1])
+     createMyBucket(svc, os.Args[1], region)
      listMyBuckets(svc)
      deleteMyBucket(svc, os.Args[1])
      listMyBuckets(svc)
@@ -259,12 +259,15 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    }
 
    // Create a bucket in this AWS Region.
-   func createMyBucket(svc *s3.S3, bucketName string) {
+   func createMyBucket(svc *s3.S3, bucketName string, region string) {
      fmt.Printf("\nCreating a new bucket named '" + bucketName + "'...\n\n")
 
      _, err := svc.CreateBucket(&s3.CreateBucketInput{
-       Bucket: aws.String(bucketName),
-     })
+      Bucket: aws.String(bucketName),
+      CreateBucketConfiguration: &s3.CreateBucketConfiguration{
+        LocationConstraint: aws.String(region),
+      },
+    })
 
      if err != nil {
        exitErrorf("Unable to create bucket, %v", err)

doc_source/sample-nodejs.rst

@@ -164,15 +164,22 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
 
    var AWS = require('aws-sdk'); // To set the AWS credentials and region.
    var async = require('async'); // To call AWS operations asynchronously.
+   var region = 'YOUR_REGION';
 
    AWS.config.update({
-     region: 'YOUR_REGION'
+     region: region
    });
 
    var s3 = new AWS.S3({apiVersion: '2006-03-01'});
 
    var bucket_name = process.argv[2];
-   var params = {Bucket: bucket_name};
+   var create_bucket_params = {
+     Bucket: bucket_name,
+     CreateBucketConfiguration: {
+       LocationConstraint: region
+     }
+   };
+   var delete_bucket_params = {Bucket: bucket_name};
 
    // List all of your available buckets in this AWS Region.
    function listMyBuckets(callback) {
@@ -195,7 +202,7 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    function createMyBucket(callback) {
      console.log('\nCreating a bucket named ' + bucket_name + '...\n');
 
-     s3.createBucket(params, function(err, data) {
+     s3.createBucket(create_bucket_params, function(err, data) {
        if (err) {
          console.log(err.code + ": " + err.message);
        }
@@ -208,7 +215,7 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    function deleteMyBucket(callback) {
      console.log('\nDeleting the bucket named ' + bucket_name + '...\n');
 
-     s3.deleteBucket(params, function(err, data) {
+     s3.deleteBucket(delete_bucket_params, function(err, data) {
        if (err) {
          console.log(err.code + ": " + err.message);
        }

doc_source/sample-php.rst

@@ -168,9 +168,9 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
      date_default_timezone_set('YOUR_TIME_ZONE');
 
      $bucketName = $argv[1];
-
+     $region = 'YOUR_REGION';
      $s3 = new Aws\S3\S3Client([
-       'region' => 'YOUR_REGION',
+       'region' => $region,
        'version' => '2006-03-01'
      ]);
 
@@ -195,7 +195,10 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
 
      try {
        $promise = $s3->createBucketAsync([
-         'Bucket' => $bucketName
+         'Bucket' => $bucketName,
+         'CreateBucketConfiguration' => [
+           'LocationConstraint' => $region
+         ]
        ]);
 
        $promise->wait();

doc_source/sample-python.rst

@@ -51,11 +51,17 @@ In this step, you install Python, which is required to run this sample.
 
       sudo yum -y update
 
-#. Install Python by running the :command:`install` command.
+#. Install Python by running one or more of these :command:`install` commands.
 
    .. code-block:: sh
 
       sudo yum -y install python27 # Installs Python 2.7.
+      sudo yum -y install python36 # Installs Python 3.6.
+
+   .. note:: If you have Python 2 and 3 installed, and you want to use Python 3 but running the :command:`python --version` command outputs a version of Python 2, you can
+      use Python 3 in one or more of the following ways: 
+
+      * Instead of running  
 
    For more information, see `Download Python <https://www.python.org/downloads/>`_ on the Python website and `Installing Packages <https://packaging.python.org/installing/>`_
    in the :title:`Python Packaging User Guide`.
@@ -93,9 +99,11 @@ Step 3: Run the Code
 ====================
 
 #. In the |AC9IDE|, on the menu bar, choose :menuselection:`Run, Run Configurations, New Run Configuration`.
-#. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`Python`.
+#. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`Python 2` or :guilabel:`Python 3`, depending 
+   on which version of Python you want to use.
 
-   .. note:: If :guilabel:`Python` isn't available, you can create a custom runner for Python.
+   .. note:: If :guilabel:`Python 2` or :guilabel:`Python 3` isn't available, you can create a custom runner for the version of Python that is installed in 
+      your |env|.
 
       #. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`New Runner`.
       #. On the :guilabel:`My Runner.run` tab, replace the tab's contents with this code.
@@ -112,6 +120,9 @@ Step 3: Run the Code
       #. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`Python`.
       #. Choose the :guilabel:`hello.py` tab to make it active.
 
+      To use a specific version of Python that is installed in your |env|, change :code:`python` to the path to the Python executable in the preceding custom runner 
+      definition (for example, :code:`/usr/bin/python27`, :code:`/usr/bin/python36`, or similar).
+
 #. For :guilabel:`Command`, type :kbd:`hello.py 5 9`. In the code, :code:`5` represents :code:`sys.argv[1]`,
    and :code:`9` represents :code:`sys.argv[2]`.
 #. Choose the :guilabel:`Run` button, and compare your output.
@@ -183,9 +194,10 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    import sys
    import botocore
 
+   region = 'YOUR_REGION'
    s3 = boto3.client(
      's3',
-     region_name = 'YOUR_REGION'
+     region_name = region
    )
 
    bucket_name = sys.argv[1]
@@ -206,7 +218,11 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    # Create a new bucket.
    try:
      print("\nCreating a new bucket named '" + bucket_name + "'...\n")
-     s3.create_bucket(Bucket = bucket_name)
+     s3.create_bucket(Bucket = bucket_name,
+       CreateBucketConfiguration = {
+         'LocationConstraint': region
+       }
+     )
    except botocore.exceptions.ClientError as e:
      if e.response['Error']['Code'] == 'BucketAlreadyExists':
        print("Cannot create the bucket. A bucket with the name '" +
@@ -230,7 +246,8 @@ Step 6: Run the AWS SDK Code
 ============================
 
 #. On the menu bar, choose :menuselection:`Run, Run Configurations, New Run Configuration`.
-#. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`Python`.
+#. On the :guilabel:`[New] - Idle` tab, choose :guilabel:`Runner: Auto`, and then choose :guilabel:`Python 2` or :guilabel:`Python 3`, depending 
+   on which version of Python you want to use and is installed in your |env|.
 #. For :guilabel:`Command`, type :samp:`s3.py {YOUR_BUCKET_NAME}`, where :samp:`{YOUR_BUCKET_NAME}` is the name of the bucket you want to create and then delete.
 
    .. note:: |S3| bucket names must be unique across AWS |mdash| not just your AWS account.

doc_source/sample-ruby.rst

@@ -157,8 +157,8 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    require 'aws-sdk'
 
    bucket_name = ARGV[0]
-
-   s3 = Aws::S3::Client.new(region: 'YOUR_REGION')
+   region = 'YOUR_REGION'
+   s3 = Aws::S3::Client.new(region: region)
 
    # Lists all of your available buckets in this AWS Region.
    def list_my_buckets(s3)
@@ -176,7 +176,12 @@ In the |AC9IDE|, create a file with this content, and save the file with the nam
    # Create a new bucket.
    begin
      puts "\nCreating a new bucket named '#{bucket_name}'...\n\n"
-     s3.create_bucket(bucket: bucket_name)
+     s3.create_bucket({
+       bucket: bucket_name,
+       create_bucket_configuration: {
+         location_constraint: region
+       }
+     })
    rescue Aws::S3::Errors::BucketAlreadyExists
      puts "Cannot create the bucket. " +
        "A bucket with the name '#{bucket_name}' already exists. Exiting."