Storage identity remove resource manager provider

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -627,6 +627,7 @@
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.servicebus.stream.binder.config.ServiceBusTopicBinderConfiguration.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.servicebus.stream.binder.config.ServiceBusQueueBinderConfiguration.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.eventhub.stream.binder.config.EventHubBinderConfiguration.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.context.AzureResourceManager20AutoConfiguration.java"/>
 
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.data.gremlin.conversion.source.AbstractGremlinSource.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.keyvault.KeyVaultOperation.java"/>

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>
+    <packaging>jar</packaging>
+    <name>Azure Identity Spring Integration Library</name>
+    <version>1.0.0-beta.1</version>
+    <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/SpringEnvironmentTokenBuilder.java

@@ -0,0 +1,198 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.azure.identity.spring;
+
+import java.util.HashMap;
+import java.util.Optional;
+
+import org.springframework.core.env.Environment;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.identity.ChainedTokenCredential;
+import com.azure.identity.ChainedTokenCredentialBuilder;
+import com.azure.identity.ClientCertificateCredentialBuilder;
+import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+
+/**
+ * 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
+ */
+public class SpringEnvironmentTokenBuilder {
+
+    /**
+     * Defines the AZURE_CREDENTIAL_PREFIX.
+     */
+    private static final String AZURE_CREDENTIAL_PREFIX = "azure.credential.";
+
+    /**
+     * Stores the named credentials.
+     */
+    private final HashMap<String, TokenCredential> credentials;
+
+    /**
+     * Stores the name of the credential to be returned. If omitted, the default
+     * credential will be returned.
+     */
+    private String name = "";
+
+    /**
+     * Constructor.
+     */
+    public SpringEnvironmentTokenBuilder() {
+        credentials = new HashMap<>();
+        credentials.put("", new DefaultAzureCredentialBuilder().build());
+    }
+
+    /**
+     * Populate from Environment.
+     *
+     * @param environment the environment.
+     */
+    public SpringEnvironmentTokenBuilder fromEnvironment(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]);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Sets a credential to override a named credential. If this credential fails to produce a token,
+     * the original token credential will be used.
+     * 
+     * @param name
+     * @param credential
+     * @return
+     */
+    public SpringEnvironmentTokenBuilder overrideNamedCredential(String name, TokenCredential credential) {
+        TokenCredential currentCredential = credentials.get(name);
+        if (currentCredential == null) {
+            credentials.put(name, credential);
+        } else {
+            ChainedTokenCredentialBuilder builder = new ChainedTokenCredentialBuilder();
+            builder.addFirst(credential);
+            builder.addLast(currentCredential);
+            credentials.put(name, builder.build());
+        }
+
+        return this;
+    }
+
+    /**
+     * 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 IllegalStateException("Configuration for azure.credential." + name + " is incomplete");
+        }
+    }
+
+    /**
+     * Sets the builder to return a credential named <code>name</code>
+     * 
+     * @param name
+     * @return
+     */
+    public SpringEnvironmentTokenBuilder namedCredential(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Sets the builder to return the default credential.
+     */
+    public SpringEnvironmentTokenBuilder defaultCredential() {
+        return namedCredential("");
+    }
+
+    /**
+     * Builds an Azure TokenCredendial.
+     * 
+     * @throws IllegalArgumentException if attempting to retrieve a named credential
+     *                                  not defined in the environment.
+     */
+    public TokenCredential build() {
+        TokenCredential result = credentials.get(name);
+        if (result == null) {
+            throw new IllegalArgumentException(
+                    "Attempting to retrieve Azure credential not configured in the environment. (name=" + name + ")");
+        } else {
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+// 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.assertEquals;
+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 static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 SpringEnvironmentTokenBuilderTest {
+
+    /**
+	 * Test getDefaultCredential method.
+	 */
+	@Test
+	public void testGetDefaultCredential() {
+		SpringEnvironmentTokenBuilder builder = new SpringEnvironmentTokenBuilder();
+		assertNotNull(builder.build());
+		assertEquals(builder.build(), builder.defaultCredential().build());
+	}
+
+	/**
+	 * 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();
+		SpringEnvironmentTokenBuilder builder = new SpringEnvironmentTokenBuilder();
+		builder.fromEnvironment(environment);
+
+		assertNotNull(builder.build());
+		assertTrue(builder.build() instanceof ClientSecretCredential);
+		assertEquals(builder.build(), builder.defaultCredential().build());
+	}
+
+	/**
+	 * 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();
+		SpringEnvironmentTokenBuilder builder = new SpringEnvironmentTokenBuilder();
+		builder.fromEnvironment(environment);
+		assertNotNull(builder.namedCredential("myname").build());
+		assertTrue(builder.build() instanceof ClientSecretCredential);
+		assertNotEquals(builder.build(), builder.defaultCredential().build());
+	}
+
+	/**
+	 * 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();
+		SpringEnvironmentTokenBuilder builder = new SpringEnvironmentTokenBuilder();
+		try {
+			builder.fromEnvironment(environment);
+			fail();
+		} catch (Throwable t) {
+			assertEquals(IllegalStateException.class, t.getClass(),
+					"Unexpected exception class on missing configuration field.");
+		}
+	}
+}

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml

@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-servicebus</artifactId>
-      <version>7.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;current} -->
+      <version>7.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;current} -->
     </dependency>
   </dependencies>