Merge pull request #10344 from hyonholee/october1

[Compute] Breaking change update for Compute module

Author: wyunchi-ms

src/Compute/Compute.Test/Compute.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
   </ItemGroup>

src/Compute/Compute.Test/ScenarioTests/GalleryTests.ps1

@@ -75,7 +75,6 @@ function Verify-GalleryImageVersion
         Assert-AreEqual "Microsoft.Compute/galleries/images/versions" $imageVersion.Type;
         Assert-NotNull $imageVersion.Id;
 
-        Assert-AreEqual $sourceImageId $imageVersion.PublishingProfile.Source.ManagedImage.Id;
         Assert-AreEqual $sourceImageId $imageVersion.StorageProfile.Source.Id;
         Assert-AreEqual $replicaCount $imageVersion.PublishingProfile.ReplicaCount;
         Assert-False { $imageVersion.PublishingProfile.ExcludeFromLatest };

src/Compute/Compute/ChangeLog.md

@@ -19,6 +19,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Breaking changes
+    - UploadSizeInBytes parameter is used instead of DiskSizeGB for New-AzDiskConfig when CreateOption is Upload
+    - PublishingProfile.Source.ManagedImage.Id is replaced with StorageProfile.Source.Id in GalleryImageVersion object
 
 ## Version 2.7.0
 * Add Priority, EvictionPolicy, and MaxPrice parameters to New-AzVM and New-AzVmss cmdlets

src/Compute/Compute/Compute.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.2.0" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />

src/Compute/Compute/Generated/ContainerService/ContainerServiceDeleteMethod.cs

@@ -83,7 +83,6 @@ public override void ExecuteCmdlet()
         public string Name { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/Disk/Config/NewAzureRmDiskConfigCommand.cs

@@ -54,7 +54,6 @@ public partial class NewAzureRmDiskConfigCommand : Microsoft.Azure.Commands.Reso
             Mandatory = false,
             Position = 2,
             ValueFromPipelineByPropertyName = true)]
-        [CmdletParameterBreakingChange(nameof(DiskSizeGB), ChangeDescription = "'DiskSizeInBytes' instead of 'DiskSizeGB' is going to be used when CreateOption is 'Upload'.")]
         public int DiskSizeGB { get; set; }
 
         [Parameter(
@@ -281,16 +280,6 @@ private void Run()
                 EncryptionSettingsCollection = vEncryptionSettingsCollection,
             };
 
-            // this is to hide the breaking change for upload
-            if ("upload".Equals(vDisk.CreationData?.CreateOption?.ToLowerInvariant()) && vDisk.CreationData?.UploadSizeBytes == null)
-            {
-                if (vDisk.DiskSizeGB != null)
-                {
-                    vDisk.CreationData.UploadSizeBytes = (long) vDisk.DiskSizeGB * 1073741824 + 512; // multiplying 1GB and then add the size of footer (512 bytes)
-                    vDisk.DiskSizeGB = null;
-                }
-            }
-
             WriteObject(vDisk);
         }
     }

src/Compute/Compute/Generated/Disk/DiskDeleteMethod.cs

@@ -84,7 +84,6 @@ public override void ExecuteCmdlet()
         public string DiskName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/Image/ImageDeleteMethod.cs

@@ -84,7 +84,6 @@ public override void ExecuteCmdlet()
         public string ImageName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/Models/ComputeAutoMapperProfile.cs

