Update keyvault secret to version 4.0

README.md

@@ -41,7 +41,7 @@
 | keyvault         | [azure-spring-boot-starter-keyvault-certificates:3.2.0]                                        | [keyvault-certificates-server-side](keyvault/azure-security-keyvault-jca/run-with-command-line-server-side)   |
 | keyvault         | [azure-security-keyvault-jca:2.1.0]                                                            | [run-with-command-line-server-side](keyvault/azure-security-keyvault-jca/run-with-command-line-client-side)   |
 | keyvault         | [azure-security-keyvault-jca:2.1.0]                                                            | [run-with-command-line-client-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side)   |
-| keyvault         | [azure-spring-boot-starter-keyvault-secrets:3.9.0]                                             | [keyvault-secrets](keyvault/azure-spring-boot-starter-keyvault-secrets/keyvault-secrets)                                          |
+| keyvault         | [spring-cloud-azure-starter-keyvault-secrets:4.0.0-beta.1]                                     | [keyvault-secrets](keyvault/spring-cloud-azure-starter-keyvault-secrets/keyvault-secrets)                                          |
 | mediaservices    | [azure-media:0.9.8]                                                                            | [azure-spring-boot-sample-mediaservices](mediaservices/azure-spring-boot-sample-mediaservices)                                    |
 | servicebus       | [azure-messaging-servicebus:7.4.0]                                                             | [servicebus](servicebus/azure-messaging-servicebus/servicebus)                                                                    |
 | servicebus       | [azure-spring-boot-starter-servicebus-jms:3.9.0]                                               | [servicebus-jms-queue](servicebus/azure-spring-boot-starter-servicebus-jms/servicebus-jms-queue)                                  |
@@ -68,7 +68,7 @@
 [spring-cloud-starter-azure-appconfiguration-config:1.3.0]: https://search.maven.org/artifact/com.microsoft.azure/spring-cloud-starter-azure-appconfiguration-config/1.3.0/jar
 [azure-messaging-servicebus:7.4.0]: https://search.maven.org/artifact/com.azure/azure-messaging-servicebus/7.4.0/jar
 [azure-media:0.9.8]: https://search.maven.org/artifact/com.microsoft.azure/azure-media/0.9.8/jar
