[Compute] Communitygallery changes (#19121)

* gallery changes

* Changes for community gallery

* updated changelog

* help change

* get-azgalleryimageversion help

* Adding to required assemblies

* Fixing errors in PR

* fix help

* fix get-azgallery community parameter set

* bug fix

* update bug fix community gallery

* changes to community gallery permission

Co-authored-by: Yunchi Wang <[email protected]>
Co-authored-by: Yeming Liu <[email protected]>

Author: 3 people

src/Compute/Compute/Az.Compute.psd1

@@ -58,7 +58,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.9.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.Compute.dll', 
-               'Microsoft.WindowsAzure.Storage.dll', 
+               'Microsoft.WindowsAzure.Storage.dll', 'Microsoft.Azure.Management.ResourceGraph.dll',
                'Compute.Autorest\bin\Az.Compute.private.dll', 
                'Microsoft.Azure.PowerShell.Cmdlets.Compute.Helpers.dll'
 

src/Compute/Compute/ChangeLog.md

@@ -27,10 +27,11 @@
 * Improved printed output for `Get-AzComputeResourceSku`
 * Updated `Update-AzVm` to give constructive error messages when empty variables are passed in parameters. [#15081]
 * Added `Zone` and `IntentVMSizeList` optional parameters to the cmdlet `New-AzProximityPlacementGroup`.
+* Added parameters to Gallery cmdlets for Community Galleries
 * For `New-AzGalleryImageVersion`, `CVMEncryptionType` and `CVMDiskEncryptionSetID` added as keys for parameter `-Target`.
 
 ## Version 4.30.0
-* Added parameters `PackageFileName`, `ConfigFileName` for `New-AzGalleryApplicationVersion` 
+* Added parameters `PackageFileName`, `ConfigFileName` for `New-AzGalleryApplicationVersion`
 
 ## Version 4.29.0
 * Added image alias 'Win2022AzureEditionCore'

src/Compute/Compute/Compute.csproj

@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.Management.ResourceGraph" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />

src/Compute/Compute/Generated/ComputeAutomationBaseCmdlet.cs

@@ -168,6 +168,30 @@ public ISharedGalleriesOperations SharedGalleriesClient
             }
         }
 
