Skip to content

Commit

Permalink
Feature: mgmt engsys convergence (Azure#13837)
Browse files Browse the repository at this point in the history 
* Move azure-resourcemanager to sdk/resourcemanager (Azure#13225)

* Move azure-resourcemanager library.

* Add entry to ci.yml

* Fix groupId.

* Move management packages.

* Remove module references from parent.

* Fix typo in pom.

* Tweak versions.

* Fix invalid version in POM.

* Fix dependency versions.

* Add empty changelogs.

* Add groupId and version tags.

* Centralize versioning for resource manager libraries (Azure#13341)

* centralize versioning for resource manager libraries

* add missing tag to azure-resourcemanager-resources/pom.xml

* Set low min coverage and add RM libs to Jacoco

* Move container instance to resourcemanager (Azure#13475)

* move container instance after merge

* update versioning for aci

* update resourcemanager dependency version

* add container instance in ci and pom

* update azure-resourcemanger dependency

* add changelog and readme

* update azure-identity version

* update revapi to suppress external API in resource manager (Azure#13476)

* add code owner for resource manager (Azure#13513)

* add code owner for resource manager

* remove code owner for management

* remove maven preperties for test base (Azure#13514)

* Mgmt fix resources warning (Azure#13512)

* remove deprecation and compiler args

* fix DAG node warning

* fix top level resource error

* suppress all uncheck cast from parent to children

* fix task group to array warning

* suppress heap pollution warning

* Revert "fix task group to array warning"

This reverts commit 0589215.

* Revert "fix top level resource error"

This reverts commit ae6a705.

* suppress rawtypes rather than change

* resourcemanager upgrade resouces to package-resources-2020-06 (Azure#13560)

* add required scripts

* update api-specs.json

* upgrade resources

* generate package-resources-2020-06

* fix compile errors and add outoutResources/provisioningOperation

* update session records

* Fix warning (Azure#13571)

* remove optional and resource plugin

* fix some rbac type warning

* suppress unchecked and rawtypes

* suppress compute warning

* fix app service warning

* fix cosmos warning

* fix aks warning

* fix monitor warning

* change msi handler to generic type rather than suppress rawtypes

* change ExpressRouteCircuitPeering to generic type

* Fix generic type warning (Azure#13572)

* fix rbac return warning

* fix monitor warning

* resourcemanager upgrade network to package-2020-05 (Azure#13591)

* upgrade network to package-2020-05

* generate package-2020-05

* fix checkstyle

* update session records

* update after running credcheck

* fix npe (Azure#13590)

* resourcemanager support keyvault to list properties of disabled secrets (Azure#13596)

* Fix resource manager test (Azure#13642)

* change template type name

* remove compiler plugin

* fix record session

* exclude fluent and models in Jacoco, due to they are generated or interface

* format all pom

* decrease acr test coverage

* fix checkstyle

* fix dns test due to fail in mac many times (Azure#13661)

* fix dns test due to fail in mac many times

* fix for-loop

* skip non management exception

* remove management exception count due to not stable (Azure#13677)

* Mgmt Refine pom (Azure#13776)

* change azure package name with management

* update javadoc

* remove azure-resourcemanager-parent

* update cred check script (Azure#13806)

* Mgmt add samples package (Azure#13770)

* move samples

* format pom

* update pom

* add banned dependency

* fix cosmos client

* remove authorityHost for DefaultAzureCredentialBuilder

* fix compile error

* fix sample warning

* catch request exception

* change resource group delete to begin delete

* update session records

* remove non ascii char

* override build resources in samples due to resources error

* remove account key

* remove resourcemanager_com.google.guava:guava

* fix storage pom

* fix checkstyle

* add java 11 override resource too

* remove jacoco exclude due to sample satisfy coverage

* update sample readme title, pacakge and version remain to azure

* add samples version in pom for CI

* update sample readme according to CI

* skipOutput get from configuration

* add variables in ci

* ship output by default

* test storage and cosmos ci

* Revert "test storage and cosmos ci"

This reverts commit fd4b281.

* add additional projects

* skip jacoco in samples

* exclude false positive spotbugs

* add storage additional module

* remove resourcemanager_org.apache.httpcomponents:httpclient version

* update dependency version

* update additional modules

* add module

* update version

Co-authored-by: Mitch Denny <[email protected]>
Co-authored-by: James Suplizio <[email protected]>
Co-authored-by: Chuang <[email protected]>
Co-authored-by: Weidong Xu <[email protected]>
  • Loading branch information
@ChenTanyi @mitchdenny
@JimSuplizio @xseeseesee @weidongxu-microsoft
5 people authored Aug 7, 2020
1 parent d14a407 commit 4bb437c
Show file tree
Hide file tree
Showing 5,365 changed files with 818,744 additions and 808,762 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
/common/smoke-tests/ @joshfree @jonathangiles @alzimmermsft @g2vinay @conniey @srnagar

# Management Plane
/sdk/management/ @ChenTanyi @weidongxu-microsoft @yungezz @xccc-msft
/sdk/resourcemanager/ @ChenTanyi @weidongxu-microsoft @yungezz @xccc-msft
/sdk/**/mgmt*/ @ChenTanyi @weidongxu-microsoft @yungezz @xccc-msft

###########
Expand Down
10 changes: 8 additions & 2 deletions eng/code-quality-reports/src/main/resources/revapi/revapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,14 @@
{
"regex": true,
"code": "java\\.class\\.externalClassExposedInAPI",
"new": "(class|interface|enum) com\\.azure\\.management\\..*",
"justification": "azure-management classes are allowed to be exposed."
"new": "(class|interface|enum) com\\.azure\\.resourcemanager\\..*",
"justification": "resourcemanager classes are allowed to be exposed."
},
{
"regex": true,
"code": "java\\.class\\.externalClassExposedInAPI",
"new": "(class|interface|enum) com\\.azure\\.security\\.keyvault\\..*",
"justification": "keyvault classes are allowed to be exposed."
},
{
"regex": true,
Expand Down
6 changes: 4 additions & 2 deletions eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2099,10 +2099,12 @@
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE,SIC_INNER_SHOULD_BE_STATIC_ANON,SKIPPED_CLASS_TOO_BIG"/>
</Match>

<!-- Exclude REC_CATCH_EXCEPTION for management samples. All samples in management catch Exception instead of throw it. -->
<!-- Exclude REC_CATCH_EXCEPTION and false positive error for management samples. All samples in management catch Exception instead of throw it. -->
<Match>
<Package name="~com\.azure\.resourcemanager(\.[^.]+)*\.samples(\.[^.]+)*"/>
<Bug pattern="REC_CATCH_EXCEPTION"/>
<Bug pattern="REC_CATCH_EXCEPTION,
RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE,
RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
</Match>

<!-- Exclude from spring related classes -->
Expand Down
85 changes: 85 additions & 0 deletions eng/jacoco-test-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,91 @@
<artifactId>azure-sdk-template</artifactId>
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appplatform</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-appservice</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-authorization</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-compute</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-compute;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerinstance</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerinstance;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerregistry</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-containerservice</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-cosmos</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-dns</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-keyvault</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-monitor</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-monitor;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-msi</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-network</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-sql</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-sql;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-storage</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
</dependency>

<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
13 changes: 13 additions & 0 deletions eng/versioning/external_dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.10.0
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.10.1
com.fasterxml.jackson.module:jackson-module-parameter-names;2.10.0
com.github.spotbugs:spotbugs;4.0.0-beta3
com.github.spotbugs:spotbugs-annotations;4.0.2
com.github.spotbugs:spotbugs-maven-plugin;3.1.12.2
com.google.code.gson:gson;2.8.6
com.google.guava:guava;24.1.1-jre
Expand All @@ -32,6 +33,8 @@ com.microsoft.spring.data.gremlin:spring-data-gremlin;2.3.0
com.squareup.okhttp3:okhttp;4.2.2
com.zaxxer:HikariCP;3.4.5
commons-codec:commons-codec;1.14
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.9.1
io.micrometer:micrometer-core;1.3.0
io.micrometer:micrometer-registry-azure-monitor;1.3.0
io.micrometer:micrometer-registry-graphite;1.3.0
Expand All @@ -56,6 +59,7 @@ net.minidev:json-smart;2.3
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.9.2
org.apache.avro:avro-maven-plugin;1.9.2
org.apache.commons:commons-compress;1.20
org.apache.commons:commons-lang3;3.10
org.apache.httpcomponents:httpclient;4.5.12
org.apache.logging.log4j:log4j-api;2.11.1
Expand Down Expand Up @@ -125,6 +129,7 @@ pl.pragmatists:JUnitParams;1.1.1
cglib:cglib-nodep;3.2.7
com.alibaba:fastjson;1.2.61
com.github.cverges.expect4j:expect4j;1.6
com.github.docker-java:docker-java;3.2.1
com.github.tomakehurst:wiremock-standalone;2.24.1
com.jcraft:jsch;0.1.53
com.microsoft.azure:adal4j;1.6.5
Expand Down Expand Up @@ -154,6 +159,7 @@ org.eclipse.aether:aether-connector-basic;1.1.0
org.eclipse.aether:aether-transport-wagon;1.1.0
org.eclipse.jetty:jetty-http;9.4.11.v20180605
org.eclipse.jetty:jetty-server;9.4.11.v20180605
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.hamcrest:hamcrest-all;1.3
org.hamcrest:hamcrest-library;2.2
# https://junit.org/junit5/docs/current/user-guide/#running-tests-ide-intellij-idea
Expand Down Expand Up @@ -289,6 +295,13 @@ media_io.jsonwebtoken:jjwt;0.5.1
media_org.mockito:mockito-all;1.9.0
media_com.microsoft.azure:adal4j;1.2.0

# sdk\resourcemanager\azure-resourcemanager\pom.xml
# sdk\resourcemanager\azure-resourcemanager-compute\pom.xml
resourcemanager_com.jcraft:jsch;0.1.55

# sdk\resourcemanager\azure-resourcemanager-compute\pom.xml
resourcemanager_com.microsoft.azure:azure-storage;6.1.0

# sdk\storage\azure-storage-blob-cryptography\pom.xml
storage_com.microsoft.azure:azure-storage;8.4.0

Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/pom_file_version_scanner.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $StartTime = $(get-date)
# This is the for the bannedDependencies include exceptions. All <include> entries need to be of the
# form <include>groupId:artifactId:[version]</include> which locks to a specific version. The exception
# to this is the blanket, wildcard include for com.azure and com.microsoft.azure libraries.
$ComAzureAllowlistIncludes = ("com.azure:*", "com.microsoft.azure:*")
$ComAzureAllowlistIncludes = ("com.azure:*", "com.azure.resourcemanager:*", "com.microsoft.azure:*")

function Write-Error-With-Color([string]$msg)
{
Expand Down
18 changes: 18 additions & 0 deletions eng/versioning/version_client.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ com.azure:azure-spring-boot-test-core;1.0.0;1.0.0
com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
com.azure:azure-spring-boot-test-keyvault;1.0.0;1.0.0
com.azure:azure-spring-data-gremlin;2.3.1-beta.1;2.3.1-beta.1
com.azure.resourcemanager:azure-resourcemanager;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-appservice;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-authorization;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-compute;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-dns;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-monitor;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-msi;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-network;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-resources;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-sql;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-storage;2.0.0-beta.3;2.0.0-beta.4
com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.3-beta.1;2.3.3-beta.1
com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.3-beta.1;2.3.3-beta.1
com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.3-beta.1;2.3.3-beta.1
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<module>sdk/keyvault</module>
<module>sdk/loganalytics</module>
<module>sdk/mediaservices</module>
<module>sdk/resourcemanager</module>
<module>sdk/schemaregistry</module>
<module>sdk/search</module>
<module>sdk/servicebus</module>
Expand Down
163 changes: 0 additions & 163 deletions sdk/appplatform/mgmt/pom.xml
View file

This file was deleted.

Binary file removed sdk/appservice/mgmt/src/test/resources/appservicemsi.war
View file
Binary file not shown.
Loading

0 comments on commit 4bb437c

Please sign in to comment.