Storage identity remove resource manager provider

sdk/spring/azure-identity-spring-library/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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</groupId>
+        <artifactId>azure-spring-boot-service</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>azure-identity-spring-library</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>Azure Identity Spring Integration Library</name>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>5.2.8.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.2.8.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-identity</artifactId>
+            <version>1.0.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+            <version>4.13</version>
+        </dependency>
+    </dependencies>
+</project>

sdk/spring/azure-identity-spring-library/src/main/java/com/microsoft/azure/identity/spring/AzureIdentitySpringHelper.java

@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.azure.identity.spring;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.identity.ClientCertificateCredentialBuilder;
+import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import java.util.HashMap;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+/**
+ * A helper class to deal with credentials in a Spring environment.
+ * 
+ * <p>
+ *  This helper class makes it possible to configure credentials to be used 
+ *  within a Spring context. 
+ * </p>
+ * 
+ * <table>
+ *   <tr>
+ *    <th>Property Tuples</th>
+ *    <th>Description</th>
+ *   </tr>
+ *   <tr>
+ *    <td>
+ *     azure.credential.(name.)tenantId <br>
+ *     azure.credential.(name.)clientId <br>
+ *     azure.credential.(name.)clientSecret
+ *    </td>
+ *    <td>
+ *     the Azure Tenant ID <br>
+ *     the Client ID <br>
+ *     the Client Certificate <br>
+ *    </td>
+ *   </tr>
+ *   <tr>
+ *    <td>
+ *     azure.credential.(name.)tenantId <br>
+ *     azure.credential.(name.)clientId <br>
+ *     azure.credential.(name.)clientCertificate
+ *    </td>
+ *    <td>
+ *     the Azure Tenant ID <br>
+ *     the Client ID <br>
+ *     the path to the PEM client certificate
+ *    </td>
+ *   </tr>
+ * </table>
+ * 
+ * where name is the <code>name</code> of the credential. Note if 
+ * <code>name</code> is entirely omitted it is taken to be the default 
+ * credential. Note if the default credential is omitted it is configure to use
+ * AzureDefaultCredential which allows for the use a Managed Identity (if it is
+ * present).
+ *
+ * @author manfred.riem@microsoft.com
+ */
+@Component
+public class AzureIdentitySpringHelper {
+
+    /**
+     * Defines the AZURE_CREDENTIAL_PREFIX.
+     */
+    private static final String AZURE_CREDENTIAL_PREFIX = "azure.credential.";
+
+    /**
+     * Stores the named credentials.
+     */
+    private final HashMap<String, TokenCredential> credentials;
+
+    /**
+     * Constructor.
+     */
+    public AzureIdentitySpringHelper() {
+        credentials = new HashMap<>();
+        credentials.put("", new DefaultAzureCredentialBuilder().build());
+    }
+
+    /**
+     * Add a named credential.
+     *
+     * @param name the name.
+     * @param credential the credential.
+     */
+    public void addNamedCredential(String name, TokenCredential credential) {
+        credentials.put(name, credential);
+    }
+
+    /**
+     * Get the default Azure credential.
+     *
+     * @return the default Azure credential
+     */
+    public TokenCredential getDefaultCredential() {
+        return credentials.get("");
+    }
+
+    /**
+     * Get the named credential.
+     *
+     * @param name the name.
+     * @return the named credential, or null if not found.
+     */
+    public TokenCredential getNamedCredential(String name) {
+        return credentials.get(name);
+    }
+
+    /**
+     * Populate from Environment.
+     *
+     * @param environment the environment.
+     */
+    public void populate(Environment environment) {
+        populateNamedCredential(environment, "");
+        String credentialNamesKey = AZURE_CREDENTIAL_PREFIX + "names";
+        if (environment.containsProperty(credentialNamesKey)) {
+            String[] credentialNames = environment.getProperty(credentialNamesKey).split(",");
+            for(int i=0; i<credentialNames.length; i++) {
+                populateNamedCredential(environment, credentialNames[i]);
+            }
+        }
+    }
+
+    /**
+     * Populate a named credential.
+     *
+     * @param environment the environment
+     * @param name the name.
+     */
+    private void populateNamedCredential(Environment environment, String name) {
+        String standardizedName = name;
+
+        if (!standardizedName.equals("") && !standardizedName.endsWith(".")) {
+            standardizedName = standardizedName + ".";
+        }
+
+        String tenantIdKey = AZURE_CREDENTIAL_PREFIX + standardizedName + "tenantId";
+        String clientIdKey = AZURE_CREDENTIAL_PREFIX + standardizedName + "clientId";
+        String clientSecretKey = AZURE_CREDENTIAL_PREFIX + standardizedName + "clientSecret";
+
+        String tenantId = environment.getProperty(tenantIdKey);
+        String clientId = environment.getProperty(clientIdKey);
+        String clientSecret = environment.getProperty(clientSecretKey);
+
+        if (tenantId != null && clientId != null && clientSecret != null) {
+            TokenCredential credential = new ClientSecretCredentialBuilder()
+                    .tenantId(tenantId)
+                    .clientId(clientId)
+                    .clientSecret(clientSecret)
+                    .build();
+            credentials.put(name, credential);
+            return;
+        }
+
+        String clientCertificateKey = AZURE_CREDENTIAL_PREFIX + standardizedName + "clientCertificate";
+        String clientCertificatePath = environment.getProperty(clientCertificateKey);
+
+        if (tenantId != null && clientId != null && clientCertificatePath != null) {
+            TokenCredential credential = new ClientCertificateCredentialBuilder()
+                    .tenantId(tenantId)
+                    .clientId(clientId)
+                    .pemCertificate(clientCertificatePath)
+                    .build();            
+            credentials.put(name, credential);
+            return;
+        }
+
+        if (!name.equals("")) {
+            throw new RuntimeException("Configuration for azure.credential." + name + " is incomplete");
+        }
+    }
+
+    /**
+     * Remove the named credential.
+     *
+     * @param name the name.
+     * @return the removed named credential, or null if not found.
+     */
+    public TokenCredential removeNamedCredential(String name) {
+        return credentials.remove(name);
+    }
+}

