Merge branch 'master' into master

Author: cormacpayne

src/Accounts/Accounts/Az.Accounts.psd1

@@ -64,6 +64,7 @@ RequiredAssemblies = '.\Microsoft.Azure.PowerShell.Authentication.Abstractions.d
                '.\Microsoft.Azure.PowerShell.Clients.Graph.Rbac.dll', 
                '.\Microsoft.Azure.PowerShell.Clients.Monitor.dll', 
                '.\Microsoft.Azure.PowerShell.Clients.Network.dll', 
+               '.\Microsoft.Azure.PowerShell.Clients.PolicyInsights.dll', 
                '.\Microsoft.Azure.PowerShell.Clients.ResourceManager.dll', 
                '.\Microsoft.Azure.PowerShell.Common.dll', 
                '.\Microsoft.Azure.PowerShell.Storage.dll', 

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update common packages to include new PolicyInsights library 
+* Fix bug where incorrect endpoint was being used in some cases for data plane cmdlets in Windows PowerShell
 
 ## Version 1.5.3
 * Fix bug with incorrect URL being used in some cases for Functions calls

src/Accounts/Authenticators/InteractiveUserAuthenticator.cs

@@ -30,7 +30,7 @@ public async override Task<IAccessToken> Authenticate(IAzureAccount account, IAz
         {
             var auth = new AuthenticationContext(AuthenticationHelpers.GetAuthority(environment, tenant), environment?.OnPremise ?? true, tokenCache as TokenCache ?? TokenCache.DefaultShared);
             var response = await auth.AcquireTokenAsync(
-                environment.ActiveDirectoryServiceEndpointResourceId, 
+                environment.GetEndpoint(resourceId), 
                 AuthenticationHelpers.PowerShellClientId, 
                 new Uri(AuthenticationHelpers.PowerShellRedirectUri), 
                 new PlatformParameters(AuthenticationHelpers.GetPromptBehavior(promptBehavior), new ConsoleParentWindow()), 

src/Advisor/Advisor/Az.Advisor.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/15/2019
+# Generated on: 6/21/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.1'
+ModuleVersion = '1.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -109,7 +109,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Updated utils to be extensible for future changes'
+        ReleaseNotes = '* GA release of Az.Advisor'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Advisor/Advisor/ChangeLog.md

@@ -20,6 +20,9 @@
 -->
 ## Upcoming Release
 
+## Version 1.0.0
+* GA release of Az.Advisor
+
 ## Version 0.1.1
 * Updated utils to be extensible for future changes
 

src/Advisor/Advisor/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("860B550A-20CE-4FB1-BAE7-EF10E9221BCE")]
 
-[assembly: AssemblyVersion("0.1.1")]
-[assembly: AssemblyFileVersion("0.1.1")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]

src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.ps1

@@ -1130,6 +1130,58 @@ function SubscriptionOldModel-CrudTest {
         Assert-AreEqual $patchedSk $sub.SecondaryKey
         Assert-AreEqual $newSubscriptionState $sub.State
         Assert-AreEqual $patchedExpirationDate $sub.ExpirationDate
+
+        # Get subscriptions by product id
+        $productSubs = Get-AzApiManagementSubscription -Context $context -ProductId $subs[0].ProductId
+
+        Assert-AreEqual 2 $productSubs.Count
+        for ($i = 0; $i -lt $productSubs.Count; $i++) 
+        {
+            Assert-NotNull $productSubs[$i]
+            Assert-NotNull $productSubs[$i].SubscriptionId
+            Assert-NotNull $productSubs[$i].Scope
+            Assert-NotNull $productSubs[$i].State
+            Assert-NotNull $productSubs[$i].CreatedDate
+            Assert-NotNull $productSubs[$i].PrimaryKey
+            Assert-NotNull $productSubs[$i].SecondaryKey
+
+            Assert-AreEqual $subs[0].ProductId $productSubs[$i].ProductId
+        }
+
+        # Get subscriptions by user id
+        $userSubs = Get-AzApiManagementSubscription -Context $context -UserId $subs[0].UserId
+
+        Assert-AreEqual 3 $userSubs.Count
+        for ($i = 0; $i -lt $userSubs.Count; $i++) 
+        {
+            Assert-NotNull $userSubs[$i]
+            Assert-NotNull $userSubs[$i].SubscriptionId
+            Assert-NotNull $userSubs[$i].Scope
+            Assert-NotNull $userSubs[$i].State
+            Assert-NotNull $userSubs[$i].CreatedDate
+            Assert-NotNull $userSubs[$i].PrimaryKey
+            Assert-NotNull $userSubs[$i].SecondaryKey
+
+            Assert-AreEqual $subs[0].UserId $userSubs[$i].UserId
+        }
+
+        # get Subscriptions by User and Product
+        $productUserSubs = Get-AzApiManagementSubscription -Context $context -UserId $subs[0].UserId -ProductId $subs[0].ProductId
+
+        Assert-AreEqual 2 $productUserSubs.Count
+        for ($i = 0; $i -lt $productUserSubs.Count; $i++) 
+        {
+            Assert-NotNull $productUserSubs[$i]
+            Assert-NotNull $productUserSubs[$i].SubscriptionId
+            Assert-NotNull $productUserSubs[$i].Scope
+            Assert-NotNull $productUserSubs[$i].State
+            Assert-NotNull $productUserSubs[$i].CreatedDate
+            Assert-NotNull $productUserSubs[$i].PrimaryKey
+            Assert-NotNull $productUserSubs[$i].SecondaryKey
+
+            Assert-AreEqual $subs[0].UserId $productUserSubs[$i].UserId
+            Assert-AreEqual $subs[0].ProductId $productUserSubs[$i].ProductId
+        }
     }
     finally {
         # remove created subscription
@@ -1221,6 +1273,18 @@ function SubscriptionNewModel-CrudTest {
         Assert-AreEqual 1 $sub.UserId
         Assert-NotNull $sub.OwnerId
 
+        # get subscription by apiId
+        $sub = Get-AzApiManagementSubscription -Context $context -Scope $allApisScope
+
+        Assert-AreEqual $newSubscriptionId $sub.SubscriptionId
+        Assert-AreEqual $patchedName $sub.Name
+        Assert-AreEqual $patchedPk $sub.PrimaryKey
+        Assert-AreEqual $patchedSk $sub.SecondaryKey
+        Assert-AreEqual $newSubscriptionState $sub.State
+        Assert-AreEqual $patchedExpirationDate $sub.ExpirationDate
+        Assert-NotNull $sub.UserId
+        Assert-AreEqual 1 $sub.UserId
+        Assert-NotNull $sub.OwnerId
     }
     finally {
         # remove created subscription
@@ -2886,7 +2950,8 @@ function ApiVersionSet-CrudTest {
     # there should be no API Version sets initially
     Assert-AreEqual 0 $apiversionsets.Count
 
-    # create new api
+    # create new api and apiVersionSet
+    $swaggerApiId1 = getAssetName
     $newApiVersionSetId = getAssetName
     try {
         $newVersionSetName = getAssetName
@@ -2921,8 +2986,24 @@ function ApiVersionSet-CrudTest {
         Assert-AreEqual $description $newApiVersionSet.Description
         Assert-AreEqual Header $newApiVersionSet.VersioningScheme
         Assert-AreEqual $versionHeaderName $newApiVersionSet.VersionHeaderName
+
+        # now import an api into the ApiVersionSet
+        $swaggerPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "SwaggerPetStoreV2.json"
+        $path1 = "swaggerapifromFile"        
+        $apiVersion = "2"
+
+        $api = Import-AzApiManagementApi -Context $context -ApiId $swaggerApiId1 -SpecificationPath $swaggerPath -SpecificationFormat Swagger -Path $path1 -ApiVersion $apiVersion -ApiVersionSetId $newApiVersionSetId
+        Assert-NotNull $api
+        Assert-AreEqual $apiVersion $api.ApiVersion
+        Assert-AreEqual $swaggerApiId1 $api.ApiId
+        Assert-AreEqual $path1 $api.Path
+        Assert-AreEqual $newApiVersionSet.Id $api.ApiVersionSetId
     }
     finally {
+        # remove created api
+        $removed = Remove-AzApiManagementApi -Context $context -ApiId $swaggerApiId1 -PassThru
+        Assert-True { $removed }
+
         # remove created api version set
         $removed = Remove-AzApiManagementApiVersionSet -Context $context -ApiVersionSetId $newApiVersionSetId -PassThru
         Assert-True { $removed }