@@ -56,10 +56,6 @@ private static void Initialize()
         {
             var config = new MapperConfiguration(cfg =>
             {
-                // This part is for hiding the breaking change caused by the client library update.
-                cfg.CreateMap<FROM.GalleryImageVersionPublishingProfile, TO.PSGalleryImageVersionPublishingProfile>();
-                cfg.CreateMap<TO.PSGalleryImageVersionPublishingProfile, FROM.GalleryImageVersionPublishingProfile>();
-
                 cfg.CreateMap<FROM.ContainerService, TO.PSContainerServiceList>();
                 cfg.CreateMap<TO.PSContainerServiceList, TO.PSContainerService>();
                 cfg.CreateMap<TO.PSContainerService, TO.PSContainerServiceList>();
@@ -81,8 +77,7 @@ private static void Initialize()
                 cfg.CreateMap<FROM.GalleryImage, TO.PSGalleryImageList>();
                 cfg.CreateMap<TO.PSGalleryImageList, TO.PSGalleryImage>();
                 cfg.CreateMap<TO.PSGalleryImage, TO.PSGalleryImageList>();
-                cfg.CreateMap<FROM.GalleryImageVersion, TO.PSGalleryImageVersionList>()
-                    .AfterMap((src, dest) => dest.GetPublishingProfileSourceId()); // This part is for hiding the breaking change caused by the client library update.
+                cfg.CreateMap<FROM.GalleryImageVersion, TO.PSGalleryImageVersionList>();
                 cfg.CreateMap<TO.PSGalleryImageVersionList, TO.PSGalleryImageVersion>();
                 cfg.CreateMap<TO.PSGalleryImageVersion, TO.PSGalleryImageVersionList>();
                 cfg.CreateMap<FROM.Image, TO.PSImageList>();
@@ -133,8 +128,7 @@ private static void Initialize()
                 cfg.CreateMap<TO.PSGallery, FROM.Gallery>();
                 cfg.CreateMap<FROM.GalleryImage, TO.PSGalleryImage>();
                 cfg.CreateMap<TO.PSGalleryImage, FROM.GalleryImage>();
-                cfg.CreateMap<FROM.GalleryImageVersion, TO.PSGalleryImageVersion>()
-                    .AfterMap((src, dest) => dest.GetPublishingProfileSourceId()); // This part is for hiding the breaking change caused by the client library update.
+                cfg.CreateMap<FROM.GalleryImageVersion, TO.PSGalleryImageVersion>();
                 cfg.CreateMap<TO.PSGalleryImageVersion, FROM.GalleryImageVersion>();
                 cfg.CreateMap<FROM.Image, TO.PSImage>();
                 cfg.CreateMap<TO.PSImage, FROM.Image>();

src/Compute/Compute/Generated/Models/PSGalleryImageVersion.cs

@@ -40,6 +40,7 @@ public string ResourceGroupName
             }
         }
 
+        public GalleryImageVersionPublishingProfile PublishingProfile { get; set; }
         public string ProvisioningState { get; set; }
         public GalleryImageVersionStorageProfile StorageProfile { get; set; }
         public ReplicationStatus ReplicationStatus { get; set; }

src/Compute/Compute/Generated/ProximityPlacementGroup/ProximityPlacementGroupDeleteMethod.cs

@@ -98,7 +98,6 @@ public override void ExecuteCmdlet()
         public string Name { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/Snapshot/SnapshotDeleteMethod.cs

@@ -84,7 +84,6 @@ public override void ExecuteCmdlet()
         public string SnapshotName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs

@@ -115,10 +115,6 @@ public override void ExecuteCmdlet()
         public string[] InstanceId { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
-            Mandatory = false)]
-        [Parameter(
-            ParameterSetName = "FriendMethod",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs

@@ -100,7 +100,6 @@ public override void ExecuteCmdlet()
         public string[] InstanceId { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Generated/VirtualMachineScaleSetRollingUpgrade/VirtualMachineScaleSetRollingUpgradeCancelMethod.cs

@@ -84,10 +84,6 @@ public override void ExecuteCmdlet()
         public string VMScaleSetName { get; set; }
 
         [Parameter(
-            ParameterSetName = "DefaultParameter",
-            Mandatory = false)]
-        [Parameter(
-            ParameterSetName = "FriendMethod",
             Mandatory = false)]
         public SwitchParameter Force { get; set; }
 

src/Compute/Compute/Manual/PSGalleryArtifactSource.cs

@@ -20,13 +20,13 @@ Remove-AzProximityPlacementGroup [-ResourceGroupName] <String> [-Name] <String>
 
 ### ResourceIdParameter
 ```
-Remove-AzProximityPlacementGroup [-ResourceId] <String> [-AsJob] [-DefaultProfile <IAzureContextContainer>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+Remove-AzProximityPlacementGroup [-Force] [-ResourceId] <String> [-AsJob]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ObjectParameter
 ```
-Remove-AzProximityPlacementGroup [-InputObject] <PSProximityPlacementGroup> [-AsJob]
+Remove-AzProximityPlacementGroup [-Force] [-InputObject] <PSProximityPlacementGroup> [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -79,7 +79,7 @@ Forces the command to run without asking for user confirmation.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
-Parameter Sets: DefaultParameter
+Parameter Sets: (All)
 Aliases:
 
 Required: False

src/Compute/Compute/Manual/PSGalleryImageVersion.cs

@@ -12,18 +12,11 @@ Cancels the current virtual machine scale set rolling upgrade.
 
 ## SYNTAX
 
-### DefaultParameter (Default)
 ```
 Stop-AzVmssRollingUpgrade [-ResourceGroupName] <String> [-VMScaleSetName] <String> [-Force] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
-### FriendMethod
-```
-Stop-AzVmssRollingUpgrade [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
-```
-
 ## DESCRIPTION
 Cancels the current virtual machine scale set rolling upgrade.
 
@@ -88,7 +81,7 @@ The name of the resource group.
 
 ```yaml
 Type: System.String
-Parameter Sets: DefaultParameter
+Parameter Sets: (All)
 Aliases:
 
 Required: True
@@ -103,7 +96,7 @@ The name of the VM scale set.
 
 ```yaml
 Type: System.String
-Parameter Sets: DefaultParameter
+Parameter Sets: (All)
 Aliases: Name
 
 Required: True

src/Compute/Compute/Manual/PSGalleryImageVersionPublishingProfile.cs

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.1" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.19.0-preview" />