Move subscription id lookup into pipelinerunoptions

tooling/templatize/cmd/pipeline/run/options.go

@@ -97,9 +97,10 @@ func (o *RunOptions) RunPipeline(ctx context.Context) error {
 		return err
 	}
 	return o.PipelineOptions.Pipeline.Run(ctx, &pipeline.PipelineRunOptions{
-		DryRun: o.DryRun,
-		Vars:   variables,
-		Region: rolloutOptions.Region,
-		Step:   o.PipelineOptions.Step,
+		DryRun:                o.DryRun,
+		Vars:                  variables,
+		Region:                rolloutOptions.Region,
+		Step:                  o.PipelineOptions.Step,
+		SubsciptionLookupFunc: pipeline.LookupSubscriptionID,
 	})
 }

tooling/templatize/pkg/aks/kubeconfig_test.go

@@ -0,0 +1,31 @@
+package aks
+
+import (
+	"context"
+	"os"
+	"os/exec"
+	"testing"
+
+	"gotest.tools/assert"
+)
+
+func TestKubeConfig(t *testing.T) {
+	if os.Getenv("SVC_SUBSCRIPTION") == "" || os.Getenv("SVC_RG") == "" {
+		t.Skip("SVC_SUBSCRIPTION and SVC_RG are required for this test")
+	}
+
+	subscription := os.Getenv("SVC_SUBSCRIPTION")
+	rg := os.Getenv("SVC_RG")
+
+	config, err := GetKubeConfig(context.Background(), subscription, rg, "aks")
+
+	assert.NilError(t, err)
+	assert.Assert(t, config != "")
+
+	command := "kubectl"
+	cmd := exec.Command(command, "get", "pods")
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+config)
+	output, err := cmd.CombinedOutput()
+	assert.NilError(t, err)
+	assert.Assert(t, len(output) > 0)
+}

tooling/templatize/pkg/pipeline/executiontarget.go

@@ -10,7 +10,7 @@ import (
 	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/aks"
 )
 
-func lookupSubscriptionID(ctx context.Context, subscriptionName string) (string, error) {
+func LookupSubscriptionID(ctx context.Context, subscriptionName string) (string, error) {
 	// Create a new Azure identity client
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {

tooling/templatize/pkg/pipeline/run.go

@@ -39,19 +39,16 @@ func NewPipelineFromFile(pipelineFilePath string, vars config.Variables) (*Pipel
 }
 
 type PipelineRunOptions struct {
-	DryRun bool
-	Step   string
-	Region string
-	Vars   config.Variables
+	DryRun                bool
+	Step                  string
+	Region                string
+	Vars                  config.Variables
+	SubsciptionLookupFunc subsciptionLookup
 }
 
 func (p *Pipeline) Run(ctx context.Context, options *PipelineRunOptions) error {
 	logger := logr.FromContextOrDiscard(ctx)
 
-	if p.subsciptionLookupFunc == nil {
-		p.subsciptionLookupFunc = lookupSubscriptionID
-	}
-
 	// set working directory to the pipeline file directory for the
 	// duration of the execution so that all commands and file references
 	// within the pipeline file are resolved relative to the pipeline file
@@ -75,7 +72,7 @@ func (p *Pipeline) Run(ctx context.Context, options *PipelineRunOptions) error {
 
 	for _, rg := range p.ResourceGroups {
 		// prepare execution context
-		subscriptionID, err := p.subsciptionLookupFunc(ctx, rg.Subscription)
+		subscriptionID, err := options.SubsciptionLookupFunc(ctx, rg.Subscription)
 		if err != nil {
 			return fmt.Errorf("failed to lookup subscription ID for %q: %w", rg.Subscription, err)
 		}

tooling/templatize/pkg/pipeline/run_test.go

@@ -174,12 +174,13 @@ func TestPipelineRun(t *testing.T) {
 				},
 			},
 		},
-		subsciptionLookupFunc: func(_ context.Context, _ string) (string, error) {
-			return "test", nil
-		},
 	}
 
-	err := pipeline.Run(context.Background(), &PipelineRunOptions{})
+	err := pipeline.Run(context.Background(), &PipelineRunOptions{
+		SubsciptionLookupFunc: func(_ context.Context, _ string) (string, error) {
+			return "test", nil
+		},
+	})
 
 	assert.NilError(t, err)
 	assert.Equal(t, foundOutput, "hello\n")

tooling/templatize/pkg/pipeline/types.go

@@ -5,11 +5,10 @@ import "context"
 type subsciptionLookup func(context.Context, string) (string, error)
 
 type Pipeline struct {
-	pipelineFilePath      string
-	ServiceGroup          string           `yaml:"serviceGroup"`
-	RolloutName           string           `yaml:"rolloutName"`
-	ResourceGroups        []*ResourceGroup `yaml:"resourceGroups"`
-	subsciptionLookupFunc subsciptionLookup
+	pipelineFilePath string
+	ServiceGroup     string           `yaml:"serviceGroup"`
+	RolloutName      string           `yaml:"rolloutName"`
+	ResourceGroups   []*ResourceGroup `yaml:"resourceGroups"`
 }
 
 type ResourceGroup struct {