Remove kebab case

FairwindsOps · Jan 28, 2020 · 7f71a35 · 7f71a35
1 parent ba412ab
commit 7f71a35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 deletions.
diff --git a/pkg/validator/container_test.go b/pkg/validator/container_test.go
@@ -1189,8 +1189,8 @@ func TestValidateResourcesEmptyContainerCPURequestsExempt(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "foo",
 			Annotations: map[string]string {
-				"polaris.fairwinds.com/cpu-requests-missing-exempt": "true", // Exempt this controller from cpuRequestsMissing
-				"polaris.fairwinds.com/memory-requests-missing-exempt": "truthy", // Don't actually exempt this controller from memoryRequestsMissing
+				"polaris.fairwinds.com/cpuRequestsMissing-exempt": "true", // Exempt this controller from cpuRequestsMissing
+				"polaris.fairwinds.com/memoryRequestsMissing-exempt": "truthy", // Don't actually exempt this controller from memoryRequestsMissing
 			} ,
 		},
 		Spec: appsv1.DeploymentSpec{

diff --git a/pkg/validator/schema.go b/pkg/validator/schema.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"sort"
-	"regexp"
 	"strings"
 
 	packr "github.com/gobuffalo/packr/v2"
@@ -108,11 +107,7 @@ func makeResult(conf *config.Configuration, check *config.SchemaCheck, passes bo
 }
 
 func getExemptKey(checkID string) string {
-	matchWordBoundary := regexp.MustCompile("([a-z])([A-Z])")
-	matchAcronymWordBoundary := regexp.MustCompile("([A-Z])([A-Z][a-z])")
-	wordSplitString := matchWordBoundary.ReplaceAllString(checkID, "${1}-${2}")
-	kebabCase := strings.ToLower(matchAcronymWordBoundary.ReplaceAllString(wordSplitString, "${1}-${2}"))
-	return fmt.Sprintf("polaris.fairwinds.com/%s-exempt", kebabCase)
+	return fmt.Sprintf("polaris.fairwinds.com/%s-exempt", checkID)
 }
 
 func applyPodSchemaChecks(conf *config.Configuration, controller controllers.Interface) (ResultSet, error) {

diff --git a/pkg/validator/schema_test.go b/pkg/validator/schema_test.go
@@ -259,33 +259,4 @@ func TestValidateCustomCheckExemptions(t *testing.T) {
 		},
 	}
 	testValidate(t, &container, &customCheckExemptions, "notexempt", expectedErrors, expectedWarnings, expectedSuccesses)
-}
-
-func TestGetExemptKey(t *testing.T) {
-	keyMap := map[string]string {
-		"hostIPCSet": "polaris.fairwinds.com/host-ipc-set-exempt",
-		"hostPIDSet": "polaris.fairwinds.com/host-pid-set-exempt",
-		"hostNetworkSet": "polaris.fairwinds.com/host-network-set-exempt",
-		"memoryLimitsMissing": "polaris.fairwinds.com/memory-limits-missing-exempt",
-		"memoryRequestsMissing": "polaris.fairwinds.com/memory-requests-missing-exempt",
-		"cpuLimitsMissing": "polaris.fairwinds.com/cpu-limits-missing-exempt",
-		"cpuRequestsMissing": "polaris.fairwinds.com/cpu-requests-missing-exempt",
-		"readinessProbeMissing": "polaris.fairwinds.com/readiness-probe-missing-exempt",
-		"livenessProbeMissing": "polaris.fairwinds.com/liveness-probe-missing-exempt",
-		"pullPolicyNotAlways": "polaris.fairwinds.com/pull-policy-not-always-exempt",
-		"tagNotSpecified": "polaris.fairwinds.com/tag-not-specified-exempt",
-		"hostPortSet": "polaris.fairwinds.com/host-port-set-exempt",
-		"runAsRootAllowed": "polaris.fairwinds.com/run-as-root-allowed-exempt",
-		"runAsPrivileged": "polaris.fairwinds.com/run-as-privileged-exempt",
-		"notReadOnlyRootFileSystem": "polaris.fairwinds.com/not-read-only-root-file-system-exempt",
-		"privilegeEscalationAllowed": "polaris.fairwinds.com/privilege-escalation-allowed-exempt",
-		"dangerousCapabilities": "polaris.fairwinds.com/dangerous-capabilities-exempt",
-		"insecureCapabilities": "polaris.fairwinds.com/insecure-capabilities-exempt",
-	}
-	for id, key := range keyMap {
-		exemptKey := getExemptKey(id)
-		assert.Equal(t, key, exemptKey)
-	}
-
-
 }