Support for Administrative Units

internal/cmd/test-cleanup/administrativeunits.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/manicminer/hamilton/msgraph"
+	"github.com/manicminer/hamilton/odata"
+)
+
+func cleanupAdministrativeUnits() {
+	administrativeUnitsClient := msgraph.NewAdministrativeUnitsClient(tenantId)
+	administrativeUnitsClient.BaseClient.Authorizer = authorizer
+
+	administrativeUnits, _, err := administrativeUnitsClient.List(ctx, odata.Query{Filter: fmt.Sprintf("startsWith(displayName, '%s')", displayNamePrefix)})
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	if administrativeUnits == nil {
+		log.Println("bad API response, nil administrativeUnits result received")
+		return
+	}
+	for _, au := range *administrativeUnits {
+		if au.ID == nil || au.DisplayName == nil {
+			log.Println("Group returned with nil ID or DisplayName")
+			continue
+		}
+
+		log.Printf("Deleting administrative unit %q (DisplayName: %q)\n", *au.ID, *au.DisplayName)
+		_, err := administrativeUnitsClient.Delete(ctx, *au.ID)
+		if err != nil {
+			log.Printf("Error when deleting administrative group %q: %v\n", *au.ID, err)
+		}
+	}
+}

internal/cmd/test-cleanup/main.go

@@ -50,6 +50,7 @@ func init() {
 
 func main() {
 	log.Println("Starting test cleanup...")
+	cleanupAdministrativeUnits()
 	cleanupConditionalAccessPolicies()
 	cleanupNamedLocations()
 	cleanupServicePrincipals()

internal/test/testing.go

@@ -91,6 +91,7 @@ type Test struct {
 	AccessPackageResourceClient               *msgraph.AccessPackageResourceClient
 	AccessPackageResourceRequestClient        *msgraph.AccessPackageResourceRequestClient
 	AccessPackageResourceRoleScopeClient      *msgraph.AccessPackageResourceRoleScopeClient
+	AdministrativeUnitsClient                 *msgraph.AdministrativeUnitsClient
 	ApplicationTemplatesClient                *msgraph.ApplicationTemplatesClient
 	ApplicationsClient                        *msgraph.ApplicationsClient
 	AppRoleAssignedToClient                   *msgraph.AppRoleAssignedToClient
@@ -179,6 +180,11 @@ func NewTest(t *testing.T) (c *Test) {
 	c.AccessPackageResourceRoleScopeClient.BaseClient.Endpoint = c.Connection.AuthConfig.Environment.MsGraph.Endpoint
 	c.AccessPackageResourceRoleScopeClient.BaseClient.RetryableClient.RetryMax = retry
 
+	c.AdministrativeUnitsClient = msgraph.NewAdministrativeUnitsClient(c.Connection.AuthConfig.TenantID)
+	c.AdministrativeUnitsClient.BaseClient.Authorizer = c.Connection.Authorizer
+	c.AdministrativeUnitsClient.BaseClient.Endpoint = c.Connection.AuthConfig.Environment.MsGraph.Endpoint
+	c.AdministrativeUnitsClient.BaseClient.RetryableClient.RetryMax = retry
+
 	c.ApplicationTemplatesClient = msgraph.NewApplicationTemplatesClient(c.Connection.AuthConfig.TenantID)
 	c.ApplicationTemplatesClient.BaseClient.Authorizer = c.Connection.Authorizer
 	c.ApplicationTemplatesClient.BaseClient.Endpoint = c.Connection.AuthConfig.Environment.MsGraph.Endpoint