← Back to team overview

wordpress-charmers team mailing list archive

Re: [Merge] ~sajoupa/charm-k8s-wordpress:nginx-ingress-modsec into charm-k8s-wordpress:master

 

Also alpha sorting of annotation keys in tests pls.

Diff comments:

> diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
> index 7606877..e4af690 100644
> --- a/tests/unit/test_charm.py
> +++ b/tests/unit/test_charm.py
> @@ -133,6 +133,11 @@ class TestWordpressCharm(unittest.TestCase):
>                          "annotations": {
>                              "nginx.ingress.kubernetes.io/proxy-body-size": "10m",
>                              "nginx.ingress.kubernetes.io/proxy-send-timeout": "300s",
> +                            "nginx.ingress.kubernetes.io/enable-modsecurity": "true",
> +                            "nginx.ingress.kubernetes.io/enable-owasp-modsecurity-crs": "true",
> +                            "nginx.ingress.kubernetes.io/modsecurity-snippet":
> +                                ("SecRuleEngine On\n"
> +                                 "Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf"),

Can you alpha sort the keys here?

>                          },
>                          'name': ingress_name,
>                          'spec': {
> @@ -189,6 +194,11 @@ class TestWordpressCharm(unittest.TestCase):
>                              "nginx.ingress.kubernetes.io/proxy-body-size": "10m",
>                              "nginx.ingress.kubernetes.io/proxy-send-timeout": "300s",
>                              "nginx.ingress.kubernetes.io/ssl-redirect": "false",
> +                            "nginx.ingress.kubernetes.io/enable-modsecurity": "true",
> +                            "nginx.ingress.kubernetes.io/enable-owasp-modsecurity-crs": "true",
> +                            "nginx.ingress.kubernetes.io/modsecurity-snippet":
> +                                ("SecRuleEngine On\n"
> +                                 "Include /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf"),

Can you alpha sort the keys here?

>                          },
>                          'name': ingress_name,
>                          'spec': {


-- 
https://code.launchpad.net/~sajoupa/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/414465
Your team Wordpress Charmers is subscribed to branch charm-k8s-wordpress:master.



References