Merging new changes from master into azconfig

.azure-pipelines/client.yml

@@ -95,10 +95,28 @@ jobs:
           publishJUnitResults: false
           goals: 'site:site site:stage'
 
+      - script: |
+          git clone https://github.com/JonathanGiles/DependencyChecker.git
+          mkdir input && cp dependencies.json input/
+        displayName: 'Download dependency checker'
+
+      - task: Maven@3
+        displayName: 'Analyze dependencies'
+        inputs:
+          mavenPomFile: 'DependencyChecker/pom.xml'
+          options: '-Dexec.args="-showall"'
+          mavenOptions: '$(LoggingOptions)'
+          javaHomeOption: 'JDKVersion'
+          jdkVersionOption: '1.11'
+          jdkArchitectureOption: 'x64'
+          publishJUnitResults: false
+          goals: 'clean package exec:java'
+
       - powershell: |
           copy -r target/staging $(Build.ArtifactStagingDirectory)
           copy eng/code-quality-reports/src/main/resources/index.html $(Build.ArtifactStagingDirectory)
           copy eng/spotbugs-aggregate-report/target/spotbugs/spotbugsXml.html (Join-Path $(Build.ArtifactStagingDirectory) "staging")
+          copy output/dependencies.html (Join-Path $(Build.ArtifactStagingDirectory) "staging")
         displayName: 'Copy reports to artifact staging'
 
       - task: PublishBuildArtifacts@1

README.md

