Merge pull request Azure#6257 from markcowl/oauth-preview

Update tools and versions for Storage preview release

Author: markcowl

src/ResourceManager/Storage/AzureRM.Storage.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSGet_AzureRM.Storage'
 #
 # Generated by: Microsoft Corporation
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '5.0.1'
+ModuleVersion = '5.0.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -130,8 +130,19 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Query Storage Usage By Location
-  - Get-AzureRmStorageUsage'
+
+        ReleaseNotes = '* Support Immutability Policy in AzureRm.Storage
+        - Remove-AzureRmStorageAccountNetworkRule,
+        - Get-AzureRmStorageContainer,
+        - Update-AzureRmStorageContainer,
+        - New-AzureRmStorageContainer,
+        - Remove-AzureRmStorageContainer,
+        - Add-AzureRmStorageContainerLegalHold,
+        - Remove-AzureRmStorageContainerLegalHold,
+        - Set-AzureRmStorageContainerImmutabilityPolicy,
+        - Get-AzureRmStorageContainerImmutabilityPolicy,
+        - Remove-AzureRmStorageContainerImmutabilityPolicy,
+        - Lock-AzureRmStorageContainerImmutabilityPolicy'
 
         # Prerelease string of this module
         Prerelease = 'preview'

src/ResourceManager/Storage/ChangeLog.md

@@ -20,10 +20,18 @@
 ## Current Release
 
 ## Version 5.0.2-preview
-* Support create Storage Context with OAuth.
-   - The PR pending change：
-     - Change to signed package
-     - Use AuthenticationFactory in Powershell to replace ADAL reference.
+* Support Immutability Policy in AzureRm.Storage
+        - Remove-AzureRmStorageAccountNetworkRule,
+        - Get-AzureRmStorageContainer,
+        - Update-AzureRmStorageContainer,
+        - New-AzureRmStorageContainer,
+        - Remove-AzureRmStorageContainer,
+        - Add-AzureRmStorageContainerLegalHold,
+        - Remove-AzureRmStorageContainerLegalHold,
+        - Set-AzureRmStorageContainerImmutabilityPolicy,
+        - Get-AzureRmStorageContainerImmutabilityPolicy,
+        - Remove-AzureRmStorageContainerImmutabilityPolicy,
+        - Lock-AzureRmStorageContainerImmutabilityPolicy
 
 ## Version 5.0.1-preview
 * Support get the Storage resource usage of a specific location

src/ResourceManager/Storage/Commands.Management.Storage/Properties/AssemblyInfo.cs

@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("5.0.1")]
-[assembly: AssemblyFileVersion("5.0.1")]
+[assembly: AssemblyVersion("5.0.2")]
+[assembly: AssemblyFileVersion("5.0.2")]

src/ServiceManagement/Azure.psd1

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-#RequiredModules = ''
+RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/Storage/Azure.Storage.psd1

@@ -158,6 +158,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
+
         ReleaseNotes = '* Support creating Storage Context with OAuth credentials.'
 
         # Prerelease string of this module

src/Storage/ChangeLog.md

@@ -19,6 +19,12 @@
 -->
 ## Current Release
 
+## Version 4.4.0
+* Support create Storage Context with OAuth.
+   - The PR pending change：
+     - Change to signed package
+     - Use AuthenticationFactory in Powershell to replace ADAL reference.
+     
 ## Version 4.3.0
 * Set minimum dependency of module to PowerShell 5.0
 * Support $web as Storage blob container name

tools/AzureRM/AzureRM.psd1

@@ -51,7 +51,8 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.0.0'; }, 
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.0.0'; }, 
+               @{ModuleName = 'Azure.Storage'; ModuleVersion = '4.3.0'; }, 
                @{ModuleName = 'AzureRM.AnalysisServices'; RequiredVersion = '0.6.7'; }, 
                @{ModuleName = 'Azure.AnalysisServices'; RequiredVersion = '0.5.1'; }, 
                @{ModuleName = 'AzureRM.ApiManagement'; RequiredVersion = '6.0.0'; }, 

tools/PublishModules.ps1

@@ -280,6 +280,106 @@ function Publish-RMModule
     }
 }
 