+        public ICommunityGalleriesOperations CommunityGalleriesClient
+        {
+            get
+            {
+                return ComputeClient.ComputeManagementClient.CommunityGalleries;
+            }
+        }
+
+        public ICommunityGalleryImagesOperations CommunityGalleryImagesClient
+        {
+            get
+            {
+                return ComputeClient.ComputeManagementClient.CommunityGalleryImages;
+            }
+        }
+
+        public ICommunityGalleryImageVersionsOperations CommunityGalleryImageVersionsClient
+        {
+            get
+            {
+                return ComputeClient.ComputeManagementClient.CommunityGalleryImageVersions;
+            }
+        }
+
         public ISharedGalleryImagesOperations SharedGalleryImagesClient
         {
             get

src/Compute/Compute/Generated/Gallery/GalleryCreateOrUpdateMethod.cs

@@ -47,21 +47,52 @@ public override void ExecuteCmdlet()
                     string galleryName = this.Name;
                     Gallery gallery = new Gallery();
                     gallery.Location = this.Location;
-                    if (this.IsParameterBound(c => c.Permission)){
-                        gallery.SharingProfile = new SharingProfile();
-                        gallery.SharingProfile.Permissions = this.Permission;
-                    }
+                    CommunityGalleryInfo communityGalleryInfo = new CommunityGalleryInfo();
+
 
                     if (this.IsParameterBound(c => c.Description))
                     {
                         gallery.Description = this.Description;
                     }
 
+                    if (this.IsParameterBound(c => c.PublisherUri))
+                    {
+                        communityGalleryInfo.PublisherUri = this.PublisherUri;
+                    }
+
+                    if (this.IsParameterBound(c => c.PublisherContact))
+                    {
+                        communityGalleryInfo.PublisherContact = this.PublisherContact;
+                    }
+
+                    if (this.IsParameterBound(c => c.Eula))
+                    {
+                        communityGalleryInfo.Eula = this.Eula;
+                    }
+
+                    if (this.IsParameterBound(c => c.PublicNamePrefix))
+                    {
+                        communityGalleryInfo.PublicNamePrefix = this.PublicNamePrefix;
+                    }
+
+                    if (this.IsParameterBound(c => c.Permission))
+                    {
+                        gallery.SharingProfile = new SharingProfile();
+                        gallery.SharingProfile.Permissions = this.Permission;
+
+                        if (gallery.SharingProfile.Permissions.ToLower() == "community")
+                        {
+                            gallery.SharingProfile.CommunityGalleryInfo = communityGalleryInfo;
+                        }
+                    }
+
+
                     if (this.IsParameterBound(c => c.Tag))
                     {
                         gallery.Tags = this.Tag.Cast<DictionaryEntry>().ToDictionary(ht => (string)ht.Key, ht => (string)ht.Value);
                     }
 
+
                     var result = GalleriesClient.CreateOrUpdate(resourceGroupName, galleryName, gallery);
                     var psObject = new PSGallery();
                     ComputeAutomationAutoMapperProfile.Mapper.Map<Gallery, PSGallery>(result, psObject);
@@ -110,9 +141,34 @@ public override void ExecuteCmdlet()
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "This property allows you to specify the permission of sharing gallery. Possible values are: 'Private' and 'Groups'.")]
-        [PSArgumentCompleter("Private","Groups")]
+            HelpMessage = "This property allows you to specify the permission of sharing gallery. Possible values are: 'Private', 'Groups' and 'Community'.")]
+        [PSArgumentCompleter("Private","Groups","Community")]
         public string Permission { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets the link to the publisher website. Visible to all users.")]
+        public string PublisherUri { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets community gallery publisher support email. The email address of the publisher. Visible to all users.")]
+        public string PublisherContact { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets end-user license agreement for community gallery image.")]
+        public string Eula { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets the prefix of the gallery name that will be displayed publicly. Visible to all users.")]
+        public string PublicNamePrefix { get; set; }
+
     }
 
     [Cmdlet(VerbsData.Update, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Gallery", DefaultParameterSetName = "DefaultParameter", SupportsShouldProcess = true)]
@@ -145,6 +201,7 @@ public override void ExecuteCmdlet()
                     }
 
                     Gallery gallery = new Gallery();
+                    CommunityGalleryInfo communityGalleryInfo = new CommunityGalleryInfo();
 
                     if (this.ParameterSetName == "ObjectParameter")
                     {
@@ -160,17 +217,44 @@ public override void ExecuteCmdlet()
                         gallery.Description = this.Description;
                     }
 
+                    if (this.IsParameterBound(c => c.PublisherUri))
+                    {
+                        communityGalleryInfo.PublisherUri = this.PublisherUri;
+                    }
+
+                    if (this.IsParameterBound(c => c.PublisherContact))
+                    {
+                        communityGalleryInfo.PublisherContact = this.PublisherContact;
+                    }
+
+                    if (this.IsParameterBound(c => c.Eula))
+                    {
+                        communityGalleryInfo.Eula = this.Eula;
+                    }
+
+                    if (this.IsParameterBound(c => c.PublicNamePrefix))
+                    {
+                        communityGalleryInfo.PublicNamePrefix = this.PublicNamePrefix;
+                    }
+
                     if (this.IsParameterBound(c => c.Tag))
                     {
                         gallery.Tags = this.Tag.Cast<DictionaryEntry>().ToDictionary(ht => (string)ht.Key, ht => (string)ht.Value);
                     }
+
                     if (this.IsParameterBound(c => c.Permission))
                     {
                         if (gallery.SharingProfile == null)
                         {
                             gallery.SharingProfile = new SharingProfile();
                         }
                         gallery.SharingProfile.Permissions = this.Permission;
+
+                        if (gallery.SharingProfile.Permissions.ToLower() == "community")
+                        {
+                            gallery.SharingProfile.CommunityGalleryInfo = communityGalleryInfo;
+                        }
+
                     }
 
 
@@ -182,7 +266,7 @@ public override void ExecuteCmdlet()
                             // if sub or tenant is present return error 
                             if (this.IsParameterBound(c => c.Subscription) || this.IsParameterBound(c => c.Tenant))
                             {
-                                throw new Exception("Parameter '-Reset' cannot be used with parameters '-Tenant' or '-Subscription'.");
+                                throw new Exception("Parameter '-Reset' cannot be used with parameters '-Tenant', '-Subscription' or 'Community'.");
                             }
                             else
                             {
@@ -253,6 +337,11 @@ public override void ExecuteCmdlet()
                             sharingUpdate.Groups.Add(sharingProfile);
                             sharingUpdate.OperationType = "Remove";
                         }
+                        if (this.IsParameterBound(c => c.Community))
+                        {
+                            if(this.Community.IsPresent)
+                                sharingUpdate.OperationType = "EnableCommunity";
+                        }
 
                     }
                     else if (this.IsParameterBound(c => c.Subscription) || this.IsParameterBound(c => c.Tenant) || this.Reset.IsPresent || this.IsParameterBound(c => c.RemoveSubscription) || this.IsParameterBound(c => c.RemoveTenant))
@@ -320,8 +409,8 @@ public override void ExecuteCmdlet()
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "This property allows you to specify the permission of the sharing gallery. Possible values are: 'Private' and 'Groups'.")]
-        [PSArgumentCompleter("Private", "Groups")]
+            HelpMessage = "This property allows you to specify the permission of the sharing gallery. Possible values are: 'Private', 'Groups' and 'Community'.")]
+        [PSArgumentCompleter("Private", "Groups", "Community")]
         public string Permission { get; set; }
 
         [Parameter(
@@ -354,10 +443,40 @@ public override void ExecuteCmdlet()
             HelpMessage = "Update sharing profile of the gallery.")]
         public SwitchParameter Share { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Update sharing profile of the gallery to community.")]
+        public SwitchParameter Community { get; set; }
+
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Resets the sharing permission of the gallery to 'Private'.")]
         public SwitchParameter Reset { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets the link to the publisher website. Visible to all users.")]
+        public string PublisherUri { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets community gallery publisher support email. The email address of the publisher. Visible to all users.")]
+        public string PublisherContact { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets end-user license agreement for community gallery image.")]
+        public string Eula { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Gets or sets the prefix of the gallery name that will be displayed publicly. Visible to all users.")]
+        public string PublicNamePrefix { get; set; }
     }
 }

src/Compute/Compute/Generated/Gallery/GalleryGetMethod.cs

@@ -29,6 +29,12 @@
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using Microsoft.Azure.Management.ResourceGraph;
+using Microsoft.Azure.Management.ResourceGraph.Models;
+using Microsoft.Azure.Management.Internal.Resources;
+using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
@@ -52,6 +58,9 @@ public override void ExecuteCmdlet()
                     case "SharedGalleryParameterSet":
                         SharedGalleryGet();
                         return;
+                    case "CommunityGalleryParameterSet":
+                        CommunityGalleryGet();
+                        return;
                     default:
                         resourceGroupName = this.ResourceGroupName;
                         galleryName = this.Name;
@@ -126,7 +135,7 @@ public void SharedGalleryGet()
             }
             else
             {
-                Rest.Azure.IPage<SharedGallery> result = new Page<SharedGallery>();
+                Rest.Azure.IPage<SharedGallery> result = new Azure.Management.Compute.Models.Page<SharedGallery>();
 
                 if (this.IsParameterBound(c => c.Scope) && this.Scope != "subscription")
                 {
@@ -157,6 +166,33 @@ public void SharedGalleryGet()
             }
         }
 
+        public void CommunityGalleryGet()
+        {
+            if (this.IsParameterBound(c => c.GalleryPublicName))
+            {
+                CommunityGallery result = CommunityGalleriesClient.Get(this.Location, this.GalleryPublicName);
+                var psObject = new PSCommunityGallery();
+                ComputeAutomationAutoMapperProfile.Mapper.Map<CommunityGallery, PSCommunityGallery>(result, psObject);
+                WriteObject(psObject);
+            }
+            else
+            {
+                //find out if its ok to create client locally
+                ResourceGraphClient rgClient = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceGraphClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
+                QueryRequest request = new QueryRequest();
+                string query = "communitygalleryresources | where type == 'microsoft.compute/locations/communitygalleries' | project name, type, id, location";
+
+                request.Query = query;
+                QueryResponse response = rgClient.Resources(request);
+                Dictionary<string,string> output = new Dictionary<string, string>();
+
+                var data = JsonConvert.DeserializeObject<List<PSCommunityGallery>>(response.Data.ToString());
+                
+                WriteObject(data);
+
+            }
+        }
+
         [Parameter(
             ParameterSetName = "DefaultParameter",
             Position = 0,
@@ -187,6 +223,14 @@ public void SharedGalleryGet()
            HelpMessage = "The unique name of the Shared Image Gallery.")]
         public string GalleryUniqueName { get; set; }
 
+        [Parameter(
+           Mandatory = false,
+           ValueFromPipelineByPropertyName = true,
+           ParameterSetName = "CommunityGalleryParameterSet",
+           HelpMessage = "The public name of the Shared Image Gallery.")]
+        public string GalleryPublicName { get; set; }
+
+
         [Parameter(
            Mandatory = false,
            ValueFromPipelineByPropertyName = true,
@@ -199,7 +243,11 @@ public void SharedGalleryGet()
            Mandatory = true,
            ValueFromPipelineByPropertyName = true,
            ParameterSetName = "SharedGalleryParameterSet")]
-        [LocationCompleter("Microsoft.Compute/Galleries")]
+        [Parameter(
+           Mandatory = true,
+           ValueFromPipelineByPropertyName = true,
+           ParameterSetName = "CommunityGalleryParameterSet")]
+        [LocationCompleter("Microsoft.Compute/Galleries", "Microsoft.Compute/CommunityGalleries")]
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
@@ -210,5 +258,13 @@ public void SharedGalleryGet()
            HelpMessage = "The expand query option to apply on the operation.")]
         [PSArgumentCompleter("SharingProfile/Groups")]
         public string Expand { get; set; }
+
+        [Parameter(
+           Mandatory = true,
+           ValueFromPipelineByPropertyName = true,
+           ParameterSetName = "CommunityGalleryParameterSet",
+           HelpMessage = "List community galleries.")]
+        public SwitchParameter Community { get; set; }
+
     }
 }