Skip to content

Commit 211e36c

Browse files
viananthviananth
authored
Merge branch 'dev' into fixbootstrapper
2 parents 292df03 + 3998fbd commit 211e36c

File tree

234 files changed

+16914
-5201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+16914
-5201
lines changed

‎src/Az.BootStrapper/Az.BootStrapper.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Az.BootStrapper</id>
5-
<version>0.1.0</version>
5+
<version>0.1.0-preview</version>
66
<authors>Microsoft Corporation</authors>
77
<owners>Microsoft Corporation</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

‎src/Az.BootStrapper/Module/Az.BootStrapper.Tests.ps1‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,18 @@ Describe "Set-BootstrapRepo" {
13341334
# Cleanup
13351335
$script:BootStrapRepo = $currentBootstrapRepo
13361336
}
1337+
1338+
Context "Alias name is given" {
1339+
# Arrange
1340+
$currentBootstrapRepo = $script:BootStrapRepo
1341+
It "Should set given repo alias parameter value as BootstrapRepo" {
1342+
Set-BootstrapRepo -Name "MockName"
1343+
$script:BootStrapRepo | Should Be "MockName"
1344+
}
1345+
1346+
# Cleanup
1347+
$script:BootStrapRepo = $currentBootstrapRepo
1348+
}
13371349
}
13381350
}
13391351

