Merge branch 'master' into patch-1

Author: cormacpayne

src/ApiManagement/ApiManagement/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update `-Format` parameter description in `Set-AzApiManagementPolicy` reference documentation
 
 ## Version 1.3.0
 * Fixed miscellaneous typos across module

src/ApiManagement/ApiManagement/help/Set-AzApiManagementPolicy.md

@@ -142,10 +142,10 @@ Accept wildcard characters: False
 ```
 
 ### -Format
-Specifies the format of the policy. When using `application/vnd.ms-az-apim.policy+xml`, 
-expressions contained within the policy must be XML-escaped. When using `application/vnd.ms-az-apim.policy.raw+xml` it 
+Specifies the format of the policy. When using `application/vnd.ms-azure-apim.policy+xml`, 
+expressions contained within the policy must be XML-escaped. When using `application/vnd.ms-azure-apim.policy.raw+xml` it 
 is **not** necessary for the policy to be XML-escaped.
-The default value is `application/vnd.ms-az-apim.policy+xml`.
+The default value is `application/vnd.ms-azure-apim.policy+xml`.
 This parameter is optional.
 
 ```yaml

src/Blueprint/Blueprint/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add functionality to make sure Blueprint RP is registered before any service calls
 
 ## Version 0.2.4
 * Fixed miscellaneous typos across module

src/Blueprint/Blueprint/Cmdlets/BlueprintCmdletBase.cs

@@ -18,11 +18,12 @@
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Management.Authorization.Version2015_07_01;
 using Microsoft.Azure.Management.Internal.ResourceManager.Version2018_05_01;
-using Microsoft.Azure.PowerShell.Cmdlets.Blueprint.Properties;
 using Microsoft.Rest;
 using System;
-using System.Collections.Generic;
 using System.IO;
+using Microsoft.Azure.Management.Internal.Resources.Models;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using Provider = Microsoft.Azure.Management.Internal.ResourceManager.Version2018_05_01.Models.Provider;
 
 namespace Microsoft.Azure.Commands.Blueprint.Cmdlets
 {
@@ -121,15 +122,41 @@ protected override void WriteExceptionError(Exception ex)
         /// <param name="subscriptionId"> SubscriptionId passed from the cmdlet</param>
         protected void RegisterBlueprintRp(string subscriptionId)
         {
+            // To save time, we'll check the registration state first before making the register call.
             ResourceManagerClient.SubscriptionId = subscriptionId;
-            var response = ResourceManagerClient.Providers.Register(BlueprintConstants.BlueprintProviderNamespace);
+            Provider provider = ResourceManagerClient.Providers.Get(BlueprintConstants.BlueprintProviderNamespace);
 
-            if (response == null)
+            if (provider.RegistrationState == RegistrationState.Registered)
             {
-                throw new KeyNotFoundException(string.Format(Resources.ResourceProviderRegistrationFailed, BlueprintConstants.BlueprintProviderNamespace));
+                return;
             }
-        }
 
+            // The reason we poll for the registrationState for RP registration is because we'd like to make sure the RP registering
+            // happens before the blueprint creation/assignment request is submitted. This should help alleviate the spike in
+            // blueprint creation/assignment failures due to RP not being registered.
+            const int MaxPoll = 20;
+            int pollCount = 0;
+
+            do
+            {
+                if (pollCount > MaxPoll)
+                {
+                    // We should ideally throw a timeout exception here but we're collecting logs on service side about RP registration failures
+                    // and would like to continue with blueprint/assignment creation flow.
+                    //
+                    // To-Do: Add TimeoutException
+                    break;
+                }
+
+                provider = ResourceManagerClient.Providers.Register(BlueprintConstants
+                    .BlueprintProviderNamespace); // Instead of Get, do Register call again since GET takes its sweet time to return the status.
+
+                TestMockSupport.Delay(TimeSpan.FromSeconds(1));
+
+                pollCount++;
+
+            } while (provider.RegistrationState != RegistrationState.Registered);
+        }
 
         /// <summary>
         /// Expects a string that consist of full file path with file extension and check if it exists.

src/HealthcareApis/HealthcareApis.Test/ScenarioTests/HealthcareApisServiceTests.ps1

@@ -47,6 +47,7 @@ function Test-AzRmHealthcareApisService{
 		# Assert
 		Assert-AreEqual $actual.Name $rname
 		Assert-AreEqual $actual.Properties.CosmosDbConfiguration.OfferThroughput $offerThroughput
+		Assert-AreEqual $actual.Kind $kind
 		#Update using parameters
 		$newOfferThroughput = $offerThroughput - 600
 		$updated = Set-AzHealthcareApisService -ResourceId $actual.Id -CosmosOfferThroughput $newOfferThroughput;