Skip to content

Make Sha256Checksum optional in New-AzImageBuilderCustomizerObject #12188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ImageBuilder/Az.ImageBuilder.psd1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@{
GUID = 'bdedc683-d9b6-41ea-b310-d068b8c72305'
RootModule = './Az.ImageBuilder.psm1'
ModuleVersion = '0.1.0'
ModuleVersion = '0.1.1'
CompatiblePSEditions = 'Core', 'Desktop'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Expand Down
3 changes: 3 additions & 0 deletions src/ImageBuilder/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
-->
## Upcoming Release

## Version 0.1.1
* Made `Sha256Checksum` optional in `New-AzImageBuilderCustomizerObject`.

## Version 0.1.0
* the first preview release

4 changes: 2 additions & 2 deletions src/ImageBuilder/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("032C639A-AFE3-4DEE-8B70-6B920335732D")]
[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyFileVersion("0.1.0")]
[assembly: AssemblyVersion("0.1.1")]
[assembly: AssemblyFileVersion("0.1.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ function New-AzImageBuilderCustomizerObject {
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[string]
${ScriptUri},
[Parameter(ParameterSetName='ShellCustomizer', Mandatory, HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Parameter(ParameterSetName='FileCustomizer', Mandatory, HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Parameter(ParameterSetName='PowerShellCustomizer', Mandatory, HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Parameter(ParameterSetName='ShellCustomizer', HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Parameter(ParameterSetName='FileCustomizer', HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Parameter(ParameterSetName='PowerShellCustomizer', HelpMessage="SHA256 checksum of the shell script provided in the scriptUri field.")]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[string]
${Sha256Checksum},
Expand Down
16 changes: 8 additions & 8 deletions src/ImageBuilder/exports/New-AzImageBuilderCustomizerObject.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ param(
# Friendly Name to provide context on what this customization step does.
${CustomizerName},

[Parameter(ParameterSetName='ShellCustomizer', Mandatory)]
[Parameter(ParameterSetName='PowerShellCustomizer', Mandatory)]
[Parameter(ParameterSetName='FileCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.String]
# SHA256 checksum of the shell script provided in the scriptUri field.
${Sha256Checksum},

[Parameter(ParameterSetName='ShellCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.Management.Automation.SwitchParameter]
Expand All @@ -98,6 +90,14 @@ param(
# It can be a github link, SAS URI for Azure Storage, etc.
${ScriptUri},

[Parameter(ParameterSetName='ShellCustomizer')]
[Parameter(ParameterSetName='PowerShellCustomizer')]
[Parameter(ParameterSetName='FileCustomizer')]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.String]
# SHA256 checksum of the shell script provided in the scriptUri field.
${Sha256Checksum},

[Parameter(ParameterSetName='PowerShellCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.Management.Automation.SwitchParameter]
Expand Down
16 changes: 8 additions & 8 deletions src/ImageBuilder/exports/ProxyCmdletDefinitions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1012,14 +1012,6 @@ param(
# Friendly Name to provide context on what this customization step does.
${CustomizerName},

[Parameter(ParameterSetName='ShellCustomizer', Mandatory)]
[Parameter(ParameterSetName='PowerShellCustomizer', Mandatory)]
[Parameter(ParameterSetName='FileCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.String]
# SHA256 checksum of the shell script provided in the scriptUri field.
${Sha256Checksum},

[Parameter(ParameterSetName='ShellCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.Management.Automation.SwitchParameter]
Expand All @@ -1043,6 +1035,14 @@ param(
# It can be a github link, SAS URI for Azure Storage, etc.
${ScriptUri},

[Parameter(ParameterSetName='ShellCustomizer')]
[Parameter(ParameterSetName='PowerShellCustomizer')]
[Parameter(ParameterSetName='FileCustomizer')]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.String]
# SHA256 checksum of the shell script provided in the scriptUri field.
${Sha256Checksum},

[Parameter(ParameterSetName='PowerShellCustomizer', Mandatory)]
[Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Category('Body')]
[System.Management.Automation.SwitchParameter]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected override void ProcessRecord()
throw new ArgumentException($"Custom folder '{CustomFolder}' does not exist");
}

string version = Convert.ToString(@"0.1.0");
string version = Convert.ToString(@"0.1.1");
// Validate the module version should be semantic version
// Following regex is official from https://semver.org/
Regex rx = new Regex(@"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$", RegexOptions.Compiled);
Expand Down
14 changes: 7 additions & 7 deletions src/ImageBuilder/help/New-AzImageBuilderCustomizerObject.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ Describes a unit of image customization

### ShellCustomizer (Default)
```
New-AzImageBuilderCustomizerObject -CustomizerName <String> -Sha256Checksum <String> -ShellCustomizer
[-Inline <String[]>] [-ScriptUri <String>] [<CommonParameters>]
New-AzImageBuilderCustomizerObject -CustomizerName <String> -ShellCustomizer [-Inline <String[]>]
[-ScriptUri <String>] [-Sha256Checksum <String>] [<CommonParameters>]
```

### FileCustomizer
```
New-AzImageBuilderCustomizerObject -CustomizerName <String> -FileCustomizer -Sha256Checksum <String>
[-Destination <String>] [-SourceUri <String>] [<CommonParameters>]
New-AzImageBuilderCustomizerObject -CustomizerName <String> -FileCustomizer [-Destination <String>]
[-Sha256Checksum <String>] [-SourceUri <String>] [<CommonParameters>]
```

### PowerShellCustomizer
```
New-AzImageBuilderCustomizerObject -CustomizerName <String> -PowerShellCustomizer -Sha256Checksum <String>
[-Inline <String[]>] [-RunElevated <Boolean>] [-ScriptUri <String>] [-ValidExitCode <Int32[]>]
New-AzImageBuilderCustomizerObject -CustomizerName <String> -PowerShellCustomizer [-Inline <String[]>]
[-RunElevated <Boolean>] [-ScriptUri <String>] [-Sha256Checksum <String>] [-ValidExitCode <Int32[]>]
[<CommonParameters>]
```

Expand Down Expand Up @@ -320,7 +320,7 @@ Type: System.String
Parameter Sets: FileCustomizer, PowerShellCustomizer, ShellCustomizer
Aliases:

Required: True
Required: False
Position: Named
Default value: None
Accept pipeline input: False
Expand Down
2 changes: 1 addition & 1 deletion src/ImageBuilder/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ input-file:
- $(repo)/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json

title: ImageBuilder
module-version: 0.1.0
module-version: 0.1.1
subject-prefix: ''

identity-correction-for-post: true
Expand Down