refactoring azure client options

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

config/opts.go

@@ -36,14 +36,18 @@ type (
 			SummaryMaxAge *time.Duration `long:"stats.summary.maxage"         env:"STATS_SUMMARY_MAX_AGE"             description:"Stats Summary metrics max age (time.duration)"`
 		}
 
+		// azure settings
+		Azure struct {
+			TenantId     string `long:"azure.tenant-id"               env:"AZURE_TENANT_ID"                description:"Azure tenant ID for Service Principal authentication"`
+			ClientId     string `long:"azure.client-id"               env:"AZURE_CLIENT_ID"                description:"Client ID for Service Principal authentication"`
+			ClientSecret string `long:"azure.client-secret"           env:"AZURE_CLIENT_SECRET"            description:"Client secret for Service Principal authentication" json:"-"`
+		}
+
 		// azure settings
 		AzureDevops struct {
 			Url             *string `long:"azuredevops.url"                     env:"AZURE_DEVOPS_URL"               description:"Azure DevOps URL (empty if hosted by Microsoft)"`
 			AccessToken     string  `long:"azuredevops.access-token"            env:"AZURE_DEVOPS_ACCESS_TOKEN"      description:"Azure DevOps access token" json:"-"`
 			AccessTokenFile *string `long:"azuredevops.access-token-file"       env:"AZURE_DEVOPS_ACCESS_TOKEN_FILE" description:"Azure DevOps access token (from file)"`
-			TenantId        string  `long:"azuredevops.tenant-id"               env:"AZURE_TENANT_ID"                description:"Azure tenant ID for Service Principal authentication" json:"-"`
-			ClientId        string  `long:"azuredevops.client-id"               env:"AZURE_CLIENT_ID"                description:"Client ID for Service Principal authentication" json:"-"`
-			ClientSecret    string  `long:"azuredevops.client-secret"           env:"AZURE_CLIENT_SECRET"            description:"Client secret for Service Principal authentication" json:"-"`
 			Organisation    string  `long:"azuredevops.organisation"            env:"AZURE_DEVOPS_ORGANISATION"      description:"Azure DevOps organization" required:"true"`
 			ApiVersion      string  `long:"azuredevops.apiversion"              env:"AZURE_DEVOPS_APIVERSION"        description:"Azure DevOps API version"  default:"5.1"`
 

main.go

@@ -82,7 +82,7 @@ func initArgparser() {
 		}
 	}
 
-	if len(opts.AzureDevops.AccessToken) == 0 && (len(opts.AzureDevops.TenantId) == 0 || len(opts.AzureDevops.ClientId) == 0) {
+	if len(opts.AzureDevops.AccessToken) == 0 && (len(opts.Azure.TenantId) == 0 || len(opts.Azure.ClientId) == 0) {
 		logger.Fatalf("neither an Azure DevOps PAT token nor client credentials (tenant ID, client ID) for service principal authentication have been provided")
 	}
 
@@ -158,20 +158,21 @@ func initAzureDevOpsConnection() {
 	logger.Infof("using concurrency: %v", opts.Request.ConcurrencyLimit)
 	logger.Infof("using retries: %v", opts.Request.Retries)
 
-	if opts.AzureDevops.TenantId != "" {
-		if err := os.Setenv("AZURE_TENANT_ID", opts.AzureDevops.TenantId); err != nil {
+	// ensure AZURE env vars are populated for azidentity
+	if opts.Azure.TenantId != "" {
+		if err := os.Setenv("AZURE_TENANT_ID", opts.Azure.TenantId); err != nil {
 			panic(err)
 		}
 	}
 
-	if opts.AzureDevops.ClientId != "" {
-		if err := os.Setenv("AZURE_CLIENT_ID", opts.AzureDevops.ClientId); err != nil {
+	if opts.Azure.ClientId != "" {
+		if err := os.Setenv("AZURE_CLIENT_ID", opts.Azure.ClientId); err != nil {
 			panic(err)
 		}
 	}
 
-	if opts.AzureDevops.ClientSecret != "" {
-		if err := os.Setenv("AZURE_CLIENT_SECRET", opts.AzureDevops.ClientSecret); err != nil {
+	if opts.Azure.ClientSecret != "" {
+		if err := os.Setenv("AZURE_CLIENT_SECRET", opts.Azure.ClientSecret); err != nil {
 			panic(err)
 		}
 	}