fix: gcp empty secret handling (#51)

flanksource · Nov 18, 2024 · 28d2122 · 28d2122
1 parent cb0e181
commit 28d2122
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/pkg/secrets/gcp.go b/pkg/secrets/gcp.go
@@ -4,5 +4,5 @@ type GCPSealedSecret struct{}
 
 func (s GCPSealedSecret) GenerateSealedSecret(params SealedSecretParams) ([]byte, error) {
 	// We setup SQLUser and database via CRDs
-	return nil, nil
+	return []byte(""), nil
 }
diff --git a/pkg/tenant/resources.go b/pkg/tenant/resources.go
@@ -32,6 +32,7 @@ spec:
   values:
     domain: {{.host}}
     tenantSlug: {{.slug}}
+    cloud: {{.cloud}}
     vcluster:
       syncer:
         extraArgs:
@@ -68,6 +69,7 @@ func GetTenantResources(tenant v1.Tenant, sealedSecret string) (obj []*unstructu
 		"jwksURL": v1.GlobalConfig.Clerk.JWKSURL,
 		"id":      tenant.ID,
 		"orgID":   tenant.OrgID,
+		"cloud":   tenant.Cloud,
 	}
 	helmReleaseRaw, err := utils.Template(HELM_RELEASE_TEMPLATE, vars)
 	if err != nil {

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -37,6 +37,9 @@ func RandomString(length uint) string {
 func GetUnstructuredObjects(data ...string) ([]*unstructured.Unstructured, error) {
 	var items []*unstructured.Unstructured
 	for _, d := range data {
+		if d == "" {
+			continue
+		}
 		decoder := yamlutil.NewYAMLOrJSONDecoder(bytes.NewReader([]byte(d)), 1024)
 		var resource *unstructured.Unstructured