-[azure-spring-boot-starter-keyvault-secrets:3.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-secrets/3.9.0/jar
+[spring-cloud-azure-starter-keyvault-secrets:4.0.0-beta.1]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-keyvault-secrets/4.0.0-beta.1/jar
 [azure-spring-boot-starter-keyvault-certificates:3.2.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-certificates/3.2.0/jar
 [azure-spring-cloud-stream-binder-eventhubs:2.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-stream-binder-eventhubs/2.9.0/jar
 [azure-spring-cloud-starter-eventhubs-kafka:2.9.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-starter-eventhubs-kafka/2.9.0/jar

keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/README.md

@@ -0,0 +1,25 @@
+
+# Spring Cloud Azure Starter Key Vault Secrets Sample
+
+This sample illustrates the simplest usage of `spring-cloud-azure-starter-keyvault-secrets`. To learn all features, please refer to [reference doc](https://microsoft.github.io/spring-cloud-azure/docs/4.0.0-beta.1/reference/html/index.html).
+
+## Create Azure resources
+
+1. Read [document about register an application](https://docs.microsoft.com/azure/active-directory/develop/quickstart-register-app), register an application. get the `Application (client) ID`: **${AZURE_CLIENT_ID_1}**, and create a secret, get the `Client Secret Value`: **${AZURE_CLIENT_SECRET_1}**.
+2. Read [document about create key vault](https://docs.microsoft.com/en-us/azure/key-vault/general/quick-create-portal), get the `Directory ID`: **${AZURE_TENANT_ID_1}** and `Vault URI` **${ENDPOINT_1}**.
+3. Read [document about assign Key Vault access policy](https://docs.microsoft.com/en-us/azure/key-vault/general/assign-access-policy?tabs=azure-portal), assign `Secret Management` template to the client(or principal) we created in step 1.
+4. Same to previous steps, get **${AZURE_CLIENT_ID_2}**, **${AZURE_CLIENT_SECRET_2}**, **${AZURE_TENANT_ID_2}** and **${ENDPOINT_1}**. assign `Secret Management` template to the **${AZURE_CLIENT_ID_2}. 
+
+## Fill the values in application.yml
+Fill these values in application.yml: **${AZURE_TENANT_ID_1}**, **${AZURE_CLIENT_ID_1}**, **${AZURE_CLIENT_SECRET_1}**, **${ENDPOINT_1}**, **${AZURE_TENANT_ID_2}**, **${AZURE_CLIENT_ID_2}**, **${AZURE_CLIENT_SECRET_2}**, **${ENDPOINT_2}**.
+
+## Start application
+Start the application, you will see a log like this:
+```text
+secretNameInKeyVault1: secret-value-1
+secretNameInKeyVault2: secret-name-in-key-vault-2-value-2
+secretNameInKeyVaultBoth: secret-value-1
+```
+
+We can see that property-source-1 have higher priority.
+

keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.azure.spring</groupId>
+    <artifactId>azure-spring-boot-samples</artifactId>
+    <version>1.0.0</version>
+		<relativePath>../../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>spring-cloud-azure-starter-keyvault-secrets-sample-multiple-property-source</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>spring-cloud-azure-starter-keyvault-secrets</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>

keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/src/main/java/com/azure/spring/keyvault/secrets/sample/single/property/source/SampleApplication.java

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.keyvault.secrets.sample.single.property.source;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SampleApplication implements CommandLineRunner {
+
+    @Value("${secret-name-in-key-vault-1}")
+    private String secretNameInKeyVault1;
+    @Value("${secret-name-in-key-vault-2}")
+    private String secretNameInKeyVault2;
+    @Value("${secret-name-in-key-vault-both}")
+    private String secretNameInKeyVaultBoth;
+
+    public static void main(String[] args) {
+        SpringApplication.run(SampleApplication.class, args);
+    }
+
+    public void run(String[] args) {
+        System.out.println("secretNameInKeyVault1: " + secretNameInKeyVault1);
+        System.out.println("secretNameInKeyVault2: " + secretNameInKeyVault2);
+        System.out.println("secretNameInKeyVaultBoth: " + secretNameInKeyVaultBoth);
+    }
+
+}

keyvault/spring-cloud-azure-starter-keyvault-secrets/multiple-property-source/src/main/resources/application.yml

@@ -0,0 +1,23 @@
+spring:
+  cloud:
+    azure:
+      keyvault:
+        secret:
+          property-source-enabled: true
+          property-sources:
+            -
+              name: key-vault-1
+              endpoint: ${ENDPOINT_1}
+              profile:
+                tenant-id: ${AZURE_TENANT_ID_1}
+              credential:
+                client-id: ${AZURE_CLIENT_ID_1}
+                client-secret: ${AZURE_CLIENT_SECRET_1}
+            -
+              name: key-vault-2
+              endpoint: ${ENDPOINT_2}
+              profile:
+                tenant-id: ${AZURE_TENANT_ID_2}
+              credential:
+                client-id: ${AZURE_CLIENT_ID_2}
+                client-secret: ${AZURE_CLIENT_SECRET_2}

keyvault/spring-cloud-azure-starter-keyvault-secrets/single-property-source/README.md

@@ -0,0 +1,21 @@
+
+# Spring Cloud Azure Starter Key Vault Secrets Sample
+
+This sample illustrates the simplest usage of `spring-cloud-azure-starter-keyvault-secrets`. To learn all features, please refer to [reference doc](https://microsoft.github.io/spring-cloud-azure/docs/4.0.0-beta.1/reference/html/index.html).
+
+## Create Azure resources
+
+1. Read [document about register an application](https://docs.microsoft.com/azure/active-directory/develop/quickstart-register-app), register an application. get the `Application (client) ID`: **${AZURE_CLIENT_ID}**, and create a secret, get the `Client Secret Value`: **${AZURE_CLIENT_SECRET}**.
+2. Read [document about create key vault](https://docs.microsoft.com/en-us/azure/key-vault/general/quick-create-portal), get the `Directory ID`: **${AZURE_TENANT_ID}** and `Vault URI` **${ENDPOINT}**.
+3. Read [document about assign Key Vault access policy](https://docs.microsoft.com/en-us/azure/key-vault/general/assign-access-policy?tabs=azure-portal), assign `Secret Management` template to the client(or principal) we created in step 1.
+
+## Fill the values in application.yml
+Fill these values in application.yml: **${AZURE_TENANT_ID}**, **${AZURE_CLIENT_ID}**, **${AZURE_CLIENT_SECRET}**, **${ENDPOINT}**.
+
+## Start application
+Start the application, you will see a log like this:
+```text
+property springDataSourceUrl in Azure Key Vault: <spring-data-source-url-value>
+```
+
+