feat: environment token (#302)

konstructio · Feb 20, 2024 · 90cc38a · 90cc38a
1 parent 426d4da
commit 90cc38a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/internal/services/services.go b/internal/services/services.go
@@ -79,12 +79,14 @@ func CreateService(cl *pkgtypes.Cluster, serviceName string, appDef *pkgtypes.Gi
 	secretStoreRef := "vault-kv-secret"
 	project := "default"
 	clusterDestination := "in-cluster"
+	environment := "mgmt"
 
 	if req.WorkloadClusterName != "" {
 		clusterName = req.WorkloadClusterName
 		secretStoreRef = fmt.Sprintf("%s-vault-kv-secret", req.WorkloadClusterName)
 		project = clusterName
 		clusterDestination = clusterName
+		environment = req.Environment
 	}
 
 	registryPath := getRegistryPath(clusterName, cl.CloudProvider, req.IsTemplate)
@@ -165,7 +167,7 @@ func CreateService(cl *pkgtypes.Cluster, serviceName string, appDef *pkgtypes.Gi
 
 	if !req.IsTemplate {
 		//Create Tokens
-		gitopsKubefirstTokens := utils.CreateTokensFromDatabaseRecord(cl, registryPath, secretStoreRef, project, clusterDestination)
+		gitopsKubefirstTokens := utils.CreateTokensFromDatabaseRecord(cl, registryPath, secretStoreRef, project, clusterDestination, environment)
 
 		//Detokenize App Template
 		err = providerConfigs.DetokenizeGitGitops(catalogServiceFolder, gitopsKubefirstTokens, cl.GitProtocol, cl.CloudflareAuth.OriginCaIssuerKey != "")
@@ -227,7 +229,7 @@ func CreateService(cl *pkgtypes.Cluster, serviceName string, appDef *pkgtypes.Gi
 		return err
 	}
 
-	if excludeArgoSync {
+	if excludeArgoSync || req.IsTemplate {
 		return nil
 	}
 

diff --git a/pkg/providerConfigs/detokenize.go b/pkg/providerConfigs/detokenize.go
@@ -146,6 +146,7 @@ func detokenizeGitops(path string, tokens *GitopsDirectoryValues, gitProtocol st
 				newContents = strings.Replace(newContents, "<SECRET_STORE_REF>", tokens.SecretStoreRef, -1)
 				newContents = strings.Replace(newContents, "<PROJECT>", tokens.Project, -1)
 				newContents = strings.Replace(newContents, "<CLUSTER_DESTINATION>", tokens.ClusterDestination, -1)
+				newContents = strings.Replace(newContents, "<ENVIRONMENT>", tokens.Environment, -1)
 
 				//origin issuer defines which annotations should be on ingresses
 				if useCloudflareOriginIssuer {

diff --git a/pkg/providerConfigs/types.go b/pkg/providerConfigs/types.go
@@ -44,6 +44,7 @@ type GitopsDirectoryValues struct {
 	SecretStoreRef                 string
 	Project                        string
 	ClusterDestination             string
+	Environment                    string
 
 	AwsIamArnAccountRoot string
 	AwsKmsKeyId          string

diff --git a/pkg/types/gitopsCatalog.go b/pkg/types/gitopsCatalog.go
@@ -41,6 +41,7 @@ type GitopsCatalogAppCreateRequest struct {
 	SecretKeys          []GitopsCatalogAppKeys `bson:"secret_keys,omitempty" json:"secret_keys,omitempty"`
 	ConfigKeys          []GitopsCatalogAppKeys `bson:"config_keys,omitempty" json:"config_keys,omitempty"`
 	WorkloadClusterName string                 `bson:"workload_cluster_name" json:"workload_cluster_name"`
+	Environment         string                 `bson:"environment" json:"environment"`
 }
 
 type GitopsCatalogAppDeleteRequest struct {

diff --git a/pkg/utils/tokens.go b/pkg/utils/tokens.go
@@ -18,7 +18,7 @@ import (
 	"github.com/thanhpk/randstr"
 )
 
-func CreateTokensFromDatabaseRecord(cl *pkgtypes.Cluster, registryPath string, secretStoreRef string, project string, clusterDestination string) *providerConfigs.GitopsDirectoryValues {
+func CreateTokensFromDatabaseRecord(cl *pkgtypes.Cluster, registryPath string, secretStoreRef string, project string, clusterDestination string, environment string) *providerConfigs.GitopsDirectoryValues {
 	env, _ := env.GetEnv(constants.SilenceGetEnv)
 
 	fullDomainName := ""
@@ -93,6 +93,7 @@ func CreateTokensFromDatabaseRecord(cl *pkgtypes.Cluster, registryPath string, s
 		SecretStoreRef:                 secretStoreRef,
 		Project:                        project,
 		ClusterDestination:             clusterDestination,
+		Environment:                    environment,
 
 		GitDescription:       fmt.Sprintf("%s hosted git", cl.GitProvider),
 		GitNamespace:         "N/A",