From bd24f35738c92d63b6640bcf5ccd99205437b992 Mon Sep 17 00:00:00 2001 From: dwertent Date: Tue, 26 Oct 2021 12:26:44 +0300 Subject: [PATCH] update tag --- cautils/getter/downloadreleasedpolicy.go | 2 +- cautils/getter/loadpolicy.go | 10 ++++++++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cautils/getter/downloadreleasedpolicy.go b/cautils/getter/downloadreleasedpolicy.go index 944c1bd1..23ca29e5 100644 --- a/cautils/getter/downloadreleasedpolicy.go +++ b/cautils/getter/downloadreleasedpolicy.go @@ -18,7 +18,7 @@ type DownloadReleasedPolicy struct { func NewDownloadReleasedPolicy() *DownloadReleasedPolicy { return &DownloadReleasedPolicy{ - gs: gitregostore.InitDefaultGitRegoStore(), + gs: gitregostore.InitDefaultGitRegoStore(-1), } } diff --git a/cautils/getter/loadpolicy.go b/cautils/getter/loadpolicy.go index c976a478..223ee7ec 100644 --- a/cautils/getter/loadpolicy.go +++ b/cautils/getter/loadpolicy.go @@ -35,7 +35,10 @@ func (lp *LoadPolicy) GetControl(controlName string) (*reporthandling.Control, e return nil, err } - err = json.Unmarshal(f, control) + if err = json.Unmarshal(f, control); err != nil { + return control, err + } + if controlName != "" && !strings.EqualFold(controlName, control.Name) && !strings.EqualFold(controlName, control.ControlID) { return nil, fmt.Errorf("control from file not matching") } @@ -50,7 +53,10 @@ func (lp *LoadPolicy) GetFramework(frameworkName string) (*reporthandling.Framew return nil, err } - err = json.Unmarshal(f, framework) + if err = json.Unmarshal(f, framework); err != nil { + return framework, err + } + if frameworkName != "" && !strings.EqualFold(frameworkName, framework.Name) { return nil, fmt.Errorf("framework from file not matching") } diff --git a/go.mod b/go.mod index d4f7bbd6..508431cb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/armosec/armoapi-go v0.0.8 github.com/armosec/k8s-interface v0.0.8 - github.com/armosec/opa-utils v0.0.13 + github.com/armosec/opa-utils v0.0.18 github.com/armosec/utils-go v0.0.3 github.com/briandowns/spinner v1.16.0 github.com/enescakir/emoji v1.0.0 diff --git a/go.sum b/go.sum index e21fe68c..2ef3ea74 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,8 @@ github.com/armosec/armoapi-go v0.0.8/go.mod h1:iaVVGyc23QGGzAdv4n+szGQg3Rbpixn9y github.com/armosec/k8s-interface v0.0.5/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM= github.com/armosec/k8s-interface v0.0.8 h1:Eo3Qen4yFXxzVem49FNeij2ckyzHSAJ0w6PZMaSEIm8= github.com/armosec/k8s-interface v0.0.8/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM= -github.com/armosec/opa-utils v0.0.13 h1:QkmmYX0lzC7ZNGetyD8ysRKQHgJhjMfvRUW2cp+hz2o= -github.com/armosec/opa-utils v0.0.13/go.mod h1:E0mFTVx+4BYAVvO2hxWnIniv/IZIogRCak8BkKd7KK4= +github.com/armosec/opa-utils v0.0.18 h1:1hL5v2KCD8yStuwzul+gq1zg9+RCV9N3kHoRepKnrg0= +github.com/armosec/opa-utils v0.0.18/go.mod h1:E0mFTVx+4BYAVvO2hxWnIniv/IZIogRCak8BkKd7KK4= github.com/armosec/utils-go v0.0.2/go.mod h1:itWmRLzRdsnwjpEOomL0mBWGnVNNIxSjDAdyc+b0iUo= github.com/armosec/utils-go v0.0.3 h1:uyQI676yRciQM0sSN9uPoqHkbspTxHO0kmzXhBeE/xU= github.com/armosec/utils-go v0.0.3/go.mod h1:itWmRLzRdsnwjpEOomL0mBWGnVNNIxSjDAdyc+b0iUo=