Templating Update

go.mod

@@ -7,6 +7,7 @@ require (
 	cloud.google.com/go/container v1.24.0
 	cloud.google.com/go/secretmanager v1.10.0
 	cloud.google.com/go/storage v1.29.0
+	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/argoproj/argo-cd/v2 v2.6.7
 	github.com/argoproj/gitops-engine v0.7.3
 	github.com/atotto/clipboard v0.1.4
@@ -38,6 +39,7 @@ require (
 	github.com/rs/zerolog v1.29.1
 	github.com/segmentio/analytics-go v3.1.0+incompatible
 	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.4
 	github.com/swaggo/files v1.0.0
 	github.com/swaggo/gin-swagger v1.5.3
 	github.com/swaggo/swag v1.16.1
@@ -54,12 +56,20 @@ require (
 )
 
 require (
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
+	github.com/alicebob/miniredis/v2 v2.23.1 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/go-resty/resty/v2 v2.11.0 // indirect
-	github.com/go-test/deep v1.0.4 // indirect
-	github.com/hashicorp/go-hclog v1.3.0 // indirect
-	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+	github.com/go-test/deep v1.0.3 // indirect
+	github.com/huandu/xstrings v1.3.1 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gotest.tools/v3 v3.4.0 // indirect
 )
@@ -265,7 +275,7 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/apiextensions-apiserver v0.26.0 // indirect
 	k8s.io/apiserver v0.24.2 // indirect
 	k8s.io/cli-runtime v0.24.2 // indirect

internal/controller/argocd.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
-	"time"	
+	"time"
 
 	argocdapi "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	awsext "github.com/kubefirst/kubefirst-api/extensions/aws"
@@ -178,7 +178,7 @@ func (clctrl *ClusterController) DeployRegistryApplication() error {
 		if err != nil {
 			return err
 		}
-		
+
 		log.Info().Msg("applying the registry application to argocd")
 
 		registryURL, err := clctrl.GetRepoURL()
@@ -221,11 +221,11 @@ func (clctrl *ClusterController) DeployRegistryApplication() error {
 				}
 				log.Info().Msgf("Error creating Argo CD application on attempt number #%d: %v\n", attempt, err)
 				time.Sleep(5 * time.Second)
-				continue 
+				continue
 			}
 
 			log.Info().Msgf("Argo CD application created successfully on attempt #%d: %s\n", attempt, app.Name)
-			break 
+			break
 		}
 
 

internal/vultr/kubernetes.go

@@ -90,15 +90,15 @@ func (c *VultrConfiguration) DeleteBlockStorage(blockStorage []govultr.BlockStor
 	return nil
 }
 
-func (c *VultrConfiguration) GetKubeconfig(clusterName string)(string, error) {
+func (c *VultrConfiguration) GetKubeconfig(clusterName string) (string, error) {
 	clusters, _, _, err := c.Client.Kubernetes.ListClusters(c.Context, &govultr.ListOptions{})
 
 	if err != nil {
 		return "", err
 	}
 
 	var clusterId string
-	for  _, cluster := range clusters {
+	for _, cluster := range clusters {
 		if cluster.Label == clusterName {
 			clusterId = cluster.ID
 			continue
@@ -112,7 +112,7 @@ func (c *VultrConfiguration) GetKubeconfig(clusterName string)(string, error) {
 	kubeConfig, _, err := c.Client.Kubernetes.GetKubeConfig(c.Context, clusterId)
 
 	if err != nil {
-		return "", err 
+		return "", err
 	}
 
 	return kubeConfig.KubeConfig, nil

pkg/providerConfigs/adjustDriver.go

@@ -985,7 +985,7 @@ func PrepareGitRepositories(
 
 	// DETOKENIZE
 	//* detokenize the gitops repo
-	DetokenizeGitGitops(gitopsDir, gitopsTokens, gitProtocol, useCloudflareOriginIssuer)
+	err = Detokenize(gitopsDir, gitopsTokens, gitProtocol, useCloudflareOriginIssuer)
 	if err != nil {
 		return err
 	}
@@ -999,7 +999,7 @@ func PrepareGitRepositories(
 
 	// DETOKENIZE
 	//* detokenize the metaphor repo
-	DetokenizeGitMetaphor(metaphorDir, metaphorTokens)
+	err = Detokenize(metaphorDir, metaphorTokens, gitProtocol, useCloudflareOriginIssuer)
 	if err != nil {
 		return err
 	}

pkg/providerConfigs/config.go

@@ -8,9 +8,8 @@ package providerConfigs
 
 import (
 	"fmt"
-	"os"
-
 	"github.com/rs/zerolog/log"
+	"os"
 )
 
 type ProviderConfig struct {
@@ -27,35 +26,32 @@ type ProviderConfig struct {
 	VultrToken                       string
 	CloudflareAPIToken               string
 	CloudflareOriginCaIssuerAPIToken string
-
-	GithubToken string
-	GitlabToken string
-
-	ArgoWorkflowsDir                string
-	DestinationGitopsRepoHttpsURL   string
-	DestinationGitopsRepoGitURL     string
-	DestinationGitopsRepoURL        string
-	DestinationMetaphorRepoHttpsURL string
-	DestinationMetaphorRepoGitURL   string
-	DestinationMetaphorRepoURL      string
-	GitopsDir                       string
-	GitProvider                     string
-	GitProtocol                     string
-	K1Dir                           string
-	Kubeconfig                      string
-	KubectlClient                   string
-	KubefirstBotSSHPrivateKey       string
-	KubefirstConfig                 string
-	LogsDir                         string
-	MetaphorDir                     string
-	RegistryAppName                 string
-	RegistryYaml                    string
-	SSLBackupDir                    string
-	TerraformClient                 string
-	ToolsDir                        string
-
-	GitopsDirectoryValues   *GitopsDirectoryValues
-	MetaphorDirectoryValues *MetaphorTokenValues
+	GithubToken                      string
+	GitlabToken                      string
+	ArgoWorkflowsDir                 string
+	DestinationGitopsRepoHttpsURL    string
+	DestinationGitopsRepoGitURL      string
+	DestinationGitopsRepoURL         string
+	DestinationMetaphorRepoHttpsURL  string
+	DestinationMetaphorRepoGitURL    string
+	DestinationMetaphorRepoURL       string
+	GitopsDir                        string
+	GitProvider                      string
+	GitProtocol                      string
+	K1Dir                            string
+	Kubeconfig                       string
+	KubectlClient                    string
+	KubefirstBotSSHPrivateKey        string
+	KubefirstConfig                  string
+	LogsDir                          string
+	MetaphorDir                      string
+	RegistryAppName                  string
+	RegistryYaml                     string
+	SSLBackupDir                     string
+	TerraformClient                  string
+	ToolsDir                         string
+	GitopsDirectoryValues            *GitopsDirectoryValues
+	MetaphorDirectoryValues          *MetaphorTokenValues
 }
 
 // GetConfig - load default values from kubefirst installer
@@ -69,12 +65,10 @@ func GetConfig(
 	cloudflareOriginCaIssuerAPIToken string,
 ) *ProviderConfig {
 	config := ProviderConfig{}
-
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		log.Fatal().Msgf("something went wrong getting home path: %s", err)
 	}
-
 	// cGitHost describes which git host to use depending on gitProvider
 	var cGitHost string
 	switch gitProvider {
@@ -83,7 +77,6 @@ func GetConfig(
 	case "gitlab":
 		cGitHost = GitlabHost
 	}
-
 	config.DestinationGitopsRepoURL = fmt.Sprintf("https://%s/%s/gitops.git", cGitHost, gitOwner)
 	config.DestinationGitopsRepoGitURL = fmt.Sprintf("git@%s:%s/gitops.git", cGitHost, gitOwner)
 	config.DestinationMetaphorRepoURL = fmt.Sprintf("https://%s/%s/metaphor.git", cGitHost, gitOwner)
@@ -105,6 +98,5 @@ func GetConfig(
 	config.SSLBackupDir = fmt.Sprintf("%s/.k1/%s/ssl/%s", homeDir, clusterName, domainName)
 	config.TerraformClient = fmt.Sprintf("%s/.k1/%s/tools/terraform", homeDir, clusterName)
 	config.ToolsDir = fmt.Sprintf("%s/.k1/%s/tools", homeDir, clusterName)
-
 	return &config
 }

pkg/providerConfigs/constants.go

@@ -19,8 +19,11 @@ const (
 	LocalhostOS            = runtime.GOOS
 	LocalhostArch          = runtime.GOARCH
 	TerraformClientVersion = "1.3.8"
-	ArgocdHelmChartVersion = "4.10.5"
 
 	ArgocdPortForwardURL = runtimepkg.ArgocdPortForwardURL
 	VaultPortForwardURL  = runtimepkg.VaultPortForwardURL
+
+	TokenRegexPattern = "<([A-Z_0-9-]+)>"
+	leftDelimiter     = "${k1"
+	rightDelimiter    = "}"
 )