Updating app protect

soneillf5 · soneillf5 · commit 0ecf64fd07a9 · 2021-04-13T14:09:56.000+01:00
diff --git a/deployments/common/crds/appprotect.f5.com_aplogconfs.yaml b/deployments/common/crds/appprotect.f5.com_aplogconfs.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APLogConf is the Schema for the APLogConfs API
diff --git a/deployments/common/crds/appprotect.f5.com_appolicies.yaml b/deployments/common/crds/appprotect.f5.com_appolicies.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APPolicyConfig is the Schema for the APPolicyconfigs API
diff --git a/deployments/common/crds/appprotect.f5.com_apusersigs.yaml b/deployments/common/crds/appprotect.f5.com_apusersigs.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APUserSig is the Schema for the apusersigs API
diff --git a/deployments/helm-chart/crds/appprotect.f5.com_aplogconfs.yaml b/deployments/helm-chart/crds/appprotect.f5.com_aplogconfs.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APLogConf is the Schema for the APLogConfs API
diff --git a/deployments/helm-chart/crds/appprotect.f5.com_appolicies.yaml b/deployments/helm-chart/crds/appprotect.f5.com_appolicies.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APPolicyConfig is the Schema for the APPolicyconfigs API
diff --git a/deployments/helm-chart/crds/appprotect.f5.com_apusersigs.yaml b/deployments/helm-chart/crds/appprotect.f5.com_apusersigs.yaml
@@ -15,7 +15,7 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1
       schema:
         openAPIV3Schema:
           description: APUserSig is the Schema for the apusersigs API
diff --git a/examples-of-custom-resources/waf/ap-apple-uds.yaml b/examples-of-custom-resources/waf/ap-apple-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APUserSig
 metadata:
   name: apple
diff --git a/examples-of-custom-resources/waf/ap-dataguard-alarm-policy.yaml b/examples-of-custom-resources/waf/ap-dataguard-alarm-policy.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata:
   name: dataguard-alarm
diff --git a/examples-of-custom-resources/waf/ap-logconf.yaml b/examples-of-custom-resources/waf/ap-logconf.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APLogConf
 metadata:
   name: logconf
diff --git a/examples/appprotect/ap-apple-uds.yaml b/examples/appprotect/ap-apple-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APUserSig
 metadata:
   name: apple
diff --git a/examples/appprotect/ap-dataguard-alarm-policy.yaml b/examples/appprotect/ap-dataguard-alarm-policy.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata:
   name: dataguard-alarm
diff --git a/examples/appprotect/ap-logconf.yaml b/examples/appprotect/ap-logconf.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APLogConf
 metadata:
   name: logconf
diff --git a/internal/k8s/appprotect/app_protect_configuration.go b/internal/k8s/appprotect/app_protect_configuration.go
@@ -23,39 +23,39 @@ var (
 	// PolicyGVR is the group version resource of the appprotect policy
 	PolicyGVR = schema.GroupVersionResource{
 		Group:    "appprotect.f5.com",
-		Version:  "v1beta1",
+		Version:  "v1",
 		Resource: "appolicies",
 	}
 	// PolicyGVK is the group version kind of the appprotect policy
 	PolicyGVK = schema.GroupVersionKind{
 		Group:   "appprotect.f5.com",
-		Version: "v1beta1",
+		Version: "v1",
 		Kind:    "APPolicy",
 	}
 
 	// LogConfGVR is the group version resource of the appprotect policy
 	LogConfGVR = schema.GroupVersionResource{
 		Group:    "appprotect.f5.com",
-		Version:  "v1beta1",
+		Version:  "v1",
 		Resource: "aplogconfs",
 	}
 	// LogConfGVK is the group version kind of the appprotect policy
 	LogConfGVK = schema.GroupVersionKind{
 		Group:   "appprotect.f5.com",
-		Version: "v1beta1",
+		Version: "v1",
 		Kind:    "APLogConf",
 	}
 
 	// UserSigGVR is the group version resource of the appprotect policy
 	UserSigGVR = schema.GroupVersionResource{
 		Group:    "appprotect.f5.com",
-		Version:  "v1beta1",
+		Version:  "v1",
 		Resource: "apusersigs",
 	}
 	// UserSigGVK is the group version kind of the appprotect policy
 	UserSigGVK = schema.GroupVersionKind{
 		Group:   "appprotect.f5.com",
-		Version: "v1beta1",
+		Version: "v1",
 		Kind:    "APUserSig",
 	}
 )