+<#
+.SYNOPSIS
+    Saves a module into the local temporary repository
+
+.PARAMETER Module
+    Module information.
+
+.PARAMETER TempRepo
+    Name of the local temporary repository
+
+.PARAMETER TempRepoPath
+    Path to the local temporary repository
+#>
+function Save-PackageLocally {
+    [CmdletBinding()]
+    param(
+        $Module,
+        [string]$TempRepo,
+        [string]$TempRepoPath
+    )
+
+    $ModuleName = $module['ModuleName']
+    $RequiredVersion = $module['RequiredVersion']
+    if ($RequiredVersion -eq $null)
+    {
+        $RequiredVersion = $module['ModuleVersion']
+    }
+
+    # Only check for the modules that specifies = required exact dependency version
+    if ($RequiredVersion -ne $null) {
+        Write-Output "Checking for required module $ModuleName, $RequiredVersion"
+        if (Find-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Repository $TempRepo -ErrorAction SilentlyContinue) {
+            Write-Output "Required dependency $ModuleName, $RequiredVersion found in the repo $TempRepo"
+        } elseif ((Get-Module -ListAvailable -Name $ModuleName | Where-Object {$_.Version -eq $RequiredVersion}) -ne $null) {
+            Write-Output "Required dependency $ModuleName, $RequiredVersion found in build modules"
+        } else {
+            Write-Warning "Required dependency $ModuleName, $RequiredVersion not found in the repo $TempRepo"
+            Write-Output "Downloading the package from PsGallery to the path $TempRepoPath"
+            # We try to download the package from the PsGallery as we are likely intending to use the existing version of the module.
+            # If the module not found in psgallery, the following commnad would fail and hence publish to local repo process would fail as well
+            Save-Package -Name $ModuleName -RequiredVersion $RequiredVersion -ProviderName Nuget -Path $TempRepoPath -Source https://www.powershellgallery.com/api/v2 | Out-Null
+            Write-Output "Downloaded the package sucessfully"
+        }
+    }
+}
+
+<#
+.SYNOPSIS
+Save the packages from PsGallery to local repo path
+This is typically used in a scenario where we are intending to use the existing publshed version of the module as a dependency
+Checks whether the module is already published in the local temp repo, if not downloads from the PSGallery
+This is used only for the rollup modules AzureRm or AzureStack at the moment
+
+.PARAMETER ModulePaths
+List of paths to modules.
+
+.PARAMETER TempRepo
+Name of local temporary repository.
+
+.PARAMETER TempRepoPath
+path to local temporary repository.
+
+#>
+function Save-PackagesFromPsGallery {
+    [CmdletBinding()]
+    param(
+        [String[]]$ModulePaths,
+
+        [ValidateNotNullOrEmpty()]
+        [String]$TempRepo,
+
+        [ValidateNotNullOrEmpty()]
+        [String]$TempRepoPath
+    )
+    PROCESS {
+
+        Write-Output "Saving..."
+
+        foreach ($modulePath in $ModulePaths) {
+
+            Write-Output "module path $modulePath"
+
+            $module = (Get-Item -Path $modulePath).Name
+            $moduleManifest = $module + ".psd1"
+
+            Write-Host "Verifying $module has all the dependencies in the repo $TempRepo"
+
+            $psDataFile = Import-PowershellDataFile (Join-Path $modulePath -ChildPath $moduleManifest)
+            $RequiredModules = $psDataFile['RequiredModules']
+
+            if ($RequiredModules -ne $null) {
+                foreach ($tmp in $RequiredModules) {
+                    foreach ($module in $tmp) {
+                        Save-PackageLocally -Module $module -TempRepo $TempRepo -TempRepoPath $TempRepoPath
+                    }
+                }
+            }
+        }
+    }
+}
 
 
 if ([string]::IsNullOrEmpty($buildConfig))
@@ -336,10 +436,17 @@ if ($repo -ne $null) {
     Register-PSRepository -Name $tempRepoName -SourceLocation $tempRepoPath -PublishLocation $tempRepoPath -InstallationPolicy Trusted -PackageManagementProvider NuGet
 }
 
-$env:PSModulePath="$env:PSModulePath;$tempRepoPath"
+
+
+        $sourceModulePath = "$packageFolder\ResourceManager\AzureResourceManager"
+
+$sourceModulePath
+$env:PSModulePath="$env:PSModulePath;$tempRepoPath;$sourceModulePath"
+$env:PSModulePath
 
 try {
     $modulesInScope = Get-TargetModules -buildConfig $buildConfig -Scope $scope -PublishLocal $publishToLocal -Profile $Profile
+    Save-PackagesFromPsGallery -ModulePaths $modulesInScope -TempRepo $tempRepoName -TempRepoPath $tempRepoPath
     foreach ($modulePath in $modulesInScope) {
         # filter out AzureRM.Profile which always gets published first 
         # And "Azure.Storage" which is built out as test dependencies