‎src/Az.BootStrapper/Module/Az.BootStrapper.psd1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ AliasesToExport = @()
103103
PrivateData = @{
104104

105105
PSData = @{
106+
# Specifies the module is preview
107+
Prerelease = 'preview'
106108

107109
# Tags applied to this module. These help with module discovery in online galleries.
108110
Tags = 'Azure','Az','AzureStack','PSModule','Profile','ResourceManager'

‎src/Az.BootStrapper/Module/Az.Bootstrapper.psm1‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function Get-AzProfileMap
192192
# If cache doesn't exist, Check embedded source
193193
$defaults = [System.IO.Path]::GetDirectoryName($PSCommandPath)
194194
$scriptBlock = {
195-
Get-Content -Raw -Path (Join-Path -Path $defaults -ChildPath "AzProfileMap.json") -ErrorAction stop | ConvertFrom-Json
195+
Get-Content -Raw -Path (Join-Path -Path $defaults -ChildPath "azprofilemap.json") -ErrorAction stop | ConvertFrom-Json
196196
}
197197
$ProfileMap = Invoke-CommandWithRetry -ScriptBlock $scriptBlock
198198
if($null -eq $ProfileMap)
@@ -446,7 +446,7 @@ function Get-AllProfilesInstalled
446446
if ($null -eq $script:LatestProfileMapPath)
447447
{
448448
$ModulePath = [System.IO.Path]::GetDirectoryName($PSCommandPath)
449-
$script:LatestProfileMapPath = Get-Item -Path (Join-Path -Path $ModulePath -ChildPath "AzProfileMap.json")
449+
$script:LatestProfileMapPath = Get-Item -Path (Join-Path -Path $ModulePath -ChildPath "azprofilemap.json")
450450
}
451451

452452
$scriptBlock = {
@@ -1211,10 +1211,14 @@ function Update-AzProfile
12111211

12121212
function Set-BootstrapRepo
12131213
{
1214-
[CmdletBinding()]
1214+
[CmdletBinding()]
12151215
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "")]
1216-
param([string]$Repo)
1217-
$script:BootStrapRepo = $Repo
1216+
param
1217+
(
1218+
[Alias("Name")]
1219+
[string]$Repo
1220+
)
1221+
$script:BootStrapRepo = $Repo
12181222
}
12191223

12201224
<#

‎src/Az.BootStrapper/Module/azprofilemap.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
{
22
"2019-03-01-hybrid": {
33
"Az": [
4-
"0.10.0"
4+
"0.10.0-preview"
55
],
66
"Az.Accounts": [
77
"2.0.1-preview"
88
],
99
"Az.Billing": [
10-
"0.10.0"
10+
"0.10.0-preview"
1111
],
1212
"Az.Compute": [
13-
"0.10.0"
13+
"0.10.0-preview"
1414
],
1515
"Az.DataBoxEdge": [
1616
"1.1.0"
1717
],
1818
"Az.Dns": [
19-
"0.10.0"
19+
"0.10.0-preview"
2020
],
2121
"Az.EventHub": [
2222
"1.4.3"
2323
],
2424
"Az.IotHub": [
25-
"2.0.1"
25+
"0.10.0-preview"
2626
],
2727
"Az.KeyVault": [
28-
"0.10.0"
28+
"0.10.0-preview"
2929
],
3030
"Az.Monitor": [
31-
"1.5.0"
31+
"1.6.0"
3232
],
3333
"Az.Network": [
34-
"0.10.0"
34+
"0.10.0-preview"
3535
],
3636
"Az.Resources": [
37-
"0.10.0"
37+
"0.10.0-preview"
3838
],
3939
"Az.Storage": [
40-
"0.10.0"
40+
"0.10.0-preview"
4141
],
4242
"Az.Websites": [
43-
"0.10.0"
43+
"0.10.0-preview"
4444
]
4545
}
4646
}

‎src/Azs.AzureBridge.Admin/readme.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@ require:
5050
- $(this-folder)/../readme.azurestack.md
5151
- $(repo)/specification/azsadmin/resource-manager/azurebridge/readme.md
5252

53+
metadata:
54+
description: 'Microsoft AzureStack PowerShell: AzureBridge Admin cmdlets'
55+
5356
subject-prefix: AzureBridge
54-
module-version: 0.9.0
57+
module-version: 0.9.0-preview
5558
identity-correction-for-post: true
59+
service-name: BridgeAdmin
5660

5761
### File Renames
5862
module-name: Azs.AzureBridge.Admin
@@ -120,7 +124,7 @@ directive:
120124
# Add Az.Accounts/Az.Resources as dependencies
121125
- from: Azs.AzureBridge.Admin.nuspec
122126
where: $
123-
transform: $ = $.replace('<dependency id=\"Az.Accounts\" version=\"1.6.0\" />', '<dependency id="Az.Accounts" version="[2.0.1-preview]" />\n <dependency id="Az.Resources" version="[0.10.0]" />');
127+
transform: $ = $.replace('<dependency id=\"Az.Accounts\" version=\"1.6.0\" />', '<dependency id="Az.Accounts" version="[2.0.1-preview]" />\n <dependency id="Az.Resources" version="[0.10.0-preview]" />');
124128

125129
# PSD1 changes for RequiredModules
126130
- from: source-file-csharp

‎src/Azs.Backup.Admin/custom/Restore-AzsBackup.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ process {
182182
$null = $PSBoundParameters.Remove('InputObject')
183183
$Name = $Backup.Name
184184
$PSBoundParameters.Add('Name', $Backup.Name)
185+
# Update $Location so that it can be shown properly in confirmation prompt
186+
$Location = $Backup.Location
185187
}
186188

187189
# Generated SDK does not support {location}/{name} for nested resource name, so extract the {name} part here

‎src/Azs.Backup.Admin/docs/Azs.Backup.Admin.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
Module Name: Azs.Backup.Admin
3-
Module Guid: f9197ea9-14c2-474d-9ece-6453cd315036
3+
Module Guid: c1157b29-2b5d-4d44-8e50-c9630d257155
44
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azs.backup.admin
55
Help Version: 1.0.0.0
66
Locale: en-US
77
---
88

99
# Azs.Backup.Admin Module
1010
## Description
11-
Microsoft Azure PowerShell: BackupAdmin cmdlets
11+
Microsoft AzureStack PowerShell: BackupAdmin cmdlets
1212

1313
## Azs.Backup.Admin Cmdlets
1414
### [Get-AzsBackup](Get-AzsBackup.md)

‎src/Azs.Backup.Admin/docs/Get-AzsBackup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ Returns a backup from a location based on name.
3434

3535
## EXAMPLES
3636

37-
### Example 1: {{ Add title here }}
37+
### Example 1: List Backups
3838
```powershell
3939
PS C:\> Get-AzsBackup
4040
4141
```
4242

4343
Get information sbout all Azure Stack backups.
4444

45-
### Example 2: {{ Add title here }}
45+
### Example 2: Get specific backup
4646
```powershell
4747
PS C:\> Get-AzsBackup -Name 'backupName'
4848

‎src/Azs.Backup.Admin/docs/Get-AzsBackupConfiguration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Returns a specific backup location based on name.
3535

3636
## EXAMPLES
3737

38-
### Example 1: {{ Add title here }}
38+
### Example 1: Get-AzsBackupConfiguration
3939
```powershell
4040
PS C:\> Get-AzsBackupConfiguration
4141

0 commit comments

Comments
 (0)