refactor!: Rule(-Set) related configuration properties mechanisms ,…

… `default` and `providers` moved one level up and renamed (#1028)
dadrus · Nov 14, 2023 · f6ce3b8 · f6ce3b8
1 parent dad14d9
commit f6ce3b8
Show file tree

Hide file tree

Showing 33 changed files with 1,412 additions and 1,464 deletions.
diff --git a/charts/heimdall/templates/demo/configmap.yaml b/charts/heimdall/templates/demo/configmap.yaml
@@ -58,31 +58,30 @@ data:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 
-    rules:
-      mechanisms:
-        authenticators:
-        - id: anonymous_authenticator
-          type: anonymous
-        authorizers:
-        - id: deny_all_requests
-          type: deny
-        - id: allow_all_requests
-          type: allow
-        finalizers:
-        - id: create_jwt
-          type: jwt
-        - id: noop_finalizer
-          type: noop
+    mechanisms:
+      authenticators:
+      - id: anonymous_authenticator
+        type: anonymous
+      authorizers:
+      - id: deny_all_requests
+        type: deny
+      - id: allow_all_requests
+        type: allow
+      finalizers:
+      - id: create_jwt
+        type: jwt
+      - id: noop_finalizer
+        type: noop
 
-      default:
-        methods:
-          - GET
-          - POST
-        execute:
-          - authenticator: anonymous_authenticator
-          - authorizer: deny_all_requests
-          - finalizer: create_jwt
+    default_rule:
+      methods:
+        - GET
+        - POST
+      execute:
+        - authenticator: anonymous_authenticator
+        - authorizer: deny_all_requests
+        - finalizer: create_jwt
 
-      providers:
-        kubernetes: {}
+    providers:
+      kubernetes: {}
     {{- end }}
diff --git a/charts/heimdall/templates/heimdall/configmap.yaml b/charts/heimdall/templates/heimdall/configmap.yaml
@@ -54,8 +54,18 @@ data:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 
-    {{- with .Values.rules }}
-    rules:
+    {{- with .Values.mechanisms }}
+    mechanisms:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+
+    {{- with .Values.default_rule }}
+    default_rule:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+
+    {{- with .Values.providers }}
+    providers:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 {{- end }}
diff --git a/cmd/validate/ruleset.go b/cmd/validate/ruleset.go
@@ -62,7 +62,7 @@ func validateRuleSet(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	conf.Rules.Providers.FileSystem = map[string]any{"src": args[0]}
+	conf.Providers.FileSystem = map[string]any{"src": args[0]}
 
 	mFactory, err := mechanisms.NewFactory(conf, logger)
 	if err != nil {