fix(check_blueprints): reapply failed blueprints

abra.sh

@@ -10,7 +10,7 @@ export WORDPRESS_CONFIG_VERSION=v8
 export MATRIX_CONFIG_VERSION=v4
 export WEKAN_CONFIG_VERSION=v6
 export VIKUNJA_CONFIG_VERSION=v4
-export OUTLINE_CONFIG_VERSION=v6
+export OUTLINE_CONFIG_VERSION=v5
 export KIMAI_CONFIG_VERSION=v3
 export ZAMMAD_CONFIG_VERSION=v4
 export RALLLY_CONFIG_VERSION=v5
@@ -78,6 +78,7 @@ for group_name in groups:
     group.users.add(admin)
     print(f'add akadmin to group {group_name}')
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 
 }
 
@@ -108,6 +109,7 @@ with open('/tmp/$1', newline='') as file:
         group.users.add(new_user)
         print(f'add {username} to group {group_name}')
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 set_user_pass() {
@@ -119,7 +121,7 @@ user.set_password('$password')
 user.save()
 print('Changed $username password')
 """ 2>&1 | quieten
-
+  return ${PIPESTATUS[0]}
 }
 
 set_admin_pass() {
@@ -157,6 +159,7 @@ else:
     )
     print('Created authentik-bootstrap-token')
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 rotate_db_pass() {
@@ -182,6 +185,7 @@ update_and_disable_blueprint() {
   apply_blueprint $@
   sleep 1
   disable_blueprint $@ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 disable_blueprint() {
@@ -195,6 +199,7 @@ enable_blueprint() {
 apply_blueprint() {
   echo apply blueprint $@
   ak apply_blueprint $@ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 blueprint_state() {
@@ -212,7 +217,7 @@ time.sleep(1)
 blueprint.save()
 print(f'{blueprint.name} enabled: {blueprint.enabled}')
 """ 2>&1 | quieten
-
+  return ${PIPESTATUS[0]}
 }
 
 # This function adds each application with its name, slug and group if passed
@@ -242,6 +247,7 @@ for name, details in applications.items():
     app.open_in_new_tab = True
     app.save()
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 # This function adds one application with its name, slug and group if passed
@@ -271,6 +277,7 @@ else:
 app.open_in_new_tab = True
 app.save()
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 ## This function is for renaming apps - usage: rename "old name" "new name"
@@ -287,12 +294,13 @@ if app:
 else:
     print(f'No application found with name: {old_name}')
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 quieten() {
   # 'SyntaxWarning|version_regex|"http\['
   # is a workaround to get rid of some verbose syntax warnings, this might be fixed with another version
-  grep -Pv '"level": "(info|debug)"|SyntaxWarning|version_regex|"http\[|RuntimeWarning:|### authentik shell|### Node| objects imported automatically|^$'
+  grep -Pv '"level": "(info|debug)"|SyntaxWarning|version_regex|"http\[|RuntimeWarning:|### authentik shell|### Node| objects imported automatically|^$' || true
 }
 
 add_email_templates() {
@@ -386,6 +394,29 @@ Brand.objects.filter(default=True).delete()
   apply_blueprints
 }
 
+check_blueprints() {
+  failed_blueprints=$(/manage.py shell -c """
+print(','.join(b.path for b in BlueprintInstance.objects.exclude(status='successful').exclude(name='Default - Out-of-box-experience flow')))
+""" 2>&1 | quieten | tail -n1)
+
+  if [ -z "$failed_blueprints" ]; then
+    echo "All Blueprints Successful"
+    return 0
+  fi
+
+  echo "These Blueprints failed:"
+  echo "$failed_blueprints" | tr ',' '\n'
+
+  echo "execute failed Blueprints"
+  export AUTHENTIK_LOG_LEVEL=warning
+  for bp in $(echo "$failed_blueprints" | tr ',' '\n'); do
+    echo "Applying: $bp"
+    ak apply_blueprint "/blueprints/$bp" 2>&1 | quieten
+  done
+
+  return 1
+}
+
 get_certificate() {
   /manage.py shell -c """
 provider_name='$1'
@@ -397,12 +428,14 @@ saml = provider.samlprovider
 cert = saml.signing_kp
 print(''.join(cert.certificate_data.splitlines()[1:-1]))
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 get_user_uid() {
   /manage.py shell -c """
 print(User.objects.filter(username='$1').first().uid)
 """ 2>&1 | quieten
+  return ${PIPESTATUS[0]}
 }
 
 get_secrets() {

outline.yaml.tmpl

@@ -24,7 +24,6 @@ entries:
     - !Find [authentik_providers_oauth2.scopemapping, [scope_name, openid]]
     - !Find [authentik_providers_oauth2.scopemapping, [scope_name, email]]
     - !Find [authentik_providers_oauth2.scopemapping, [scope_name, profile]]
-    - !Find [authentik_providers_oauth2.scopemapping, [scope_name, offline_access]]
     signing_key: !Find [authentik_crypto.certificatekeypair, [name, authentik Self-signed Certificate]]
     sub_mode: hashed_user_id
     token_validity: days=30