feat: update denylist and allowlist for a more flexible input

Author: jacaudi

apis/nextdnsprofile/composition.yaml

@@ -83,10 +83,40 @@ spec:
                         "parentalControl": {{ .observed.composite.resource.spec.parentalControl | toJson }}
                         {{- end }}
                         {{- if .observed.composite.resource.spec.denylist }},
-                        "denylist": {{ .observed.composite.resource.spec.denylist | toJson }}
+                        "denylist": [
+                          {{- range $i, $entry := .observed.composite.resource.spec.denylist }}
+                          {{- if $i }},{{- end }}
+                          {{- if kindIs "string" $entry }}
+                          {"id": {{ $entry | toJson }}, "active": true}
+                          {{- else }}
+                          {{- $domain := "" }}
+                          {{- range $key, $value := $entry }}
+                          {{- if ne $key "active" }}
+                          {{- $domain = $key }}
+                          {{- end }}
+                          {{- end }}
+                          {"id": {{ $domain | toJson }}, "active": {{ $entry.active | default true }}}
+                          {{- end }}
+                          {{- end }}
+                        ]
                         {{- end }}
                         {{- if .observed.composite.resource.spec.allowlist }},
-                        "allowlist": {{ .observed.composite.resource.spec.allowlist | toJson }}
+                        "allowlist": [
+                          {{- range $i, $entry := .observed.composite.resource.spec.allowlist }}
+                          {{- if $i }},{{- end }}
+                          {{- if kindIs "string" $entry }}
+                          {"id": {{ $entry | toJson }}, "active": true}
+                          {{- else }}
+                          {{- $domain := "" }}
+                          {{- range $key, $value := $entry }}
+                          {{- if ne $key "active" }}
+                          {{- $domain = $key }}
+                          {{- end }}
+                          {{- end }}
+                          {"id": {{ $domain | toJson }}, "active": {{ $entry.active | default true }}}
+                          {{- end }}
+                          {{- end }}
+                        ]
                         {{- end }}
                         {{- if .observed.composite.resource.spec.settings }},
                         "settings": {{ .observed.composite.resource.spec.settings | toJson }}

apis/nextdnsprofile/definition.yaml

@@ -112,21 +112,25 @@ spec:
                 denylist:
                   type: array
                   items:
-                    type: object
-                    properties:
-                      id:
-                        type: string
-                      active:
-                        type: boolean
+                    oneOf:
+                      - type: string
+                      - type: object
+                        properties:
+                          active:
+                            type: boolean
+                        additionalProperties:
+                          type: string
                 allowlist:
                   type: array
                   items:
-                    type: object
-                    properties:
-                      id:
-                        type: string
-                      active:
-                        type: boolean
+                    oneOf:
+                      - type: string
+                      - type: object
+                        properties:
+                          active:
+                            type: boolean
+                        additionalProperties:
+                          type: string
                 settings:
                   type: object
                   properties: