Repository: jclouds Updated Branches: refs/heads/master 15d816670 -> 3c050e0e9
JCLOUDS-706: Upgrade Azure API to 2012-02-12 This will allow use of Azure after August 2015: http://blogs.msdn.com/b/windowsazurestorage/archive/2014/08/05/microsoft-azure-storage-service-version-removal.aspx Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/975c1325 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/975c1325 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/975c1325 Branch: refs/heads/master Commit: 975c1325bcf980ef4da1de00d1d5843a1d788399 Parents: 15d8166 Author: Andrew Gaul <[email protected]> Authored: Thu Sep 4 17:39:01 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Sep 5 16:35:31 2014 -0700 ---------------------------------------------------------------------- providers/azureblob/pom.xml | 2 +- .../jclouds/azureblob/AzureBlobApiMetadata.java | 2 +- .../jclouds/azureblob/AzureBlobAsyncClient.java | 2 +- .../azureblob/AzureBlobAsyncClientTest.java | 38 ++++++++++++-------- .../blobstore/AzureBlobRequestSignerTest.java | 12 ++++--- 5 files changed, 34 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/975c1325/providers/azureblob/pom.xml ---------------------------------------------------------------------- diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index 25b59bd..c80c59d 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -33,7 +33,7 @@ <properties> <test.azureblob.endpoint>https://${jclouds.identity}.blob.core.windows.net</test.azureblob.endpoint> - <test.azureblob.api-version>2009-09-19</test.azureblob.api-version> + <test.azureblob.api-version>2012-02-12</test.azureblob.api-version> <test.azureblob.build-version /> <test.azureblob.identity>${test.azure.identity}</test.azureblob.identity> <test.azureblob.credential>${test.azure.credential}</test.azureblob.credential> http://git-wip-us.apache.org/repos/asf/jclouds/blob/975c1325/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java index c498f26..8c5744a 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java @@ -76,7 +76,7 @@ public class AzureBlobApiMetadata extends BaseRestApiMetadata { .name("Microsoft Azure Blob Service API") .identityName("Account Name") .credentialName("Access Key") - .version("2009-09-19") + .version("2012-02-12") .defaultEndpoint("https://${jclouds.identity}.blob.core.windows.net";) .documentation(URI.create("http://msdn.microsoft.com/en-us/library/dd135733.aspx";)) .defaultProperties(AzureBlobApiMetadata.defaultProperties()) http://git-wip-us.apache.org/repos/asf/jclouds/blob/975c1325/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java index f862689..ea44e96 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobAsyncClient.java @@ -92,7 +92,7 @@ import com.google.inject.Provides; */ @Deprecated @RequestFilters(SharedKeyLiteAuthentication.class) -@Headers(keys = AzureStorageHeaders.VERSION, values = "2009-09-19") +@Headers(keys = AzureStorageHeaders.VERSION, values = "2012-02-12") @SkipEncoding({ '/', '$' }) @Path("/") public interface AzureBlobAsyncClient { http://git-wip-us.apache.org/repos/asf/jclouds/blob/975c1325/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java index 5928175..17a9cb8 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobAsyncClientTest.java @@ -64,7 +64,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.of()); assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/?comp=list HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -79,7 +79,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/?comp=list&maxresults=1&marker=marker&prefix=prefix HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -94,7 +94,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -108,7 +108,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -125,7 +125,9 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); assertNonPayloadHeadersEqual(request, - "x-ms-blob-public-access: blob\nx-ms-meta-foo: bar\nx-ms-version: 2009-09-19\n"); + "x-ms-blob-public-access: blob\n" + + "x-ms-meta-foo: bar\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -139,7 +141,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.of()); assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/$root?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -152,7 +154,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.of()); assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/$root?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -167,7 +169,9 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/$root?restype=container HTTP/1.1"); assertNonPayloadHeadersEqual(request, - "x-ms-blob-public-access: blob\nx-ms-meta-foo: bar\nx-ms-version: 2009-09-19\n"); + "x-ms-blob-public-access: blob\n" + + "x-ms-meta-foo: bar\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -181,7 +185,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container?restype=container&comp=list HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -195,7 +199,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/$root?restype=container&comp=list HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -209,7 +213,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "HEAD https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseContainerPropertiesFromHeaders.class); @@ -223,7 +227,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "HEAD https://identity.blob.core.windows.net/container?restype=container&comp=acl HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParsePublicAccessHeader.class); @@ -238,7 +242,9 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container?restype=container&comp=metadata HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-meta-key: value\nx-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, + "x-ms-meta-key: value\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -251,7 +257,7 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of("container", "blob")); assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container/blob HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseBlobFromHeadersAndHttpContent.class); @@ -265,7 +271,9 @@ public class AzureBlobAsyncClientTest extends BaseAsyncClientTest<AzureBlobAsync assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container/blob?comp=metadata HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-meta-key: value\nx-ms-version: 2009-09-19\n"); + assertNonPayloadHeadersEqual(request, + "x-ms-meta-key: value\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/975c1325/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java index 96ae9da..b2ba5f2 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java @@ -60,7 +60,9 @@ public class AzureBlobRequestSignerTest extends BaseAsyncClientTest<AzureBlobAsy assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container/name HTTP/1.1"); assertNonPayloadHeadersEqual( request, - "Authorization: SharedKeyLite identity:nutCr98JWBu7wbe1p9rDiyOXg3o6UqI4tEZ29bctKEU=\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nx-ms-version: 2009-09-19\n"); + "Authorization: SharedKeyLite identity:3rx56J9eAw/0GH2pym1hBmMGQmGju4DkVDcRsBWBtAk=\n" + + "Date: Thu, 05 Jun 2008 16:38:19 GMT\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertEquals(request.getFilters().size(), 0); @@ -73,7 +75,9 @@ public class AzureBlobRequestSignerTest extends BaseAsyncClientTest<AzureBlobAsy assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/container/name HTTP/1.1"); assertNonPayloadHeadersEqual( request, - "Authorization: SharedKeyLite identity:GRixvGXJ05tuWANrM5xeWOAAVqfztvmPLpwCRcWPZEk=\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nx-ms-version: 2009-09-19\n"); + "Authorization: SharedKeyLite identity:EN3SE/jB9anhgqIqJMmrTCzZpuqjL41BIZnaE9PEBaU=\n" + + "Date: Thu, 05 Jun 2008 16:38:19 GMT\n" + + "x-ms-version: 2012-02-12\n"); assertPayloadEquals(request, null, null, false); assertEquals(request.getFilters().size(), 0); @@ -95,11 +99,11 @@ public class AzureBlobRequestSignerTest extends BaseAsyncClientTest<AzureBlobAsy assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container/name HTTP/1.1"); assertNonPayloadHeadersEqual( request, - "Authorization: SharedKeyLite identity:8kilG1mKxSWaKMLIQPI/aBlTFvaRRbmGOBqKaE+/R5A=\n" + + "Authorization: SharedKeyLite identity:V0gyrdMZzwQrCvxEfq6eBe8PL233yJ91+aNcISEzjfE=\n" + "Date: Thu, 05 Jun 2008 16:38:19 GMT\n" + "Expect: 100-continue\n" + "x-ms-blob-type: BlockBlob\n" + - "x-ms-version: 2009-09-19\n"); + "x-ms-version: 2012-02-12\n"); assertContentHeadersEqual(request, "text/plain", null, null, null, 2L, hashCode.asBytes(), new Date(1000)); assertEquals(request.getFilters().size(), 0);
