Skip to content

Commit

Permalink
Reset changes to the patch version.
Browse files Browse the repository at this point in the history
  • Loading branch information
vcolin7 committed Jun 15, 2023
1 parent 39a76ed commit 1b83e0c
Show file tree
Hide file tree
Showing 254 changed files with 15,753 additions and 3,583 deletions.
17 changes: 1 addition & 16 deletions sdk/storage/azure-storage-queue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
# Release History

## 12.18.0-beta.2 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes
- Migrate test recordings to assets repo.

## 12.18.0-beta.1 (2023-05-30)

### Features Added
- Added support for 2023-01-03 service version.

## 12.17.1 (2023-05-23)

### Other Changes
Expand All @@ -26,6 +10,7 @@
- Upgraded `azure-core` from `1.38.0` to version `1.39.0`.
- Upgraded `azure-storage-common` from `12.21.0` to version `12.21.1`.


## 12.17.0 (2023-04-13)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-queue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.18.0-beta.1</version>
<version>12.17.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
6 changes: 0 additions & 6 deletions sdk/storage/azure-storage-queue/assets.json

This file was deleted.

79 changes: 48 additions & 31 deletions sdk/storage/azure-storage-queue/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.18.0-beta.2</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
<version>12.17.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->

<name>Microsoft Azure client library for Queue Storage</name>
<description>This module contains client library for Microsoft Azure Queue Storage.</description>
Expand Down Expand Up @@ -43,27 +43,26 @@
--add-opens com.azure.storage.queue/com.azure.storage.queue.implementation=ALL-UNNAMED
--add-opens com.azure.storage.queue/com.azure.storage.queue.implementation.util=ALL-UNNAMED
--add-opens com.azure.storage.queue/com.azure.storage.queue.models=ALL-UNNAMED
--add-reads com.azure.storage.queue=com.azure.http.netty
--add-reads com.azure.storage.queue=com.azure.core.http.okhttp
--add-reads com.azure.core=ALL-UNNAMED
--add-reads com.azure.storage.common=ALL-UNNAMED
</javaModulesSurefireArgLine>
<parallelizeLiveTests>true</parallelizeLiveTests>
</properties>

<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.40.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.39.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.13.4</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.13.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<version>12.21.2</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
<version>12.21.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
</dependency>

<dependency>
Expand All @@ -75,45 +74,27 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<version>12.21.2</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
<version>12.21.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.29</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.27</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.9.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<version>1.9.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -125,7 +106,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.11.10</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.11.9</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>2.4-M1-groovy-4.0</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -146,6 +133,36 @@
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>2.1.0</version> <!-- {x-version-update;org.codehaus.gmavenplus:gmavenplus-plugin;external_dependency} -->
<executions>
<execution>
<configuration>
</configuration>
<goals>
<goal>addTestSources</goal>
<goal>generateTestStubs</goal>
<goal>compileTests</goal>
<goal>removeTestStubs</goal>
</goals>
<phase>test-compile</phase>
</execution>
</executions>
<configuration>
<skipTests>${skipTestCompile}</skipTests>
<testSources>
<testSource>
<directory>${project.basedir}/src/test</directory>
<includes>
<include>**/*.groovy</include>
</includes>
</testSource>
</testSources>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -179,7 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
<version>3.0.0-M7</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
<configuration>
<systemPropertyVariables>
<AZURE_STORAGE_SAS_SERVICE_VERSION>${AZURE_STORAGE_SAS_SERVICE_VERSION}</AZURE_STORAGE_SAS_SERVICE_VERSION>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,7 @@ public enum QueueServiceVersion implements ServiceVersion {
/**
* Service version {@code 2022-11-02}.
*/
V2022_11_02("2022-11-02"),

/**
* Service version {@code 2023-01-03}.
*/
V2023_01_03("2023-01-03");
V2022_11_02("2022-11-02");

private final String version;

Expand All @@ -114,6 +109,6 @@ public String getVersion() {
* @return the latest {@link QueueServiceVersion}
*/
public static QueueServiceVersion getLatest() {
return V2023_01_03;
return V2022_11_02;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.storage.queue

import com.azure.core.http.HttpPipelineCallContext
import com.azure.core.http.HttpPipelineNextPolicy
import com.azure.core.http.HttpPipelinePosition
import com.azure.core.http.HttpResponse
import com.azure.core.http.policy.HttpLogDetailLevel
import com.azure.core.http.policy.HttpLogOptions
import com.azure.core.http.policy.HttpPipelinePolicy
import com.azure.core.test.TestMode
import com.azure.core.util.Context
import com.azure.storage.common.StorageSharedKeyCredential
import com.azure.storage.common.test.shared.StorageSpec
import com.azure.storage.queue.models.QueuesSegmentOptions
import reactor.core.publisher.Mono

import java.time.Duration

class APISpec extends StorageSpec {
// Clients for API tests
QueueServiceClient primaryQueueServiceClient
QueueServiceAsyncClient primaryQueueServiceAsyncClient

/**
* Clean up the test queues and messages for the account.
*/
def cleanup() {
if (environment.testMode != TestMode.PLAYBACK) {
def cleanupQueueServiceClient = new QueueServiceClientBuilder()
.connectionString(environment.primaryAccount.connectionString)
.buildClient()
cleanupQueueServiceClient.listQueues(new QueuesSegmentOptions().setPrefix(namer.getResourcePrefix()),
null, Context.NONE).each {
queueItem -> cleanupQueueServiceClient.deleteQueue(queueItem.getName())
}
}
}

def queueServiceBuilderHelper() {
QueueServiceClientBuilder builder = instrument(new QueueServiceClientBuilder())
return builder
.connectionString(environment.primaryAccount.connectionString)
}

def queueBuilderHelper() {
def queueName = namer.getRandomName(60)
QueueClientBuilder builder = instrument(new QueueClientBuilder())
return builder
.connectionString(environment.primaryAccount.connectionString)
.queueName(queueName)
}

QueueServiceClientBuilder getServiceClientBuilder(StorageSharedKeyCredential credential, String endpoint,
HttpPipelinePolicy... policies) {
QueueServiceClientBuilder builder = new QueueServiceClientBuilder()
.endpoint(endpoint)
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))

for (HttpPipelinePolicy policy : policies) {
builder.addPolicy(policy)
}

instrument(builder)

if (credential != null) {
builder.credential(credential)
}

return builder
}

QueueClientBuilder getQueueClientBuilder(String endpoint) {
QueueClientBuilder builder = instrument(new QueueClientBuilder())
.endpoint(endpoint)
return builder
}

def sleepIfLive(long milliseconds) {
if (environment.testMode == TestMode.PLAYBACK) {
return
}

sleep(milliseconds)
}

def getMessageUpdateDelay(long liveTestDurationInMillis) {
return (environment.testMode == TestMode.PLAYBACK) ? Duration.ofMillis(10) : Duration.ofMillis(liveTestDurationInMillis)
}

def getPerCallVersionPolicy() {
return new HttpPipelinePolicy() {
@Override
Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
context.getHttpRequest().setHeader("x-ms-version","2017-11-09")
return next.process()
}
@Override
HttpPipelinePosition getPipelinePosition() {
return HttpPipelinePosition.PER_CALL
}
}
}
}
Loading

0 comments on commit 1b83e0c

Please sign in to comment.