sdk/spring/azure-identity-spring-library/src/test/java/com/microsoft/azure/identity/spring/AzureIdentitySpringHelperTest.java

@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.azure.identity.spring;
+
+import com.azure.identity.ClientSecretCredential;
+import com.azure.identity.DefaultAzureCredential;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.env.StandardEnvironment;
+
+/**
+ * The unit tests for the AzureIdentitySpringHelper class.
+ *
+ * @author manfred.riem@microsoft.com
+ */
+public class AzureIdentitySpringHelperTest {
+
+    /**
+     * Test addNamedCredential method.
+     */
+    @Test
+    public void testAddNamedCredential() {
+        DefaultAzureCredential credential = new DefaultAzureCredentialBuilder().build();
+        AzureIdentitySpringHelper helper = new AzureIdentitySpringHelper();
+        helper.addNamedCredential("cred1", credential);
+        assertNotNull(helper.getNamedCredential("cred1"));
+        helper.removeNamedCredential("cred1");
+        assertNull(helper.getNamedCredential("cred1"));
+    }
+
+    /**
+     * Test getDefaultCredential method.
+     */
+    @Test
+    public void testGetDefaultCredential() {
+        AzureIdentitySpringHelper helper = new AzureIdentitySpringHelper();
+        assertNotNull(helper.getDefaultCredential());
+    }
+
+    /**
+     * Test populate method.
+     */
+    @Test
+    public void testPopulate() {
+        System.setProperty("azure.credential.names", "");
+        System.setProperty("azure.credential.tenantId", "tenantId");
+        System.setProperty("azure.credential.clientId", "clientId");
+        System.setProperty("azure.credential.clientSecret", "clientSecret");
+        StandardEnvironment environment = new StandardEnvironment();
+        AzureIdentitySpringHelper helper = new AzureIdentitySpringHelper();
+        helper.populate(environment);
+        assertNotNull(helper.getDefaultCredential());
+        assertTrue(helper.getDefaultCredential() instanceof ClientSecretCredential);
+    }
+
+    /**
+     * Test populate method.
+     */
+    @Test
+    public void testPopulate2() {
+        System.setProperty("azure.credential.names", "myname");
+        System.setProperty("azure.credential.myname.tenantId", "tenantId");
+        System.setProperty("azure.credential.myname.clientId", "clientId");
+        System.setProperty("azure.credential.myname.clientSecret", "clientSecret");
+        StandardEnvironment environment = new StandardEnvironment();
+        AzureIdentitySpringHelper helper = new AzureIdentitySpringHelper();
+        helper.populate(environment);
+        assertNotNull(helper.getNamedCredential("myname"));
+        assertTrue(helper.getNamedCredential("myname") instanceof ClientSecretCredential);
+    }
+
+    /**
+     * Test populate method.
+     */
+    @Test
+    public void testPopulate3() {
+        System.setProperty("azure.credential.names", "myname2");
+        System.setProperty("azure.credential.myname2.tenantId", "tenantId");
+        System.setProperty("azure.credential.myname2.clientSecret", "clientSecret");
+        StandardEnvironment environment = new StandardEnvironment();
+        AzureIdentitySpringHelper helper = new AzureIdentitySpringHelper();
+        try {
+            helper.populate(environment);
+            fail();
+        } catch(RuntimeException re) {
+        }
+    }
+}

sdk/spring/pom.xml

@@ -9,6 +9,7 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
+    <module>azure-identity-spring-library</module>
     <module>azure-spring-boot</module>
     <module>azure-spring-boot-starter</module>
     <module>azure-spring-boot-starter-active-directory</module>