remove containsLabel function, integrate with matchLabels to reduce complexity (#21)

* remove containsLabel function, integrate with matchLabels to reduce time complexity

* fix comment

* mod tidy

* update deps

* fix make docker-dev

Author: circa10a

CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
+## 0.2.3
+
+Optimize rule checking logic for better performance
+
 ## 0.2.2
- 
+
 Update dependencies
 
 ## 0.2.1
- 
+
 Update dependencies
 
 ## 0.2.0

Makefile

@@ -4,7 +4,7 @@ GOCLEAN=$(GOCMD) clean
 GORUN=$(GOCMD) run
 PROJECT=circa10a/k8s-label-rules-webhook
 BINARY=webhook
-VERSION=0.2.2
+VERSION=0.2.3
 GOBUILDFLAGS=-ldflags="-s -w -X main.Version=$(VERSION)"
 
 # First target for travis ci
@@ -46,7 +46,7 @@ docker-build:
 docker-run:
 	docker run --rm -v $(shell pwd)/rules.yaml:/rules.yaml \
     -p 8080:8080 \
-    $(PROJECT) --file rules.yaml --metrics
+    $(PROJECT):$(VERSION) --file rules.yaml --metrics
 
 docker-dev: docker-build docker-run
 

api/docs.go

@@ -234,7 +234,7 @@ type swaggerInfo struct {
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = swaggerInfo{
-	Version:     "0.1.0",
+	Version:     "0.2.3",
 	Host:        "",
 	BasePath:    "",
 	Schemes:     []string{},

api/swagger.json

@@ -11,7 +11,7 @@
             "name": "MIT",
             "url": "https://github.com/circa10a/k8s-label-rules-webhook/blob/master/LICENSE"
         },
-        "version": "0.1.0"
+        "version": "0.2.3"
     },
     "paths": {
         "/": {

api/swagger.yaml

@@ -81,7 +81,7 @@ info:
     name: MIT
     url: https://github.com/circa10a/k8s-label-rules-webhook/blob/master/LICENSE
   title: k8s-label-rules-webhook
-  version: 0.1.0
+  version: 0.2.3
 paths:
   //:
     post:

go.mod

@@ -9,15 +9,19 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/gavv/httpexpect v2.0.0+incompatible
 	github.com/gin-gonic/gin v1.6.3
+	github.com/go-openapi/spec v0.19.7 // indirect
+	github.com/go-openapi/swag v0.19.9 // indirect
+	github.com/golang/protobuf v1.4.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/imkira/go-interpol v1.1.0 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
+	github.com/mailru/easyjson v0.7.1 // indirect
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
-	github.com/prometheus/client_golang v1.2.1 // indirect
+	github.com/prometheus/client_golang v1.6.0 // indirect
 	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.6.0
 	github.com/smartystreets/goconvey v1.6.4 // indirect
@@ -32,5 +36,8 @@ require (
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yudai/pp v2.0.1+incompatible // indirect
 	github.com/zsais/go-gin-prometheus v0.1.0
+	golang.org/x/net v0.0.0-20200506145744-7e3656a0809f // indirect
+	golang.org/x/sys v0.0.0-20200508214444-3aab700007d7 // indirect
+	golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 )

go.sum

@@ -69,7 +69,7 @@ func flags() {
 }
 
 // @title k8s-label-rules-webhook
-// @version 0.2.0
+// @version 0.2.3
 // @description A kubernetes webhook to standardize labels on resources
 
 // @contact.name GitHub

main.go

@@ -39,14 +39,8 @@ func labelValidationHandler() gin.HandlerFunc {
 		if c.ShouldBindJSON(&k8sData) == nil {
 			labels := k8sData.Request.Object.Metadata.Labels
 			uid := k8sData.Request.Object.Metadata.UID
-			// Ensure labels provided contain keys identified in the ruleset
-			containLabelErr := R.ensureLabelsContainRules(labels)
-			// Reject request if not
-			if containLabelErr != nil {
-				sendResponse(c, k8sData, uid, false, http.StatusForbidden, containLabelErr.Error())
-				return
-			}
-			// Ensure labels provided match regex of keys identified in the ruleset
+			// Ensure labels contain keys identified in the ruleset
+			// Ensure labels are present and user provided regex match values identified in the ruleset
 			matchLabelErr := R.ensureLabelsMatchRules(labels)
 			// Reject request if not
 			if matchLabelErr != nil {

routes.go

@@ -9,20 +9,20 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-// Rules array from yaml
+// Rules is a slice of rules that are loaded from a yaml array
 type rules struct {
 	Rules          []rule `yaml:"rules" json:"rules"`
 	CompiledRegexs map[string]*regexp.Regexp
 }
 
-// Individual rule within rules array
+// Rule is a struct that represents a rule within rules array
 type rule struct {
 	Name  string `yaml:"name" json:"name"`
 	Key   string `yaml:"key" json:"key"`
 	Value value  `yaml:"value" json:"value"`
 }
 
-// Value struct within each rule
+// Value is struct within each rule which only supports regex, but can be expanded
 type value struct {
 	Regex string `yaml:"regex" json:"regex"`
 }
@@ -81,20 +81,14 @@ func (r *rules) validateAllRulesRegex() []ruleError {
 	return r.compileRegex(false)
 }
 
-func (r *rules) ensureLabelsContainRules(labels map[string]interface{}) error {
+func (r *rules) ensureLabelsMatchRules(labels map[string]interface{}) error {
 	for _, rule := range r.Rules {
 		// Ensure labels contains rule
 		if _, ok := labels[rule.Key]; !ok {
 			// If rule is not found, reject
 			errStr := fmt.Sprintf("%v not in labels", rule.Key)
 			return errors.New(errStr)
 		}
-	}
-	return nil
-}
-
-func (r *rules) ensureLabelsMatchRules(labels map[string]interface{}) error {
-	for _, rule := range r.Rules {
 		// Force all values to strings to prevent panic from interface conversion
 		labelVal := fmt.Sprintf("%v", labels[rule.Key])
 		regex, _ := r.CompiledRegexs[rule.Name]