From 210bbe9dbd91021d16e676be33f4926864cd59e3 Mon Sep 17 00:00:00 2001 From: Benjamin Borbe Date: Wed, 2 May 2018 14:59:18 +0200 Subject: [PATCH 1/4] Fix multiline teamvault expressions --- CHANGELOG.md | 4 ++++ k8s/file/file_provider.go | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28e81b7..f5fe159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Please choose versions by [Semantic Versioning](http://semver.org/). * MINOR version when you add functionality in a backwards-compatible manner, and * PATCH version when you make backwards-compatible bug fixes. +## 1.1.6 + +- Fix multiline teamvault expressions + ## 1.1.5 - Prevent parallel sync diff --git a/k8s/file/file_provider.go b/k8s/file/file_provider.go index 4b496a2..dc97965 100644 --- a/k8s/file/file_provider.go +++ b/k8s/file/file_provider.go @@ -61,20 +61,20 @@ func (p *provider) GetObjects(namespace k8s.Namespace) ([]k8s_runtime.Object, er return fmt.Errorf("read file %s failed: %v", path, err) } - content, err = p.parser.Parse(content) + content, err = yaml.YAMLToJSON(content) if err != nil { - return fmt.Errorf("parse content of file %s failed: %v", path, err) + return fmt.Errorf("convert yaml to json for file %s failed: %v", path, err) } if glog.V(6) { - glog.Infof("yaml %s", content) + glog.Infof("json %s", content) } - content, err = yaml.YAMLToJSON(content) + content, err = p.parser.Parse(content) if err != nil { - return fmt.Errorf("convert yaml to json for file %s failed: %v", path, err) + return fmt.Errorf("parse content of file %s failed: %v", path, err) } if glog.V(6) { - glog.Infof("json %s", content) + glog.Infof("yaml %s", content) } obj, err := kind(content) From 49973f22f249195a08c8656cbc88106df7f877e0 Mon Sep 17 00:00:00 2001 From: Benjamin Borbe Date: Wed, 2 May 2018 22:00:07 +0200 Subject: [PATCH 2/4] fmt --- hook/handler.go | 1 - 1 file changed, 1 deletion(-) diff --git a/hook/handler.go b/hook/handler.go index 0d51b21..2edbef7 100644 --- a/hook/handler.go +++ b/hook/handler.go @@ -35,7 +35,6 @@ func (h *handler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { glog.Warningf("sync changes failed: %v", err) } glog.V(1).Info("sync changes completed successful") - }() fmt.Fprintln(resp, "sync triggerd") default: From 0993693273c30825de86f7a497b7b753d59af589 Mon Sep 17 00:00:00 2001 From: Benjamin Borbe Date: Wed, 2 May 2018 22:01:29 +0200 Subject: [PATCH 3/4] add logging --- k8s/file/file_provider.go | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/k8s/file/file_provider.go b/k8s/file/file_provider.go index 72d487f..6a7ba19 100644 --- a/k8s/file/file_provider.go +++ b/k8s/file/file_provider.go @@ -56,34 +56,46 @@ func (p *provider) GetObjects(namespace k8s.Namespace) ([]k8s_runtime.Object, er glog.V(3).Infof("skip directory: %s", path) return nil } - content, err := ioutil.ReadFile(path) + yamlTemplate, err := ioutil.ReadFile(path) if err != nil { return fmt.Errorf("read file %s failed: %v", path, err) } + if glog.V(6) { + glog.Infof("yaml: %s", yamlTemplate) + } - content, err = yaml.YAMLToJSON(content) + yamlContent, err := p.parser.Parse(yamlTemplate) if err != nil { - return fmt.Errorf("convert yaml to json for file %s failed: %v", path, err) + if glog.V(4) { + glog.Infof("content: %s", string(yamlTemplate)) + } + return fmt.Errorf("parse content of file %s failed: %v", path, err) } if glog.V(6) { - glog.Infof("json %s", content) + glog.Infof("parsed: %s", yamlContent) } - content, err = p.parser.Parse(content) + jsonContent, err := yaml.YAMLToJSON(yamlContent) if err != nil { - return fmt.Errorf("parse content of file %s failed: %v", path, err) + if glog.V(4) { + glog.Infof("content: %s", string(yamlContent)) + } + return fmt.Errorf("convert yaml to json for file %s failed: %v", path, err) } if glog.V(6) { - glog.Infof("yaml %s", content) + glog.Infof("json: %s", jsonContent) } - obj, err := kind(content) + obj, err := kind(jsonContent) if err != nil { + if glog.V(4) { + glog.Infof("content: %s", string(jsonContent)) + } return fmt.Errorf("create object by content for file %s failed: %v", path, err) } glog.V(4).Infof("found kind %v", obj.GetObjectKind()) - if obj, _, err = k8s_unstructured.UnstructuredJSONScheme.Decode(content, nil, obj); err != nil { + if obj, _, err = k8s_unstructured.UnstructuredJSONScheme.Decode(jsonContent, nil, obj); err != nil { return fmt.Errorf("unmarshal to object for file %s failed: %v", path, err) } From 9c7fdc45eafff7ee8cf219c9099bff39e348a265 Mon Sep 17 00:00:00 2001 From: Benjamin Borbe Date: Wed, 2 May 2018 22:13:57 +0200 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5fe159..0a8b4aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Please choose versions by [Semantic Versioning](http://semver.org/). ## 1.1.6 -- Fix multiline teamvault expressions +- Log Yaml and Json content if parse failure ## 1.1.5