Skip to content

Commit

Permalink
Merge branch 'main' into release/identity-sdk-june-2021
Browse files Browse the repository at this point in the history
  • Loading branch information
g2vinay committed Jul 28, 2021
2 parents 604d7cd + 23135a5 commit a6ee222
Show file tree
Hide file tree
Showing 4,279 changed files with 404,652 additions and 158,818 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 15 additions & 6 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
/sdk/appconfiguration/azure-spring-cloud-*/ @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
/sdk/appconfiguration/spring-cloud-azure-*/ @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @stliu


# PRLabel: %Attestation
/sdk/attestation/ @azure-sdk-write-attestation @larryosterman
/sdk/attestation/azure-security-attestation @azure-sdk-write-attestation @larryosterman
/sdk/attestation/azure-resourcemanager-attestation @azure-sdk-write-attestation @larryosterman

# PRLabel: %Batch
/sdk/batch/ @xingwu1 @bgklein @matthchr

Expand All @@ -49,10 +55,10 @@
/sdk/cosmos/azure-spring-data-cosmos-test/ @kushagraThapar @saragluna @yiliuTo @chenrujun @backwind1233 @mbhaskar @stliu

# PRLabel: %Digital Twins
/sdk/digitaltwins/ @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @bikamani @barustum
/sdk/digitaltwins/ @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @barustum

# PRLabel: %Models Repository
/sdk/modelsrepository @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @bikamani @barustum @digimaun
/sdk/modelsrepository @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @barustum @digimaun

# PRLabel: %Event Grid
/sdk/eventgrid/ @srnagar @yijunxiems
Expand Down Expand Up @@ -98,7 +104,7 @@
/sdk/servicebus/ @yvgopal @nemakam @ki1729 @conniey @yijunxiems

# PRLabel: %Storage
/sdk/storage/ @amishra-dev @rickle-msft @jaschrep-msft @gapra-msft @alzimmermsft @kasobol-msft
/sdk/storage/ @amishra-dev @rickle-msft @jaschrep-msft @alzimmermsft @kasobol-msft

# PRLabel: %Tables
/sdk/tables/ @vcolin7 @conniey
Expand All @@ -118,9 +124,9 @@
/common/smoke-tests/ @joshfree @jonathangiles @alzimmermsft @g2vinay @conniey @srnagar

# Management Plane
/sdk/resourcemanager/ @ChenTanyi @weidongxu-microsoft @yungezz
/sdk/**/azure-resourcemanager-* @ChenTanyi @weidongxu-microsoft @yungezz
/sdk/**/mgmt*/ @ChenTanyi @weidongxu-microsoft @yungezz
/sdk/resourcemanager/ @ChenTanyi @weidongxu-microsoft @yungezz @qwordy @haolingdong-msft
/sdk/**/azure-resourcemanager-* @ChenTanyi @weidongxu-microsoft @yungezz @qwordy @haolingdong-msft
/sdk/**/mgmt*/ @weidongxu-microsoft @yungezz

###########
# Eng Sys
Expand All @@ -136,3 +142,6 @@

/**/tests.yml @benbp
/**/ci.yml @benbp

# Add owners for notifications for specific pipelines
/eng/pipelines/aggregate-reports.yml @joshfree
50 changes: 50 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -462,3 +462,53 @@ rights to this code.
You should have received a copy of the CC0 legalcode along with this
work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

License notice for Bouncy Castle
------------------------------------------------------------------------------

Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


License notice for KeePassJava2
------------------------------------------------------------------------------

Copyright 2015 Jo Rabin

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

License notice for openkeepass
------------------------------------------------------------------------------

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the specific language governing permissions and limitations under
the License.

