Feature toggles for pdp_push and crypto

OpenConext · Aug 27, 2024 · 563d762 · 563d762
1 parent e47101e
commit 563d762
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/environments/template/group_vars/template.yml b/environments/template/group_vars/template.yml
@@ -458,6 +458,8 @@ manage:
   backdoor_api_user: backdoor_api_user
   oidcng_name: "OpenConext OIDC-NG"
   oidc_push_enabled: false
+  pdp_push_enabled: false
+  crypto_enabled: true
   pdp_name: "PdP"
   run_migrations: false
   push_after_migration: false

diff --git a/environments/vm/group_vars/vm.yml b/environments/vm/group_vars/vm.yml
@@ -348,6 +348,8 @@ manage:
   backdoor_api_user: backdoor_api_user
   oidcng_name: "OpenConext OIDC-NG"
   oidc_push_enabled: true
+  pdp_push_enabled: true
+  crypto_enabled: true
   pdp_name: "PdP"
   features: push, validation, push_preview, orphans, find_my_data, edugain, auto_refresh
   environment: vm

diff --git a/roles/manage/templates/application.yml.j2 b/roles/manage/templates/application.yml.j2
@@ -49,6 +49,7 @@ push:
     name: {{ manage.pdp_name }}
     user: {{ pdp.username }}
     password: "{{ pdp.password }}"
+    enabled: {{ manage.pdp_push_enabled }}
 
 product:
   name: Manage
@@ -70,6 +71,7 @@ security:
 crypto:
   development-mode: False
   public-key-location: file://{{ manage_dir }}/public_invite_key.pem
+  enabled: {{ manage.crypto_enabled }}
 
 spring:
   mail:

diff --git a/tests/githubactions-build.sh b/tests/githubactions-build.sh
@@ -51,17 +51,18 @@ cat <<-'EOF' > ansible.cfg
 EOF
 
 # Prepare the environment
-echo "Prepping the environment" 
+echo "Prepping the environment"
 mkdir -p environments-external
 /bin/cp -r environments/vm/ environments-external/github
 /bin/mv environments-external/github/group_vars/vm.yml environments-external/github/group_vars/github.yml
 sed -i 's/192.168.66.98/0.0.0.0/g' environments-external/github/group_vars/github.yml
 sed -i 's/192.168.66.99/127.0.0.1/g' environments-external/github/group_vars/github.yml
 sed -i 's/oidc_push_enabled: true/oidc_push_enabled: false/g' environments-external/github/group_vars/github.yml
+sed -i 's/pdp_push_enabled: true/pdp_push_enabled: false/g' environments-external/github/group_vars/github.yml
 # Change the hostname in the inventory
 /bin/cp environments/template/inventory environments-external/github/
 sed -i 's/%env%/github/g' environments-external/github/inventory
-sed -i 's/%target_host%/ansible-test-ga ansible_connection=docker/g' environments-external/github/inventory 
+sed -i 's/%target_host%/ansible-test-ga ansible_connection=docker/g' environments-external/github/inventory
 
 # Create the proper host_vars file
 /bin/cp environments/template/host_vars/template.yml environments-external/github/host_vars/ansible-test-ga.yml