Repository: jclouds Updated Branches: refs/heads/master d3d825d3b -> fc147dc0c
JCLOUDS-1335: Upgrade to Azure Blob API 2017-04-17 Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5facb65a Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5facb65a Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5facb65a Branch: refs/heads/master Commit: 5facb65a7e1ade7fa13f2f2d33bca9db6c29b03a Parents: d3d825d Author: Andrew Gaul <[email protected]> Authored: Wed Sep 20 20:52:12 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Wed Sep 20 21:07:32 2017 -0700 ---------------------------------------------------------------------- .../jclouds/azureblob/AzureBlobApiMetadata.java | 2 +- .../blobstore/AzureBlobRequestSigner.java | 2 +- .../jclouds/azureblob/AzureBlobClientTest.java | 50 ++++++++++---------- .../blobstore/AzureBlobRequestSignerTest.java | 6 +-- 4 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/5facb65a/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 cb7e741..9336935 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java @@ -62,7 +62,7 @@ public class AzureBlobApiMetadata extends BaseHttpApiMetadata { .name("Microsoft Azure Blob Service API") .identityName("Account Name") .credentialName("Access Key") - .version("2016-05-31") + .version("2017-04-17") .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/5facb65a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java index f5f6564..1db3547 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSigner.java @@ -42,7 +42,7 @@ import com.google.inject.Provider; @Singleton public class AzureBlobRequestSigner implements BlobRequestSigner { private static final int DEFAULT_EXPIRY_SECONDS = 15 * 60; - private static final String API_VERSION = "2016-05-31"; + private static final String API_VERSION = "2017-04-17"; private final String identity; private final URI storageUrl; http://git-wip-us.apache.org/repos/asf/jclouds/blob/5facb65a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java index 291c44a..3a98ffb 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientTest.java @@ -78,7 +78,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB 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: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -93,7 +93,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB 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: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -108,7 +108,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -122,7 +122,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -141,7 +141,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-blob-public-access: blob\n" + "x-ms-meta-foo: bar\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -155,7 +155,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB 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: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -168,7 +168,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB 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: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -185,7 +185,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-blob-public-access: blob\n" + "x-ms-meta-foo: bar\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReturnTrueIf2xx.class); @@ -199,7 +199,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container?restype=container&comp=list HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -213,7 +213,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container?restype=container&comp=list&include=copy,metadata,snapshots,uncommittedblobs HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -227,7 +227,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/$root?restype=container&comp=list HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseSax.class); @@ -241,7 +241,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "HEAD https://identity.blob.core.windows.net/container?restype=container HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseContainerPropertiesFromHeaders.class); @@ -255,7 +255,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertRequestLineEquals(request, "HEAD https://identity.blob.core.windows.net/container?restype=container&comp=acl HTTP/1.1"); - assertNonPayloadHeadersEqual(request, "x-ms-version: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParsePublicAccessHeader.class); @@ -280,7 +280,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB "PUT https://identity.blob.core.windows.net/container?restype=container&comp=acl HTTP/1.1"); assertNonPayloadHeadersEqual(request, expectedHeader + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseETagHeader.class); @@ -297,7 +297,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB "PUT https://identity.blob.core.windows.net/container?restype=container&comp=metadata HTTP/1.1"); assertNonPayloadHeadersEqual(request, "x-ms-meta-key: value\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class); @@ -321,7 +321,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB "Expect: 100-continue\n" + "x-ms-blob-cache-control: " + cacheControl + "\n" + "x-ms-blob-type: BlockBlob\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, payload, "application/unknown", false); assertResponseParserClassEquals(method, request, ParseETagHeader.class); @@ -334,7 +334,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB 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: 2016-05-31\n"); + assertNonPayloadHeadersEqual(request, "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseBlobFromHeadersAndHttpContent.class); @@ -350,7 +350,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB "PUT https://identity.blob.core.windows.net/container/blob?comp=metadata HTTP/1.1"); assertNonPayloadHeadersEqual(request, "x-ms-meta-key: value\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseETagHeader.class); @@ -371,7 +371,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-blob-cache-control: " + cacheControl + "\n" + "x-ms-blob-content-type: application/unknown\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); assertResponseParserClassEquals(method, request, ParseETagHeader.class); @@ -389,7 +389,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB checkFilters(request); assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } @@ -405,7 +405,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + "x-ms-meta-foo: bar\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } @@ -421,7 +421,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + "x-ms-source-if-modified-since: Thu, 01 Jan 1970 00:00:01 GMT\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } @@ -437,7 +437,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + "x-ms-source-if-unmodified-since: Thu, 01 Jan 1970 00:00:01 GMT\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } @@ -454,7 +454,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + "x-ms-source-if-match: " + eTag + "\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } @@ -471,7 +471,7 @@ public class AzureBlobClientTest extends BaseRestAnnotationProcessingTest<AzureB assertNonPayloadHeadersEqual(request, "x-ms-copy-source: https://identity.blob.core.windows.net/fromcontainer/fromblob\n"; + "x-ms-source-if-none-match: " + eTag + "\n" + - "x-ms-version: 2016-05-31\n"); + "x-ms-version: 2017-04-17\n"); assertPayloadEquals(request, null, null, false); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/5facb65a/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 78ebd9a..165dccc 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 @@ -57,7 +57,7 @@ public class AzureBlobRequestSignerTest extends BaseRestAnnotationProcessingTest NoSuchMethodException, IOException { HttpRequest request = signer.signGetBlob("container", "name"); - assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container/name?sv=2016-05-31&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=r&sig=2ud/p0SM7pAZd1/ydgqYghGzFDP%2Bb/1QjZQ3D1nKzOQ%3D HTTP/1.1"); + assertRequestLineEquals(request, "GET https://identity.blob.core.windows.net/container/name?sv=2017-04-17&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=r&sig=HzCwPCszb39utrHpHKFK6eeZWHJVLcaIwJYXVUgJ%2BQo%3D HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Date: Thu, 05 Jun 2008 16:38:19 GMT\n"); assertPayloadEquals(request, null, null, false); @@ -68,7 +68,7 @@ public class AzureBlobRequestSignerTest extends BaseRestAnnotationProcessingTest NoSuchMethodException, IOException { HttpRequest request = signer.signRemoveBlob("container", "name"); - assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/container/name?sv=2016-05-31&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=d&sig=eCvzaSr/pJGG85RXM2TthSOxj9%2Bhd/rJmz8AHgMo0nI%3D HTTP/1.1"); + assertRequestLineEquals(request, "DELETE https://identity.blob.core.windows.net/container/name?sv=2017-04-17&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=d&sig=xyHwMhO1Dg2LoJH/VoXeLraAp1FBWjdfcc0y31LMKnY%3D HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Date: Thu, 05 Jun 2008 16:38:19 GMT\n"); assertPayloadEquals(request, null, null, false); @@ -88,7 +88,7 @@ public class AzureBlobRequestSignerTest extends BaseRestAnnotationProcessingTest HttpRequest request = signer.signPutBlob("container", blob); - assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container/name?sv=2016-05-31&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=w&sig=QkYYay9OSH6Dm5lMIwKTsCDsPqEu/GLd8M5WaOitRFY%3D HTTP/1.1"); + assertRequestLineEquals(request, "PUT https://identity.blob.core.windows.net/container/name?sv=2017-04-17&se=2008-06-05T16%3A53%3A19Z&sr=b&sp=w&sig=blX/iud63gLIPVkDEeTYreIopqiVmHalxfrFFsHMJFc%3D HTTP/1.1"); assertNonPayloadHeadersEqual( request, "Content-Length: 2\n" +