Openkeepass License Link: https://github.com/cternes/openkeepass/blob/master/LICENSE.txt
-------------------------------------------------------------------------------------------------
8 changes: 4 additions & 4 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.4]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- special allowance for perf-test-core as it is not a shipping library: -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.7]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.8]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -73,7 +73,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.4</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand All @@ -83,7 +83,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.7</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
<version>3.4.8</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,11 @@ public static void runTests(PerfStressTest<?>[] tests, boolean sync, int paralle
}
} catch (InterruptedException | ExecutionException e) {
System.err.println("Error occurred when submitting jobs to ForkJoinPool. " + System.lineSeparator() + e);
e.printStackTrace(System.err);
throw new RuntimeException(e);
} catch (Exception e) {
System.err.println("Error occurred running tests: " + System.lineSeparator() + e);
e.printStackTrace(System.err);
} finally {
progressStatus.dispose();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
* Represents a repeating input stream with mark support enabled.
*/
public class RepeatingInputStream extends InputStream {
private static final int RANDOM_BYTES_LENGTH = 1024 * 1024; // 1MB
private static final int RANDOM_BYTES_LENGTH = Integer.parseInt(
System.getProperty("azure.core.perf.test.data.buffer.size", "1048576")); // 1MB default;
private static final byte[] RANDOM_BYTES;
private final int size;
private final long size;

private int mark = 0;
private int readLimit = Integer.MAX_VALUE;
private int pos = 0;
private long mark = 0;
private long readLimit = Long.MAX_VALUE;
private long pos = 0;

static {
Random random = new Random(0);
Expand All @@ -28,13 +29,13 @@ public class RepeatingInputStream extends InputStream {
* Creates an Instance of the repeating input stream.
* @param size the size of the stream.
*/
public RepeatingInputStream(int size) {
public RepeatingInputStream(long size) {
this.size = size;
}

@Override
public synchronized int read() {
return (pos < size) ? (RANDOM_BYTES[pos++ % RANDOM_BYTES_LENGTH] & 0xFF) : -1;
return (pos < size) ? (RANDOM_BYTES[(int) (pos++ % RANDOM_BYTES_LENGTH)] & 0xFF) : -1;
}

@Override
Expand All @@ -61,6 +62,15 @@ public synchronized void mark(int readLimit) {
this.mark = this.pos;
}

/**
* Same as {@link #mark(int)} but takes long.
* @param readLimit read limit.
*/
public synchronized void mark(long readLimit) {
this.readLimit = readLimit;
this.mark = this.pos;
}

@Override
public boolean markSupported() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* Utility class to help with data creation for perf testing.
*/
public class TestDataCreationHelper {
private static final int RANDOM_BYTES_LENGTH = 1024 * 1024; // 1MB
private static final int RANDOM_BYTES_LENGTH = Integer.parseInt(
System.getProperty("azure.core.perf.test.data.buffer.size", "1048576")); // 1MB default;
private static final byte[] RANDOM_BYTES;
private static final int SIZE = (1024 * 1024 * 1024) + 1;

static {
Random random = new Random(0);
Expand All @@ -34,10 +34,10 @@ public class TestDataCreationHelper {
* @return The created {@link Flux}
*/
private static Flux<ByteBuffer> createCircularByteBufferFlux(byte[] array, long size) {
int quotient = (int) size / array.length;
int remainder = (int) size % array.length;
long quotient = size / array.length;
int remainder = (int) (size % array.length);

return Flux.range(0, quotient)
return Flux.just(Boolean.TRUE).repeat(quotient - 1)
.map(i -> allocateByteBuffer(array, array.length))
.concatWithValues(allocateByteBuffer(array, remainder));
}
Expand Down Expand Up @@ -66,14 +66,9 @@ public static Flux<ByteBuffer> createRandomByteBufferFlux(long size) {
*
* @param size the size of the stream
* @return the {@link InputStream} of {@code size}
* @throws IllegalArgumentException if {@code size} is more than {@link #SIZE}
*/
public static InputStream createRandomInputStream(long size) {
if (size > SIZE) {
throw new IllegalArgumentException("size must be <= " + SIZE);
}

return new RepeatingInputStream((int) size);
return new RepeatingInputStream(size);
}

/**
Expand All @@ -84,10 +79,10 @@ public static InputStream createRandomInputStream(long size) {
* @throws IOException If an IO error occurs.
*/
public static void writeBytesToOutputStream(OutputStream outputStream, long size) throws IOException {
int quotient = (int) size / RANDOM_BYTES.length;
int remainder = (int) size % RANDOM_BYTES.length;
long quotient = size / RANDOM_BYTES.length;
int remainder = (int) (size % RANDOM_BYTES.length);

for (int i = 0; i < quotient; i++) {
for (long i = 0; i < quotient; i++) {
outputStream.write(RANDOM_BYTES);
}

Expand Down
14 changes: 7 additions & 7 deletions common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,43 +118,43 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.16.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
<version>4.17.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.3.2</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<version>1.3.3</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.3.0</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<version>4.3.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.8.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<version>5.9.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.8.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.8.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<version>12.13.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.31</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>1.7.32</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
</dependency>

</dependencies>
Expand Down
4 changes: 4 additions & 0 deletions eng/bomgenerator/buildAndRun.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set "versioningClientFileLocation=%~dp0..\versioning\version_client.txt"
set "bomPomFileLocation=%~dp0..\..\sdk\boms\azure-sdk-bom\pom.xml"
set "outputFileLocation=%~dp0..\..\sdk\boms\azure-sdk-bom\newpom.xml"
mvn clean install && mvn exec:java -Dexec.args="-inputFile=%versioningClientFileLocation% -outputFile=%outputFileLocation% -pomFile=%bomPomFileLocation%"
Loading

0 comments on commit a6ee222

Please sign in to comment.