rename keyvault properties (#167)

Add an optional extended description…

keyvault/azure-keyvault-secrets-spring-boot-starter-sample/README.md

@@ -54,8 +54,8 @@ Open `application.properties` file and add below properties to specify your Azur
 
 ```
 azure.keyvault.uri=put-your-azure-keyvault-uri-here
-azure.client-id=put-your-azure-client-id-here
-azure.client-key=put-your-azure-client-key-here
+azure.keyvault.client-id=put-your-azure-client-id-here
+azure.keyvault.client-key=put-your-azure-client-key-here
 ```
 
 ## Get Key Vault secret value as property

keyvault/azure-keyvault-secrets-spring-boot-starter-sample/src/main/resources/application.properties

@@ -1,3 +1,3 @@
-azure.client-id=put-your-azure-client-id-here
-azure.client-key=put-your-azure-client-key-here
+azure.keyvault.client-id=put-your-azure-client-id-here
+azure.keyvault.client-key=put-your-azure-client-key-here
 azure.keyvault.uri=put-your-azure-keyvault-uri-here

keyvault/azure-keyvault-secrets-spring-boot-starter/README.md

@@ -21,13 +21,13 @@ If you are using Maven, add the following dependency.
 
 ### Add the property setting
 
-Open `application.properties` file and add below properties to specify your Azure Key Vault url, Azure service principal client id and client key. `azure.keyvault.enabled` is used to turn on/off Azure Key Vault Secret property source, default is true. `azure.token.acquiring.timeout.seconds` is used to specify the timeout in seconds when acquiring token from Azure AAD. Default value is 60 seconds. This property is optional.
+Open `application.properties` file and add below properties to specify your Azure Key Vault url, Azure service principal client id and client key. `azure.keyvault.enabled` is used to turn on/off Azure Key Vault Secret property source, default is true. `azure.keyvault.token-acquiring-timeout-seconds` is used to specify the timeout in seconds when acquiring token from Azure AAD. Default value is 60 seconds. This property is optional.
 ```
 azure.keyvault.enabled=true
 azure.keyvault.uri=put-your-azure-keyvault-uri-here
-azure.client-id=put-your-azure-client-id-here
-azure.client-key=put-your-azure-client-key-here
-azure.token.acquire.timeout.seconds=60
+azure.keyvault.client-id=put-your-azure-client-id-here
+azure.keyvault.client-key=put-your-azure-client-key-here
+azure.keyvault.token-acquire-timeout-seconds=60
 ```
 
 

keyvault/azure-keyvault-secrets-spring-boot-starter/pom.xml

@@ -60,13 +60,6 @@
             <artifactId>adal4j</artifactId>
             <version>${aad.adal4j.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

keyvault/azure-keyvault-secrets-spring-boot-starter/src/main/java/com/microsoft/azure/keyvault/spring/boot/Constants.java

@@ -7,10 +7,10 @@
 package com.microsoft.azure.keyvault.spring.boot;
 
 public class Constants {
-    public static final String AZURE_CLIENTID = "azure.client-id";
-    public static final String AZURE_CLIENTKEY = "azure.client-key";
+    public static final String AZURE_CLIENTID = "azure.keyvault.client-id";
+    public static final String AZURE_CLIENTKEY = "azure.keyvault.client-key";
     public static final String AZURE_KEYVAULT_ENABLED = "azure.keyvault.enabled";
     public static final String AZURE_KEYVAULT_VAULT_URI = "azure.keyvault.uri";
     public static final String AZURE_KEYVAULT_PROPERTYSOURCE_NAME = "azurekv";
-    public static final String AZURE_TOKEN_ACQUIRE_TIMEOUT_IN_SECONDS = "azure.token.acquire.timeout.seconds";
+    public static final String AZURE_TOKEN_ACQUIRE_TIMEOUT_IN_SECONDS = "azure.keyvault.token-acquire-timeout-seconds";
 }

keyvault/azure-keyvault-secrets-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,15 +0,0 @@
-{
-  "properties": [
-    {
-      "name": "azure.keyvault.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Enable Azure Key Vault.",
-      "defaultValue": true
-    },
-    {
-      "name": "azure.keyvault.uri",
-      "type": "java.lang.String",
-      "description": "Azure Key Vault URI."
-    }
-  ]
-}

keyvault/azure-keyvault-secrets-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,30 @@
+{
+  "properties": [
+    {
+      "name": "azure.keyvault.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Enable Azure Key Vault.",
+      "defaultValue": true
+    },
+    {
+      "name": "azure.keyvault.uri",
+      "type": "java.lang.String",
+      "description": "Azure Key Vault URI."
+    },
+    {
+      "name": "azure.keyvault.client-id",
+      "type": "java.lang.String",
+      "description": "Azure client id, used to access Azure Key Vault"
+    },
+    {
+      "name": "azure.keyvault.client-key",
+      "type": "java.lang.String",
+      "description": "Azure client key, used to access Azure Key Vault"
+    },
+    {
+      "name": "azure.keyvault.token-acquire-timeout-seconds",
+      "type": "java.lang.String",
+      "description": "Azure access token acquiring timeout in seconds"
+    }
+  ]
+}