@@ -5,7 +5,7 @@
 | Component | Build Status |
 | --------- | ------------ |
 | Management Libraries | [![Build Status](https://travis-ci.org/Azure/azure-sdk-for-java.svg?branch=master)](https://travis-ci.org/Azure/azure-sdk-for-java) |
-| Client Libraries | [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17) |
+| Client Libraries | [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17)<br>[![Build Documentation](https://img.shields.io/badge/documentation-published-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java/index.html)|
 
 :+1: [Try Azure for FREE](http://go.microsoft.com/fwlink/?LinkId=330212)
 

authorization/msi-auth-token-provider-jar/src/main/java/com/microsoft/azure/msiAuthTokenProvider/MSICredentials.java

@@ -15,6 +15,9 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Managed Service Identity token based credentials for use with a REST Service Client.
@@ -24,6 +27,9 @@ public final class MSICredentials{
     //
     private final List<Integer> retrySlots = new ArrayList<>();
     //
+    private final Lock lock = new ReentrantLock();
+
+    private final ConcurrentHashMap<String, MSIToken> cache = new ConcurrentHashMap<>();
     private final MSIConfigurationForVirtualMachine configForVM;
     private final MSIConfigurationForAppService configForAppService;
     private final HostType hostType;
@@ -157,7 +163,7 @@ public void updateObjectId(String objectId) {
     public MSIToken getToken(String tokenAudience) throws IOException, AzureMSICredentialException{
         switch (hostType) {
             case VIRTUAL_MACHINE:
-                    return this.retrieveTokenFromIDMSWithRetry(tokenAudience == null ? this.configForVM.resource() : tokenAudience);
+                    return this.getTokenForVirtualMachineFromIMDSEndpoint(tokenAudience == null ? this.configForVM.resource() : tokenAudience);
             case APP_SERVICE:
                 return this.getTokenForAppService(tokenAudience);
             default:
@@ -217,6 +223,51 @@ private MSIToken getTokenForAppService(String tokenAudience) throws IOException,
         }
     }
 
+    private MSIToken getTokenForVirtualMachineFromIMDSEndpoint(String tokenAudience) throws AzureMSICredentialException {
+        String tokenIdentifier = tokenAudience;
+
+        String extraIdentifier = null;
+        if (this.configForVM.objectId() != null)
+        {
+            extraIdentifier = configForVM.objectId();
+        } else if (this.configForVM.clientId() != null) {
+            extraIdentifier = configForVM.clientId();
+        } else if (this.configForVM.identityId() != null) {
+            extraIdentifier = configForVM.identityId();
+        }
+
+        if (extraIdentifier != null) {
+            tokenIdentifier = tokenIdentifier + "#" + extraIdentifier;
+        }
+
+        MSIToken token = cache.get(tokenIdentifier);
+        if (token != null && !token.isExpired()) {
+            return token;
+        }
+
+        lock.lock();
+
+        try {
+            token = cache.get(tokenIdentifier);
+            if (token != null && !token.isExpired()) {
+                return token;
+            }
+
+            try {
+                token = retrieveTokenFromIDMSWithRetry(tokenAudience);
+                if (token != null) {
+                    cache.put(tokenIdentifier, token);
+                }
+            } catch (IOException exception) {
+                throw new AzureMSICredentialException(exception);
+            }
+
+            return token;
+        } finally {
+            lock.unlock();
+        }
+    }
+
     private MSIToken retrieveTokenFromIDMSWithRetry(String tokenAudience) throws AzureMSICredentialException, IOException {
         StringBuilder payload = new StringBuilder();
         final int imdsUpgradeTimeInMs = 70 * 1000;

dependencies.json

@@ -0,0 +1,6 @@
+[
+  {
+    "projectName": "azure-sdk-for-java",
+    "pomUrls": ["file:./pom.client.xml"]
+  }
+]

eng/code-quality-reports/src/main/resources/index.html

@@ -499,6 +499,10 @@ <h2>Azure Java SDK</h2>
                         <ion-icon name="book"></ion-icon>
                         <a href="staging/index.html" target="_blank" class="links">Maven Site</a>
                     </li>
+                    <li class="list-group-item sub-component">
+                        <ion-icon name="clipboard"></ion-icon>
+                        <a href="staging/dependencies.html" target="_blank" class="links">Dependencies</a>
+                    </li>
                     <li class="list-group-item sub-component">
                         <ion-icon name="bug"></ion-icon>
                         <a href="staging/spotbugsXml.html" target="_blank" class="links">SpotBugs (Aggregate)</a>

eventhubs/data-plane/.gitattributes

@@ -0,0 +1,26 @@
+# Default behavior: if Git thinks a file is text (as opposed to binary), it
+# will normalize line endings to LF in the repository, but convert to your
+# platform's native line endings on checkout (e.g., CRLF for Windows).
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout. E.g.,
+#*.c text
+
+# Declare files that will always have CRLF line endings on checkout. E.g.,
+#*.sln text eol=crlf
+
+# Declare files that will always have LF line endings on checkout. E.g.,
+*.sh text eol=lf
+
+# Denote all files that should not have line endings normalized, should not be
+# merged, and should not show in a textual diff.
+*.docm binary
+*.docx binary
+*.ico binary
+*.lib binary
+*.png binary
+*.pptx binary
+*.snk binary
+*.vsdx binary
+*.xps binary

eventhubs/data-plane/.github/CONTRIBUTING.md

@@ -0,0 +1,50 @@
+# Contribute or Provide Feedback for Azure Event Hubs Java library
+
+## Table of Contents
+
+- [Code of Conduct](#code-of-conduct)
+- [Filing Issues](#filing-issues)
+- [Pull Requests](#pull-requests)
+    - [General guidelines](#general-guidelines)
+    - [Testing guidelines](#testing-guidelines)
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+
+## Filing Issues
+
+You can find all of the issues that have been filed in the [Issues](https://github.com/Azure/azure-event-hubs-java/issues) section of the repository.
+
+If you encounter any bugs, please file an issue [here](https://github.com/Azure/azure-event-hubs-java/issues/new) and make sure to fill out the provided template with the requested information.
+
+To suggest a new feature or changes that could be made, file an issue the same way you would for a bug, but remove the provided template and replace it with information about your suggestion.
+
+### Pull Requests
+
+If you are thinking about making a large change to this library, **break up the change into small, logical, testable chunks, and organize your pull requests accordingly**.
+
+You can find all of the pull requests that have been opened in the [Pull Request](https://github.com/Azure/azure-event-hubs-java/pulls) section of the repository.
+
+To open your own pull request, click [here](https://github.com/Azure/azure-event-hubs-java/compare). When creating a pull request, keep the following in mind:
+- Make sure you are pointing to the fork and branch that your changes were made in
+- The pull request template that is provided **should be filled out**; this is not something that should just be deleted or ignored when the pull request is created
+    - Deleting or ignoring this template will elongate the time it takes for your pull request to be reviewed
+
+#### General guidelines
+
+The following guidelines must be followed in **EVERY** pull request that is opened.
+
+- Title of the pull request is clear and informative
+- There are a small number of commits that each have an informative message
+- A description of the changes the pull request makes is included, and a reference to the bug/issue the pull request fixes is included, if applicable
+- All files have the Microsoft copyright header
+
+#### Testing guidelines
+
+The following guidelines must be followed in **EVERY** pull request that is opened.
+
+- Pull request includes test coverage for the included changes
+- Tests must use xunit
+- Test code should not contain hard coded values for resource names or similar values
+- Test should not use App.config files for settings

eventhubs/data-plane/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+## Actual Behavior
+1. 
+2. 
+
+## Expected Behavior
+1. 
+2. 
+
+## Versions  
+- OS platform and version:
+- Maven package version or commit ID:

eventhubs/data-plane/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+## Description
+<!--
+Please add an informative description that covers the changes made by the pull request.
+
+If applicable, reference the bug/issue that this pull request fixes here.
+-->
+
+This checklist is used to make sure that common guidelines for a pull request are followed.
+
+- [ ] **I have read the [contribution guidelines](./CONTRIBUTING.md).**
+- [ ] Title of the pull request is clear and informative.
+- [ ] There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR.
+- [ ] The pull request does not introduce breaking changes (unless a major version change occurs in the assembly and module).
+- [ ] If applicable, the public code is properly documented.
+- [ ] Pull request includes test coverage for the included changes.
+- [ ] The code builds without any errors.