fix: fixes 216 (again) (#220)

Author: matt-FFFFFF

cmd/alzlibtool/command/check/library.go

@@ -10,6 +10,8 @@ import (
 	"github.com/Azure/alzlib/internal/auth"
 	"github.com/Azure/alzlib/internal/tools/checker"
 	"github.com/Azure/alzlib/internal/tools/checks"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armpolicy"
 	"github.com/spf13/cobra"
 )
@@ -27,7 +29,11 @@ var libraryCmd = cobra.Command{
 			cmd.PrintErrf("%s could not get Azure credential: %v\n", cmd.ErrPrefix(), err)
 			os.Exit(1)
 		}
-		cf, err := armpolicy.NewClientFactory("", creds, nil)
+		cf, err := armpolicy.NewClientFactory("", creds, &arm.ClientOptions{
+			ClientOptions: policy.ClientOptions{
+				Cloud: auth.GetCloudFromEnv(),
+			},
+		})
 		if err != nil {
 			cmd.PrintErrf("%s could not create Azure policy client factory: %v\n", cmd.ErrPrefix(), err)
 			os.Exit(1)

cmd/alzlibtool/command/generate/architecture.go

@@ -12,6 +12,8 @@ import (
 	"github.com/Azure/alzlib"
 	"github.com/Azure/alzlib/deployment"
 	"github.com/Azure/alzlib/internal/auth"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armpolicy"
 	"github.com/spf13/cobra"
 )
@@ -28,8 +30,8 @@ var generateArchitectureBaseCmd = cobra.Command{
 		`This enables deployment with a tool of your choosing.`,
 	Args: cobra.ExactArgs(RequiredArchitectureArgs),
 	Run: func(cmd *cobra.Command, args []string) {
-		thislib := alzlib.NewCustomLibraryReference(args[0])
-		alllibs, err := thislib.FetchWithDependencies(cmd.Context())
+		thisLib := alzlib.NewCustomLibraryReference(args[0])
+		allLibs, err := thisLib.FetchWithDependencies(cmd.Context())
 		if err != nil {
 			cmd.PrintErrf(
 				"%s could not fetch all libraries with dependencies: %v\n",
@@ -39,18 +41,22 @@ var generateArchitectureBaseCmd = cobra.Command{
 			os.Exit(1)
 		}
 		az := alzlib.NewAlzLib(nil)
-		cred, err := auth.NewToken()
+		creds, err := auth.NewToken()
 		if err != nil {
 			cmd.PrintErrf("%s could not get Azure credential: %v\n", cmd.ErrPrefix(), err)
 			os.Exit(1)
 		}
-		cf, err := armpolicy.NewClientFactory("", cred, nil)
+		cf, err := armpolicy.NewClientFactory("", creds, &arm.ClientOptions{
+			ClientOptions: policy.ClientOptions{
+				Cloud: auth.GetCloudFromEnv(),
+			},
+		})
 		if err != nil {
 			cmd.PrintErrf("%s could not add client to alzlib: %v\n", cmd.ErrPrefix(), err)
 			os.Exit(1)
 		}
 		az.AddPolicyClient(cf)
-		if err := az.Init(cmd.Context(), alllibs...); err != nil {
+		if err := az.Init(cmd.Context(), allLibs...); err != nil {
 			cmd.PrintErrf("%s could not initialize alzlib: %v\n", cmd.ErrPrefix(), err)
 			os.Exit(1)
 		}

internal/auth/auth.go

@@ -19,9 +19,10 @@ var environmentToCloud = map[string]cloud.Configuration{
 	"china":        cloud.AzureChina,
 }
 
-// NewToken creates a new Entra token credential.
-// It uses well-known Terraform ARM environment variables to configure the token acquisition.
-func NewToken() (azcore.TokenCredential, error) {
+// GetCloudFromEnv retrieves the Azure cloud configuration based on environment variables.
+// It checks the ARM_ENVIRONMENT and AZURE_ENVIRONMENT variables to determine the appropriate cloud.
+// If neither variable is set or recognized, it defaults to AzurePublic.
+func GetCloudFromEnv() cloud.Configuration {
 	cld := cloud.AzurePublic
 
 	if env := getFirstSetEnvVar("ARM_ENVIRONMENT", "AZURE_ENVIRONMENT"); env != "" {
@@ -30,10 +31,16 @@ func NewToken() (azcore.TokenCredential, error) {
 		}
 	}
 
+	return cld
+}
+
+// NewToken creates a new Entra token credential.
+// It uses well-known Terraform ARM environment variables to configure the token acquisition.
+func NewToken() (azcore.TokenCredential, error) {
 	opts := aztfauth.Option{
 		UseAzureCLI: true,
 		ClientOptions: azcore.ClientOptions{
-			Cloud: cld,
+			Cloud: GetCloudFromEnv(),
 		},
 	}