🐌 cache json templates

🐌 cache json templates

cyclops-ctrl/internal/template/cache/inmemory.go

@@ -1,11 +1,11 @@
 package cache
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
 	"github.com/dgraph-io/ristretto"
+	json "github.com/json-iterator/go"
 
 	"github.com/cyclops-ui/cycops-ctrl/internal/models"
 )
@@ -35,12 +35,17 @@ func (t Templates) GetTemplate(repo, path, version string) (*models.Template, bo
 		return nil, false
 	}
 
-	template, ok := value.(models.Template)
+	data, ok := value.([]byte)
 	if !ok {
 		return nil, false
 	}
 
-	return &template, ok
+	var template *models.Template
+	if err := json.Unmarshal(data, &template); err != nil {
+		return nil, false
+	}
+
+	return template, ok
 }
 
 func (t Templates) SetTemplate(repo, path, version string, template *models.Template) {
@@ -49,7 +54,7 @@ func (t Templates) SetTemplate(repo, path, version string, template *models.Temp
 		return
 	}
 
-	t.cache.SetWithTTL(templateKey(repo, path, version), *template, int64(len(data)), time.Minute*15)
+	t.cache.SetWithTTL(templateKey(repo, path, version), data, int64(len(data)), time.Minute*15)
 	t.cache.Wait()
 }
 
@@ -68,7 +73,12 @@ func (t Templates) GetTemplateInitialValues(repo, path, version string) (map[int
 }
 
 func (t Templates) SetTemplateInitialValues(repo, path, version string, values map[interface{}]interface{}) {
-	t.cache.SetWithTTL(initialValuesKey(repo, path, version), values, int64(len(values)), time.Minute*15)
+	data, err := json.Marshal(values)
+	if err != nil {
+		return
+	}
+
+	t.cache.SetWithTTL(initialValuesKey(repo, path, version), values, int64(len(data)), time.Minute*15)
 	t.cache.Wait()
 }
 

cyclops-ctrl/internal/template/git.go

@@ -5,6 +5,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/pkg/errors"
+	"gopkg.in/yaml.v2"
 	"io"
 	path2 "path"
 	"path/filepath"
@@ -17,8 +19,6 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/go-git/go-git/v5/storage/memory"
-	"github.com/pkg/errors"
-	"gopkg.in/yaml.v2"
 	"helm.sh/helm/v3/pkg/chart"
 
 	"github.com/cyclops-ui/cycops-ctrl/internal/auth"

install/cyclops-install.yaml

@@ -384,7 +384,7 @@ spec:
     spec:
       containers:
         - name: cyclops-ui
-          image: cyclopsui/cyclops-ui:v0.3.1
+          image: cyclopsui/cyclops-ui:v0.3.2-rc.3
           ports:
             - containerPort: 80
           env:
@@ -430,7 +430,7 @@ spec:
       serviceAccountName: cyclops-ctrl
       containers:
         - name: cyclops-ctrl
-          image: cyclopsui/cyclops-ctrl:v0.3.1
+          image: cyclopsui/cyclops-ctrl:v0.3.2-rc.3
           ports:
             - containerPort: 8080
           env: