move

Signed-off-by: Gerd Oberlechner <[email protected]>

tooling/templatize/cmd/generate/cmd_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	options "github.com/Azure/ARO-HCP/tooling/templatize/cmd"
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
 )
 
 func TestExecuteTemplate(t *testing.T) {

tooling/templatize/cmd/generate/options.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 
 	options "github.com/Azure/ARO-HCP/tooling/templatize/cmd"
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/ev2"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/ev2"
 )
 
 func DefaultGenerationOptions() *RawGenerationOptions {

tooling/templatize/cmd/options.go

@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
 )
 
 func DefaultOptions() *RawOptions {

tooling/templatize/cmd/rolloutoptions.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
 )
 
 func DefaultRolloutOptions() *RawRolloutOptions {

tooling/templatize/cmd/run/options.go

@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 
 	options "github.com/Azure/ARO-HCP/tooling/templatize/cmd"
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/pipeline"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/pipeline"
 )
 
 func DefaultOptions() *RawRunOptions {

tooling/templatize/internal/ev2/mapping_test.go → tooling/templatize/pkg/ev2/mapping_test.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
 	"gotest.tools/assert"
+
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
 )
 
 func TestMapping(t *testing.T) {

tooling/templatize/pkg/ev2/utils.go

@@ -0,0 +1,55 @@
+package ev2
+
+import (
+	"fmt"
+
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
+)
+
+func NewEv2EvaluationContext() *config.ConfigEvaluationContext {
+	return &config.ConfigEvaluationContext{
+		Region:      "$location()",
+		RegionShort: "$(regionShortName)",
+		Stamp:       "$stamp()",
+	}
+}
+
+// GetGlobalServiceConfigVariables returns all configuration variables for a cloud and deployment environment.
+// The variable values are formatted to support EV2 $location(), $stamp() and $(serviceConfigVar) variables.
+func GetServiceConfigVariables(configProvider config.ConfigProvider, cloud, deployEnv string) (config.Variables, error) {
+	return configProvider.GetVariables(cloud, deployEnv, "", NewEv2EvaluationContext())
+}
+
+// GetRegionalServiceConfigVariableOverrides returns the regional overrides for each region in a cloud and deployment
+// environment. The variable values are formatted to support EV2 $location(), $stamp() and $(serviceConfigVar) variables.
+func GetRegionalServiceConfigVariableOverrides(configProvider config.ConfigProvider, cloud, deployEnv string) (map[string]config.Variables, error) {
+	regions, err := configProvider.GetRegions(cloud, deployEnv)
+	if err != nil {
+		return nil, err
+	}
+	overrides := make(map[string]config.Variables)
+	for _, region := range regions {
+		regionOverrides, err := configProvider.GetRegionOverrides(cloud, deployEnv, region, NewEv2EvaluationContext())
+		if err != nil {
+			return nil, err
+		}
+		overrides[region] = regionOverrides
+	}
+	return overrides, nil
+}
+
+// ScopeBindingVariables retrieves and processes configuration variables for a given cloud and deployment environment.
+// It uses the provided configProvider to fetch the variables, flattens them into a __VAR__ = $config(var) formatted
+// map.
+func ScopeBindingVariables(configProvider config.ConfigProvider, cloud, deployEnv string) (map[string]string, error) {
+	vars, err := configProvider.GetVariables(cloud, deployEnv, "", NewEv2EvaluationContext())
+	if err != nil {
+		return nil, err
+	}
+	flattened, _ := EV2Mapping(vars, []string{})
+	variables := make(map[string]string)
+	for key, value := range flattened {
+		variables[key] = fmt.Sprintf("$config(%s)", value)
+	}
+	return variables, nil
+}

tooling/templatize/internal/pipeline/run.go → tooling/templatize/pkg/pipeline/run.go

@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
 	"gopkg.in/yaml.v3"
 
-	"github.com/Azure/ARO-HCP/tooling/templatize/internal/config"
+	"github.com/Azure/ARO-HCP/tooling/templatize/pkg/config"
 )
 
 func LoadPipeline(path string, vars config.Variables) (*Pipeline, error) {