mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

Merge pull request #788 from shravanshetty1/787_cli_panic

Browse source 
#787 - CLI panics for policies with variables
This commit is contained in:
shuting 2020-04-02 09:05:15 -07:00 • committed by GitHub
commit 235adf5530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/kyverno/apply/command.go
View file

@ -6,6 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"regexp"
"github.com/nirmata/kyverno/pkg/utils" "github.com/nirmata/kyverno/pkg/utils"
@ -81,6 +82,9 @@ func Command() *cobra.Command {
if err != nil { if err != nil {
return sanitizedError.New(fmt.Sprintf("Policy %v is not valid", policy.Name)) return sanitizedError.New(fmt.Sprintf("Policy %v is not valid", policy.Name))
} }
if policyHasVariables(*policy) {
return sanitizedError.New(fmt.Sprintf("Policy %v is not valid - 'apply' does not support policies with variables", policy.Name))
}
} }
var dClient discovery.CachedDiscoveryInterface var dClient discovery.CachedDiscoveryInterface
@ -387,3 +391,9 @@ func applyPolicyOnResource(policy *v1.ClusterPolicy, resource *unstructured.Unst
return nil return nil
} }
func policyHasVariables(policy v1.ClusterPolicy) bool {
policyRaw, _ := json.Marshal(policy)
regex := regexp.MustCompile(`\{\{([^{}]*)\}\}`)
return len(regex.FindAllStringSubmatch(string(policyRaw), -1)) > 0
}

2
pkg/policy/generate/fake.go
View file

@ -3,6 +3,7 @@ package generate
import ( import (
kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1" kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
"github.com/nirmata/kyverno/pkg/policy/generate/fake" "github.com/nirmata/kyverno/pkg/policy/generate/fake"
"sigs.k8s.io/controller-runtime/pkg/log"
) )
//FakeGenerate provides implementation for generate rule processing //FakeGenerate provides implementation for generate rule processing
@ -17,5 +18,6 @@ func NewFakeGenerate(rule kyverno.Generation) *FakeGenerate {
g := FakeGenerate{} g := FakeGenerate{}
g.rule = rule g.rule = rule
g.authCheck = fake.NewFakeAuth() g.authCheck = fake.NewFakeAuth()
g.log = log.Log
return &g return &g
} }