diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9f988a1a74425..a109b60f47a8a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -18,7 +18,7 @@ #### # PRLabel: %App Configuration /sdk/appconfiguration/ @mssfang @alzimmermsft -/sdk/appconfiguration/spring-cloud-azure-*/ @mrm9084 @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai +/sdk/appconfiguration/azure-spring-cloud-*/ @mrm9084 @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai # PRLabel: %Batch /sdk/batch/ @xingwu1 @bgklein @matthchr diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 0412b7be873f7..ee8ecdbce9458 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -131,6 +131,7 @@ com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.2.8-beta.1;1.2. com.microsoft.azure:spring-cloud-azure-feature-management-web;1.2.8-beta.1;1.2.8-beta.1 com.microsoft.azure:spring-cloud-azure-feature-management;1.2.8-beta.1;1.2.8-beta.1 com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.2.8-beta.1;1.2.8-beta.1 +com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config-test;1.2.8-beta.1;1.2.8-beta.1 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current # version. Unreleased dependencies are only valid for dependency versions. diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/pom.xml new file mode 100644 index 0000000000000..10fdcf0db4959 --- /dev/null +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.3.3.RELEASE + + + + com.microsoft.azure + azure-spring-cloud-starter-appconfiguration-config-test + 1.2.8-beta.1 + + + + com.microsoft.azure + spring-cloud-starter-azure-appconfiguration-config + 1.2.8-beta.1 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.0 + + + + + diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/src/test/java/com/microsoft/azure/spring/cloud/config/SampleIT.java b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/src/test/java/com/microsoft/azure/spring/cloud/config/SampleIT.java new file mode 100644 index 0000000000000..2ed15e8597b48 --- /dev/null +++ b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/src/test/java/com/microsoft/azure/spring/cloud/config/SampleIT.java @@ -0,0 +1,17 @@ +package com.microsoft.azure.spring.cloud.config; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SampleIT { + + private final Logger log = LoggerFactory.getLogger(SampleIT.class); + @Test + public void sampleTest() { + log.info("test log info."); + assertThat(true).isEqualTo(true); + } +} diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml index 3a810d215d757..2742a1368b405 100644 --- a/sdk/appconfiguration/ci.yml +++ b/sdk/appconfiguration/ci.yml @@ -51,3 +51,7 @@ extends: - name: spring-cloud-starter-azure-appconfiguration-config groupId: com.microsoft.azure safeName: springcloudstarterazureappconfigurationconfig + AdditionalModules: + - name: azure-spring-cloud-starter-appconfiguration-config-test + groupId: com.microsoft.azure + safeName: azurespringcloudstarterappconfigurationconfigtest diff --git a/sdk/appconfiguration/pom.xml b/sdk/appconfiguration/pom.xml index 44bb23e5553ae..eedb01449165d 100644 --- a/sdk/appconfiguration/pom.xml +++ b/sdk/appconfiguration/pom.xml @@ -15,5 +15,6 @@ azure-spring-cloud-feature-management azure-spring-cloud-feature-management-web azure-spring-cloud-starter-appconfiguration-config + azure-spring-cloud-starter-appconfiguration-config-test diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index d8d9538d13879..7e50599fa09da 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -5,12 +5,25 @@ jobs: parameters: ServiceDirectory: appconfiguration Artifacts: - - name: azure-data-appconfiguration - groupId: com.azure - safeName: azuredataappconfiguration + - name: azure-spring-cloud-starter-appconfiguration-config-test + groupId: com.microsoft.azure + safeName: azurespringcloudstarterappconfigurationconfigtest + TimeoutInMinutes: 90 EnvVars: AZURE_TEST_MODE: RECORD AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING) AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) + PostRunSteps: + - script: | + python --version + python -m pip install setuptools termcolor in_place + python sdk/spring/scripts/replace_util.py --module appconfiguration --log debug --color false + displayName: 'Run replace_util.py' + - task: Maven@3 + displayName: 'Run tests again.' + inputs: + mavenPomFile: pom.xml + goals: clean verify + options: '-Dgpg.skip -Dmaven.wagon.http.pool=false -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)' diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/README.md b/sdk/spring/azure-spring-cloud-autoconfigure/README.md index 8fbabc99a23b1..5cc0e55acdfb8 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/README.md +++ b/sdk/spring/azure-spring-cloud-autoconfigure/README.md @@ -17,12 +17,15 @@ Support": this will configure the project to make sure you can integrate easily For instance, let's assume that you want to use Event Hubs starter, you can add the usual `spring-cloud-starter-azure-eventhubs` dependency to your project and the Spring Cloud auto-configuration will kick-in: +[//]: # ({x-version-update-start;com.microsoft.azure:spring-cloud-starter-azure-eventhubs;current}) ```xml com.microsoft.azure spring-cloud-starter-azure-eventhubs + 1.2.8 ``` +[//]: # ({x-version-update-end}) Note that there is no need to add a `version` as those are managed already by the project. @@ -59,7 +62,7 @@ Spring allow all the supported logging systems to set logger levels set in the S The following example shows potential logging settings in `application.properties`: -```properties +``` logging.level.root=WARN logging.level.org.springframework.web=DEBUG logging.level.org.hibernate=ERROR diff --git a/sdk/spring/scripts/replace_util.py b/sdk/spring/scripts/replace_util.py index acf6dd9ebe10b..2ef26c2b8f882 100644 --- a/sdk/spring/scripts/replace_util.py +++ b/sdk/spring/scripts/replace_util.py @@ -18,6 +18,13 @@ VERSION_UPDATE_ITEMS = 'version_update_items' config = { + 'appconfiguration': { + 'sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config-test/pom.xml': { + VERSION_UPDATE_ITEMS: ( + VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.9.RELEASE'), + ) + } + }, 'cosmos': { 'sdk/cosmos/azure-spring-data-cosmos-test/pom.xml': { VERSION_UPDATE_ITEMS: ( @@ -83,7 +90,7 @@ def get_args(): parser.add_argument( '--module', type = str, - choices = ['spring', 'cosmos'], + choices = ['spring', 'cosmos', 'appconfiguration'], required = False, default = 'cosmos', help = 'Specify the target module.'