Update models for next release

qchbai · Jul 24, 2015 · 0a55ded · 0a55ded
1 parent 61c4f95
commit 0a55ded
Show file tree

Hide file tree

Showing 7 changed files with 441 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## next release
+
+* `Aws\Ec2` - Added support for SpotFleetLaunchSpecification.
+* `Aws\Emr` - Added support for Amazon EMR release 4.0.0, which includes a new
+  application installation and configuration experience, upgraded versions of
+  Hadoop, Hive, and Spark, and now uses open source standards for ports and
+  paths. To specify an Amazon EMR release, use the release label parameter (AMI
+  versions 3.x and 2.x can still be specified with the AMI version parameter).
+* `Aws\Glacier` - Added support for the InitiateVaultLock, GetVaultLock,
+  AbortVaultLock, and CompleteVaultLock API operations.
+* Fixed a memory leak that occurred when client were created and never used.
+* Updated JsonCompiler by addressing a potential race condition and ensuring
+  that caches are invalidated when upgrading to a new version of the SDK.
+* Updated protocol and acceptance tests.
+
 ## 3.2.0 - 2015-07-14
 
 * `Aws\DeviceFarm` - Added support for AWS DeviceFarm, an app testing service 

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,8 +16,8 @@ The **AWS SDK for PHP** enables PHP developers to use
 robust applications and software using services like Amazon S3, Amazon
 DynamoDB, Amazon Glacier, etc. You can get started in minutes by installing the
 SDK through Composer — by requiring the ``aws/aws-sdk-php`` package — or by
-downloading the standalone `aws.zip <http://pear.amazonwebservices.com/get/aws.zip>`_
-or `aws.phar <http://pear.amazonwebservices.com/get/aws.phar>`_ files.
+downloading the standalone `aws.zip <http://docs.aws.amazon.com/aws-sdk-php/v3/download/aws.zip>`_
+or `aws.phar <http://docs.aws.amazon.com/aws-sdk-php/v3/download/aws.phar>`_ files.
 
 External links: `API Docs <http://docs.aws.amazon.com/aws-sdk-php/v3/api/>`_
 | `GitHub <https://github.com/aws/aws-sdk-php>`_

diff --git a/src/JsonCompiler.php b/src/JsonCompiler.php
@@ -29,11 +29,11 @@ public function __construct($useCache = true)
         $this->useCache = $useCache && extension_loaded('Zend OPcache');
         $this->hasOpcacheCheck = $this->useCache
             && function_exists('opcache_is_script_cached');
-        $this->cacheDir = getenv(self::CACHE_ENV)
-            ?: sys_get_temp_dir() . '/aws-cache';
+        $this->cacheDir = getenv(self::CACHE_ENV) ?: sys_get_temp_dir();
+        $this->cacheDir .= '/aws-cache-' . str_replace('.', '-', Sdk::VERSION);
 
         if (!is_dir($this->cacheDir)
-            && !@mkdir($this->cacheDir, 0777, true)
+            && !@mkdir($this->cacheDir, 0755, true)
             && !is_dir($this->cacheDir)) {
             $message = 'Unable to create cache directory: %s. Please make '
                 . 'this directory writable or provide the path to a '
@@ -91,6 +91,7 @@ public function load($path)
 
         $data = $this->loadJsonFromFile($path, $real);
         file_put_contents($cache, "<?php return " . var_export($data, true) . ';');
+        chmod($cache, 0644);
 
         return $data;
     }

diff --git a/src/data/ec2/2015-04-15/api-2.json b/src/data/ec2/2015-04-15/api-2.json
@@ -3154,10 +3154,6 @@
         "VpcPeeringConnectionId":{
           "shape":"String",
           "locationName":"vpcPeeringConnectionId"
-        },
-        "ClientToken":{
-          "shape":"String",
-          "locationName":"clientToken"
         }
       }
     },
@@ -3167,10 +3163,6 @@
         "Return":{
           "shape":"Boolean",
           "locationName":"return"
-        },
-        "ClientToken":{
-          "shape":"String",
-          "locationName":"clientToken"
         }
       }
     },
@@ -7933,7 +7925,7 @@
     "LaunchSpecsList":{
       "type":"list",
       "member":{
-        "shape":"LaunchSpecification",
+        "shape":"SpotFleetLaunchSpecification",
         "locationName":"item"
       },
       "min":1
@@ -8108,10 +8100,6 @@
         }
       }
     },
-    "ModifySnapshotAttributeName":{
-      "type":"string",
-      "enum":["createVolumePermission"]
-    },
     "ModifySnapshotAttributeRequest":{
       "type":"structure",
       "required":["SnapshotId"],
@@ -8121,7 +8109,7 @@
           "locationName":"dryRun"
         },
         "SnapshotId":{"shape":"String"},
-        "Attribute":{"shape":"ModifySnapshotAttributeName"},
+        "Attribute":{"shape":"SnapshotAttributeName"},
         "OperationType":{"shape":"String"},
         "UserIds":{
           "shape":"UserIdStringList",
@@ -9823,7 +9811,7 @@
           "locationName":"dryRun"
         },
         "SnapshotId":{"shape":"String"},
-        "Attribute":{"shape":"ModifySnapshotAttributeName"}
+        "Attribute":{"shape":"SnapshotAttributeName"}
       }
     },
     "ResourceIdList":{
@@ -10452,6 +10440,80 @@
         }
       }
     },
+    "SpotFleetLaunchSpecification":{
+      "type":"structure",
+      "members":{
+        "ImageId":{
+          "shape":"String",
+          "locationName":"imageId"
+        },
+        "KeyName":{
+          "shape":"String",
+          "locationName":"keyName"
+        },
+        "SecurityGroups":{
+          "shape":"GroupIdentifierList",
+          "locationName":"groupSet"
+        },
+        "UserData":{
+          "shape":"String",
+          "locationName":"userData"
+        },
+        "AddressingType":{
+          "shape":"String",
+          "locationName":"addressingType"
+        },
+        "InstanceType":{
+          "shape":"InstanceType",
+          "locationName":"instanceType"
+        },
+        "Placement":{
+          "shape":"SpotPlacement",
+          "locationName":"placement"
+        },
+        "KernelId":{
+          "shape":"String",
+          "locationName":"kernelId"
+        },
+        "RamdiskId":{
+          "shape":"String",
+          "locationName":"ramdiskId"
+        },
+        "BlockDeviceMappings":{
+          "shape":"BlockDeviceMappingList",
+          "locationName":"blockDeviceMapping"
+        },
+        "Monitoring":{
+          "shape":"SpotFleetMonitoring",
+          "locationName":"monitoring"
+        },
+        "SubnetId":{
+          "shape":"String",
+          "locationName":"subnetId"
+        },
+        "NetworkInterfaces":{
+          "shape":"InstanceNetworkInterfaceSpecificationList",
+          "locationName":"networkInterfaceSet"
+        },
+        "IamInstanceProfile":{
+          "shape":"IamInstanceProfileSpecification",
+          "locationName":"iamInstanceProfile"
+        },
+        "EbsOptimized":{
+          "shape":"Boolean",
+          "locationName":"ebsOptimized"
+        }
+      }
+    },
+    "SpotFleetMonitoring":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "locationName":"enabled"
+        }
+      }
+    },
     "SpotFleetRequestConfig":{
       "type":"structure",
       "required":[