Skip to content

Migrate StorageMover from generation to main #25155

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.

Sign up for GitHub

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
NoriZC merged 2 commits into from
Jun 13, 2024
Merged

Migrate StorageMover from generation to main #25155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1b274
Move StorageMover to main
azure-powershell-bot Jun 13, 2024
c3e9ed6
Update ChangeLog.md
NoriZC Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
156 changes: 152 additions & 4 deletions src/StorageMover/StorageMover.Autorest/Az.StorageMover.format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.AzureKeyVaultSmbCredentials</Name>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.AzureKeyVaultSmbCredentials</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.AzureKeyVaultSmbCredentials</TypeName>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.AzureKeyVaultSmbCredentials</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand All @@ -384,9 +384,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.StorageMoverUpdateParametersTags</Name>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.StorageMoverUpdateParametersTags</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.StorageMoverUpdateParametersTags</TypeName>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.StorageMoverUpdateParametersTags</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand All @@ -405,5 +405,153 @@
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.Time</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.Time</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>Hour</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>Minute</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Hour</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Minute</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.UploadLimit</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.UploadLimit</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>LimitInMbps</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>LimitInMbps</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.UploadLimitWeeklyRecurrence</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.UploadLimitWeeklyRecurrence</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>Day</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>EndTimeHour</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>EndTimeMinute</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>LimitInMbps</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>StartTimeHour</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>StartTimeMinute</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Day</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>EndTimeHour</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>EndTimeMinute</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>LimitInMbps</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>StartTimeHour</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>StartTimeMinute</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.WeeklyRecurrence</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.WeeklyRecurrence</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>EndTimeHour</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>EndTimeMinute</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>StartTimeHour</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>StartTimeMinute</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>Day</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>EndTimeHour</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>EndTimeMinute</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>StartTimeHour</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>StartTimeMinute</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Day</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
</ViewDefinitions>
</Configuration>
4 changes: 2 additions & 2 deletions src/StorageMover/StorageMover.Autorest/Az.StorageMover.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@{
GUID = 'd6053d97-1a9b-4fc6-9bd2-09c5b23b34db'
RootModule = './Az.StorageMover.psm1'
ModuleVersion = '1.1.0'
ModuleVersion = '1.2.0'
CompatiblePSEditions = 'Core', 'Desktop'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Expand All @@ -11,7 +11,7 @@
DotNetFrameworkVersion = '4.7.2'
RequiredAssemblies = './bin/Az.StorageMover.private.dll'
FormatsToProcess = './Az.StorageMover.format.ps1xml'
FunctionsToExport = 'Get-AzStorageMover', 'Get-AzStorageMoverAgent', 'Get-AzStorageMoverEndpoint', 'Get-AzStorageMoverJobDefinition', 'Get-AzStorageMoverJobRun', 'Get-AzStorageMoverProject', 'New-AzStorageMover', 'New-AzStorageMoverAzSmbFileShareEndpoint', 'New-AzStorageMoverAzStorageContainerEndpoint', 'New-AzStorageMoverJobDefinition', 'New-AzStorageMoverNfsEndpoint', 'New-AzStorageMoverProject', 'New-AzStorageMoverSmbEndpoint', 'Remove-AzStorageMover', 'Remove-AzStorageMoverEndpoint', 'Remove-AzStorageMoverJobDefinition', 'Remove-AzStorageMoverProject', 'Start-AzStorageMoverJobDefinition', 'Stop-AzStorageMoverJobDefinition', 'Unregister-AzStorageMoverAgent', 'Update-AzStorageMover', 'Update-AzStorageMoverAgent', 'Update-AzStorageMoverAzSmbFileShareEndpoint', 'Update-AzStorageMoverAzStorageContainerEndpoint', 'Update-AzStorageMoverJobDefinition', 'Update-AzStorageMoverNfsEndpoint', 'Update-AzStorageMoverProject', 'Update-AzStorageMoverSmbEndpoint', '*'
FunctionsToExport = 'Get-AzStorageMover', 'Get-AzStorageMoverAgent', 'Get-AzStorageMoverEndpoint', 'Get-AzStorageMoverJobDefinition', 'Get-AzStorageMoverJobRun', 'Get-AzStorageMoverProject', 'New-AzStorageMover', 'New-AzStorageMoverAzSmbFileShareEndpoint', 'New-AzStorageMoverAzStorageContainerEndpoint', 'New-AzStorageMoverJobDefinition', 'New-AzStorageMoverNfsEndpoint', 'New-AzStorageMoverProject', 'New-AzStorageMoverSmbEndpoint', 'New-AzStorageMoverUploadLimitWeeklyRecurrenceObject', 'Remove-AzStorageMover', 'Remove-AzStorageMoverEndpoint', 'Remove-AzStorageMoverJobDefinition', 'Remove-AzStorageMoverProject', 'Start-AzStorageMoverJobDefinition', 'Stop-AzStorageMoverJobDefinition', 'Unregister-AzStorageMoverAgent', 'Update-AzStorageMover', 'Update-AzStorageMoverAgent', 'Update-AzStorageMoverAzSmbFileShareEndpoint', 'Update-AzStorageMoverAzStorageContainerEndpoint', 'Update-AzStorageMoverJobDefinition', 'Update-AzStorageMoverNfsEndpoint', 'Update-AzStorageMoverProject', 'Update-AzStorageMoverSmbEndpoint', '*'
AliasesToExport = 'New-AzStorageMoverSmbFileShareEndpoint', 'Update-AzStorageMoverSmbFileShareEndpoint', '*'
PrivateData = @{
PSData = @{
Expand Down
19 changes: 16 additions & 3 deletions src/StorageMover/StorageMover.Autorest/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ For information on how to develop for `Az.StorageMover`, see [how-to.md](how-to.

``` yaml
# Please specify the commit id that includes your features to make sure generated codes stable.
commit: 74948e5fb9b1e1f8b9d58fb65fc81d5cba6b6ced
commit: 1cb8cb0a95c20513c5d767614888f415be99245d
require:
# readme.azure.noprofile.md is the common configuration file
- $(this-folder)/../../readme.azure.noprofile.md
input-file:
- $(repo)/specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/storagemover.json
- $(repo)/specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/storagemover.json

# For new RP, the version is 0.1.0
module-version: 1.1.0
module-version: 1.2.0
# Normally, title is the service name
title: StorageMover
subject-prefix: $(service-name)
Expand All @@ -48,6 +48,19 @@ use-extension:
"@autorest/powershell": "3.x"

directive:
- from: swagger-document
where: $.definitions.Time.properties.minute
transform: >-
return {
"description": "The minute element of the time. Allowed values are 0 and 30. If not specified, its value defaults to 0.",
"type": "integer",
"format": "int32",
"enum": [
0,
30
],
"default": 0
}
- where:
verb: Set
remove: true
Expand Down
2 changes: 1 addition & 1 deletion src/StorageMover/StorageMover.Autorest/UX/Microsoft.StorageMover/storageMovers-agents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers/agents",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down
2 changes: 1 addition & 1 deletion ...StorageMover/StorageMover.Autorest/UX/Microsoft.StorageMover/storageMovers-endpoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers/endpoints",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ver.Autorest/UX/Microsoft.StorageMover/storageMovers-projects-jobDefinitions-jobRuns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers/projects/jobDefinitions/jobRuns",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down
6 changes: 3 additions & 3 deletions ...torageMover.Autorest/UX/Microsoft.StorageMover/storageMovers-projects-jobDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers/projects/jobDefinitions",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down Expand Up @@ -103,7 +103,7 @@
},
{
"name": "Start-AzStorageMoverJobDefinition",
"description": "Requests an Agent to start a new instance of this Job Definition, generating a new Job Run resource.",
"description": "Creates a new Job Run resource for the specified Job Definition and passes it to the Agent for execution.",
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/startJob",
"help": {
"learnMore": {
Expand All @@ -123,7 +123,7 @@
},
"examples": [
{
"description": "Requests an Agent to start a new instance of this Job Definition, generating a new Job Run resource.",
"description": "Creates a new Job Run resource for the specified Job Definition and passes it to the Agent for execution.",
"parameters": [
{
"name": "-JobDefinitionName",
Expand Down
2 changes: 1 addition & 1 deletion src/StorageMover/StorageMover.Autorest/UX/Microsoft.StorageMover/storageMovers-projects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers/projects",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down
2 changes: 1 addition & 1 deletion src/StorageMover/StorageMover.Autorest/UX/Microsoft.StorageMover/storageMovers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resourceType": "storageMovers",
"apiVersion": "2023-10-01",
"apiVersion": "2024-07-01",
"learnMore": {
"url": "https://learn.microsoft.com/powershell/module/az.storagemover"
},
Expand Down
12 changes: 11 additions & 1 deletion src/StorageMover/StorageMover.Autorest/build-module.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
# is regenerated.
# ----------------------------------------------------------------------------------
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs)
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [Switch]$DisableAfterBuildTasks)
$ErrorActionPreference = 'Stop'

if($PSEdition -ne 'Core') {
Expand Down Expand Up @@ -169,4 +169,14 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
. (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
}

if (-not $DisableAfterBuildTasks){
$afterBuildTasksPath = Join-Path $PSScriptRoot ''
$afterBuildTasksArgs = ConvertFrom-Json 'true' -AsHashtable
if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
Write-Host -ForegroundColor Green 'Running after build tasks...'
. $afterBuildTasksPath @afterBuildTasksArgs
}
}


Write-Host -ForegroundColor Green '-------------Done-------------'
8 changes: 4 additions & 4 deletions src/StorageMover/StorageMover.Autorest/custom/NewAzStorageMoverAzSmbFileShareEndpoint.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ Creates a Smb file share endpoint resource, which represents a data transfer sou
New-AzStorageMoverAzSmbFileShareEndpoint -Name $endpointName -ResourceGroupName $rgname -StorageMoverName $storagemovername -StorageAccountResourceId $accountresourceid -FileShareName $fileshareName -Description "Description"

.Inputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint
.Inputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.IStorageMoverIdentity
.Outputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint
.Notes
COMPLEX PARAMETER PROPERTIES

Expand All @@ -37,7 +37,7 @@ To create the parameters described below, construct a hash table containing the
https://learn.microsoft.com/powershell/module/az.storagemover/new-azstoragemoverazsmbfileshareendpoint
#>
function New-AzStorageMoverAzSmbFileShareEndpoint {
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint])]
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint])]
[CmdletBinding(DefaultParameterSetName = 'CreateExpanded', PositionalBinding =$false, SupportsShouldProcess, ConfirmImpact = 'Medium')]
[Alias("New-AzStorageMoverSmbFileShareEndpoint")]
param(
Expand Down Expand Up @@ -132,7 +132,7 @@ function New-AzStorageMoverAzSmbFileShareEndpoint {
)

process {
$Properties = [Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.AzureStorageSmbFileShareEndpointProperties]::New()
$Properties = [Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.AzureStorageSmbFileShareEndpointProperties]::New()

if ($PSBoundParameters.ContainsKey('FileShareName')) {
$Properties.FileShareName = $FileShareName
Expand Down
8 changes: 4 additions & 4 deletions ...StorageMover/StorageMover.Autorest/custom/NewAzStorageMoverAzStorageContainerEndpoint.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ Creates an AzStorageContainer endpoint resource, which represents a data transfe
New-AzStorageMoverAzStorageContainerEndpoint -Name myendpointName -ResourceGroupName myResourceGroup -BlobContainerName myContainer -StorageMoverName myStorageMover -StorageAccountResourceId myAccountResourceId

.Inputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint
.Inputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.IStorageMoverIdentity
.Outputs
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint
Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint
.Notes
COMPLEX PARAMETER PROPERTIES

Expand All @@ -37,7 +37,7 @@ To create the parameters described below, construct a hash table containing the
https://learn.microsoft.com/powershell/module/az.storagemover/new-azstoragemoverazstoragecontainerendpoint
#>
function New-AzStorageMoverAzStorageContainerEndpoint {
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.IEndpoint])]
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.IEndpoint])]
[CmdletBinding(DefaultParameterSetName = 'CreateExpanded', PositionalBinding =$false, SupportsShouldProcess, ConfirmImpact = 'Medium')]
param(
[Parameter(ParameterSetName='CreateExpanded', Mandatory)]
Expand Down Expand Up @@ -131,7 +131,7 @@ function New-AzStorageMoverAzStorageContainerEndpoint {
)

process {
$Properties = [Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20231001.AzureStorageBlobContainerEndpointProperties]::New()
$Properties = [Microsoft.Azure.PowerShell.Cmdlets.StorageMover.Models.Api20240701.AzureStorageBlobContainerEndpointProperties]::New()

if ($PSBoundParameters.ContainsKey('BlobContainerName')) {
$Properties.BlobContainerName = $BlobContainerName
Expand Down
Loading