@@ -402,6 +402,8 @@ func (ci *ConfigurationImpl) GetAppResource(kind, key string) (*unstructured.Uns
 		}
 		return nil, fmt.Errorf("App Protect LogConf %s not found", key)
 	case UserSigGVK.Kind:
+		// do nothing
+		fmt.Print("test")
 		if obj, ok := ci.UserSigs[key]; ok {
 			if obj.IsValid {
 				return obj.Obj, nil
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -98,11 +98,11 @@ def pytest_collection_modifyitems(config, items) -> None:
         for item in items:
             if "skip_for_nginx_plus" in item.keywords:
                 item.add_marker(skip_for_nginx_plus)
-    if "-ap" not in config.getoption("--image"):
-        appprotect = pytest.mark.skip(reason="Skip AppProtect test in non-AP image")
-        for item in items:
-            if "appprotect" in item.keywords:
-                item.add_marker(appprotect)
+    # if "-ap" not in config.getoption("--image"):
+    #     appprotect = pytest.mark.skip(reason="Skip AppProtect test in non-AP image")
+    #     for item in items:
+    #         if "appprotect" in item.keywords:
+    #             item.add_marker(appprotect)
 
 
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)
diff --git a/tests/data/ap-waf/ap-ic-uds.yaml b/tests/data/ap-waf/ap-ic-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APUserSig
 metadata:
   name: kic
diff --git a/tests/data/ap-waf/dataguard-alarm-uds.yaml b/tests/data/ap-waf/dataguard-alarm-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata: 
   name: dataguard-alarm-uds
diff --git a/tests/data/ap-waf/logconf.yaml b/tests/data/ap-waf/logconf.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APLogConf
 metadata:
   name: logconf
diff --git a/tests/data/appprotect/ap-ic-uds.yaml b/tests/data/appprotect/ap-ic-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APUserSig
 metadata:
   name: kic
diff --git a/tests/data/appprotect/dataguard-alarm-uds.yaml b/tests/data/appprotect/dataguard-alarm-uds.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata: 
   name: dataguard-alarm
diff --git a/tests/data/appprotect/dataguard-alarm.yaml b/tests/data/appprotect/dataguard-alarm.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata: 
   name: dataguard-alarm
diff --git a/tests/data/appprotect/file-block.yaml b/tests/data/appprotect/file-block.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata: 
   name: file-block
diff --git a/tests/data/appprotect/logconf.yaml b/tests/data/appprotect/logconf.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APLogConf
 metadata: 
   name: logconf
diff --git a/tests/data/appprotect/malformed-block.yaml b/tests/data/appprotect/malformed-block.yaml
@@ -1,4 +1,4 @@
-apiVersion: appprotect.f5.com/v1beta1
+apiVersion: appprotect.f5.com/v1
 kind: APPolicy
 metadata: 
   name: malformed-block
diff --git a/tests/settings.py b/tests/settings.py
@@ -8,7 +8,7 @@
 TEST_DATA = f"{PROJECT_ROOT}/data"
 DEFAULT_IMAGE = "nginx/nginx-ingress:edge"
 DEFAULT_PULL_POLICY = "IfNotPresent"
-DEFAULT_IC_TYPE = "nginx-ingress"
+DEFAULT_IC_TYPE = "nginx-plus-ingress"
 ALLOWED_IC_TYPES = ["nginx-ingress", "nginx-plus-ingress"]
 DEFAULT_SERVICE = "nodeport"
 ALLOWED_SERVICE_TYPES = ["nodeport", "loadbalancer"]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apiVersion: appprotect.f5.com/v1beta1`
	`1`	`+apiVersion: appprotect.f5.com/v1`
`2`	`2`	`kind: APUserSig`
`3`	`3`	`metadata:`
`4`	`4`	`name: apple`