AVD configurable groups (#79)

* AVD configurable groups * Refactoring * fix * fix * whitespace * fix
osstotalsoft · Nov 27, 2023 · bf0cfe2 · bf0cfe2
1 parent 18bd910
commit bf0cfe2
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 0 deletions.
diff --git a/helm/crds/provisioning.totalsoft.ro_azurevirtualdesktops.yaml b/helm/crds/provisioning.totalsoft.ro_azurevirtualdesktops.yaml
@@ -138,6 +138,17 @@ spec:
                   - domain
                   type: object
                 type: array
+              groups:
+                properties:
+                  admins:
+                    items:
+                      type: string
+                    type: array
+                  applicationUsers:
+                    items:
+                      type: string
+                    type: array
+                type: object
               hostPoolName:
                 description: Virtual Desktop name prefix. Will have platform and tenant
                   suffix.

diff --git a/internal/controllers/provisioning/provisioners/pulumi/azure_virtual_desktop.go b/internal/controllers/provisioning/provisioners/pulumi/azure_virtual_desktop.go
@@ -432,6 +432,22 @@ func azureVirtualDesktopDeployFunc(target provisioning.ProvisioningTarget, resou
 					return err
 				}
 			}
+			for _, childAppsUserGroupName := range avd.Spec.Groups.ApplicationUsers {
+				childAppsUserGroup, err := azuread.LookupGroup(ctx, &azuread.LookupGroupArgs{
+					DisplayName: pulumi.StringRef(childAppsUserGroupName),
+				}, nil)
+				if err != nil {
+					return err
+				}
+
+				_, err = azuread.NewGroupMember(ctx, fmt.Sprintf("%s-app-user-group-%s", childAppsUserGroupName, avd.Spec.HostPoolName), &azuread.GroupMemberArgs{
+					GroupObjectId:  appsUserGroup.ID(),
+					MemberObjectId: pulumi.String(childAppsUserGroup.Id),
+				}, pulumi.Parent(appsUserGroup))
+				if err != nil {
+					return err
+				}
+			}
 
 			adminUserGroup, err := azuread.NewGroup(ctx, fmt.Sprintf("%s-admin", hostPoolName), &azuread.GroupArgs{
 				DisplayName: pulumi.String(fmt.Sprintf("%s-%s-admin", globalQalifier, hostPoolName)),
@@ -461,6 +477,24 @@ func azureVirtualDesktopDeployFunc(target provisioning.ProvisioningTarget, resou
 				}
 			}
 
+			for _, childAdminUserGroupName := range avd.Spec.Groups.Admins {
+				childAdminUserGroup, err := azuread.LookupGroup(ctx, &azuread.LookupGroupArgs{
+					DisplayName: pulumi.StringRef(childAdminUserGroupName),
+				}, nil)
+
+				if err != nil {
+					return err
+				}
+
+				_, err = azuread.NewGroupMember(ctx, fmt.Sprintf("%s-admin-group-%s", childAdminUserGroupName, avd.Spec.HostPoolName), &azuread.GroupMemberArgs{
+					GroupObjectId:  adminUserGroup.ID(),
+					MemberObjectId: pulumi.String(childAdminUserGroup.Id),
+				}, pulumi.Parent(adminUserGroup))
+				if err != nil {
+					return err
+				}
+			}
+
 			avdComponent.HostPool, err = desktopvirtualization.NewHostPool(ctx, hostPoolName, &desktopvirtualization.HostPoolArgs{
 				//HostPoolName:                  pulumi.String(hostPoolName),
 				HostPoolType:                  pulumi.String(desktopvirtualization.HostPoolTypePooled),

diff --git a/pkg/apis/provisioning/v1alpha1/azureVirtualDesktopTypes.go b/pkg/apis/provisioning/v1alpha1/azureVirtualDesktopTypes.go
@@ -61,6 +61,9 @@ type AzureVirtualDesktopSpec struct {
 	// +optional
 	Users AzureVirtualDesktopUsersSpec `json:"users"`
 
+	// +optional
+	Groups AzureVirtualDesktopGroupsSpec `json:"groups"`
+
 	// +optional
 	Exports []AzureVirtualDesktopExportsSpec `json:"exports,omitempty"`
 
@@ -89,6 +92,13 @@ type AzureVirtualDesktopUsersSpec struct {
 	ApplicationUsers []string `json:"applicationUsers,omitempty"`
 }
 
+type AzureVirtualDesktopGroupsSpec struct {
+	// +optional
+	Admins []string `json:"admins,omitempty"`
+	// +optional
+	ApplicationUsers []string `json:"applicationUsers,omitempty"`
+}
+
 type AzureVirtualDesktopApplication struct {
 	Name         string `json:"name"`
 	FriendlyName string `json:"friendlyName"`

diff --git a/pkg/apis/provisioning/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/provisioning/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/generated/applyconfiguration/provisioning/v1alpha1/azurevirtualdesktopgroupsspec.go b/pkg/generated/applyconfiguration/provisioning/v1alpha1/azurevirtualdesktopgroupsspec.go
diff --git a/pkg/generated/applyconfiguration/provisioning/v1alpha1/azurevirtualdesktopspec.go b/pkg/generated/applyconfiguration/provisioning/v1alpha1/azurevirtualdesktopspec.go
diff --git a/pkg/generated/applyconfiguration/utils.go b/pkg/generated/applyconfiguration/utils.go