fix(matrix): Make additional Secrets functional

This patch fixes the wrong identation of the `extraSecrets` key to make it functional as expected.

fix(matrix): Make additional Secrets functional
f1a4d89c · Sheogorath · 09a2c2e8 · f1a4d89c
Verified Commit f1a4d89c authored 2 years ago by Sheogorath
--- a/apps/k8s01/matrix/matrix-synapse-values.yaml
+++ b/apps/k8s01/matrix/matrix-synapse-values.yaml
@@ -13,38 +13,38 @@ spec:
        synapse:
            enableRegistration: false
            macaroonSecretKey: ENC[AES256_GCM,data:SXlvvxBUuuily+ArVpnLwlMNTfNltIT8VLXrhxtzZs2YB1tVkNxYWCOCUO7kqMhsrF4qDyRUdp+nFxWRr5iB37jCnKm3u/waUoqL4+YI1z7c8eebUmwgEjkICf60jJdyRkm2XPRATkCfVISJAOiaMDpJAhwHUkGOJPgqLijZ6iY=,iv:Dq7JVBqJ1ZEJ8DaR+jC8NgqOk3X7sCyAezBI6+yugO8=,tag:/PpVFDECxRMv2zDtxR1uUA==,type:str]
-            extraSecrets:
-                password_config:
-                    enabled: ENC[AES256_GCM,data:WNXR4v4=,iv:cnny298VFz64iG7v8VYXNn9LRdfR4jyt9eYbV/xOCBA=,tag:uBYCM/jFHjMzrpSjpXcw5w==,type:bool]
-                url_preview_enabled: ENC[AES256_GCM,data:cc4Gig==,iv:u1jV6ITy7QzolHtz9XveU1oYhJFf1uFfx5yXLTlQXxU=,tag:cLfT3oAHIVoW43bN5pN5Qg==,type:bool]
-                url_preview_ip_range_blacklist:
-                    - ENC[AES256_GCM,data:4pzvh8iAVw1T4XU=,iv:0CZFN5/3LPkSlQmRGwAtzhQtYXQ2S71BwrtHRHOgMl0=,tag:zn1hSqDmKYagrgQXMjH/bg==,type:str]
-                    - ENC[AES256_GCM,data:BOOUFOk+h0xTDg==,iv:m9aDtAb9W3bXCP1kCJHXTZlzvK4gy5a8Spa8BRRmZL8=,tag:7HUMVZVtyiCuam7dNMAGQA==,type:str]
-                    - ENC[AES256_GCM,data:lGZhyIIeaZYlZ7U0Sw==,iv:WNMpXLoXzsdfrsQMX3MGEILrwMRqWKop8MJ3E4U19ec=,tag:uT3I1pNPg1mtygoIZkbs+w==,type:str]
-                    - ENC[AES256_GCM,data:Kfqhpms+zrwARmzn9Nk=,iv:c1+5H1ThNsQ2TXD2ESQvWZ6bdxR5mrVtqGC8+KGkMkE=,tag:52LOfQear4l6ukfmjjqJRA==,type:str]
-                    - ENC[AES256_GCM,data:tV+oaLkFmLEPAi1j7A==,iv:fA4u2JXF6hJnBe0qx4ORtGQJ96UGaXHfVwr1XdozbHo=,tag:FgJOB/u4gPm6I3gkWWCUNA==,type:str]
-                    - ENC[AES256_GCM,data:CpfdkZ3HbmJsMl8Fk/s=,iv:AuJeftldZGrYnvoWRyTv75KZ0jCYGntMkjuas1NKGsM=,tag:k0rzd+4o6JMcYOzNw7Sf1w==,type:str]
-                    - ENC[AES256_GCM,data:9hTrcA4Mjw==,iv:U5Jbh8qTl5w5I8U0JEftBfiV14BdbozW/LzsxeJxFcM=,tag:O6TlhmzA8PxUAFs+FgoHlg==,type:str]
-                    - ENC[AES256_GCM,data:C9dJf0xd9DbK,iv:gfJmrqeNNedp0xHd3n79Z204YV1xlPLtYVI1lyLNCNk=,tag:1sor+8qdur9A++NdadkOfg==,type:str]
-                    - ENC[AES256_GCM,data:gG5hjkDOKY0=,iv:fqijWz7wmX67NPALiNrPlGg3JLEeJEx8hNKnbueUPG0=,tag:0sUzdlNh6yXqpVWFoOgtUA==,type:str]
-                max_spider_size: ENC[AES256_GCM,data:RTS8,iv:Dp1bhdlTtnsTqksKN3/aQSGfyLB2f6boMyh1lUELJ1U=,tag:pG+KlbM113bhjfRfxv6ZbA==,type:str]
-                oidc_providers:
-                    - idp_id: ENC[AES256_GCM,data:Ps3e8hgngNI=,iv:jFgXhOpHm8PWUY2C0D70odbosMwS8HUSpEFKcdisLmk=,tag:rXfpgwhNFY1r5mpLdg1sHw==,type:str]
-                      idp_name: ENC[AES256_GCM,data:BvpodzZtzg==,iv:vTXhQEfO+2vMspQi334tBdes73kl3RN9zmFMNs/g4RE=,tag:022CGsZIx335a8b0U0z1Gg==,type:str]
-                      issuer: ENC[AES256_GCM,data:pX5JnNdjrwVyQedR4vj90YcP57J0YYqWvmLW5Mz6m6DRqWskJN3ltP1r+yCQSCWeJjli5f7e/o8OXIGp,iv:9IQO+yBRo+0UHWmf75OgnjxddCXSDVTOfG0uqw0Fgq0=,tag:it2aER4GyyOO3RYmVdZx3A==,type:str]
-                      client_id: ENC[AES256_GCM,data:bhIa/lno+kE+CeM=,iv:C9VLxz2iM6y+o8neaiYtrPfGMwtMklIshc2GKbzdsgY=,tag:+DApKnB+b7/tS1YkYYM1rA==,type:str]
-                      client_secret: ENC[AES256_GCM,data:EYaTptLQAoJaGffsH+ZrwQQw/n1Fq6ERvAxydmUZbMk=,iv:SfZDADGPVcgKpmPvfK8PXV28VZJtvNuvGEUOUhiL0kU=,tag:OKWj+6yaH5rtwTSIe/4wOQ==,type:str]
-                      scopes:
-                        - ENC[AES256_GCM,data:sKxEvTNv,iv:KT3ctuo6mPNm2BfDTx23xLbQFnSaX7WcE5EQA/slP30=,tag:sal4QzquROjLnENCdIqWgw==,type:str]
-                        - ENC[AES256_GCM,data:92jyG+OKyA==,iv:TyL+qJvEwoYboNODRruM6jCIftYueJTmA1iLCVlVorM=,tag:SFOLrAze+RDE8cEsME2Nqw==,type:str]
-                      allow_existing_users: ENC[AES256_GCM,data:eReV6w==,iv:90feCjoMYx2l3T3Y2E8hbKB7PZuzjqGuPdQt83BLLas=,tag:V9K/C33Va/k0g1Hwt4qqIg==,type:bool]
-                      user_mapping_provider:
-                        config:
-                            localpart_template: ENC[AES256_GCM,data:x/13/xeIn8iOVjjFoJ8MOUZROIoMNOOiHWUoe6U=,iv:9PzFsQhCX5PP8t5ECoZ+btMuJC7F7wNZ2U3d2vcwIpY=,tag:EBtRsZ9vBDrpM/luSQKcCg==,type:str]
-                            display_name_template: ENC[AES256_GCM,data:/x4L4lIcsZ/oftSgs+XO,iv:W63D6yPaKtT7CpmrkZD71MfMLqPXUoqQmhkSM8o8JWQ=,tag:M2sCv/xCeOv4hrDhcNwrgw==,type:str]
-                      attribute_requirements:
-                        - attribute: ENC[AES256_GCM,data:B5nzv0k=,iv:HlaCmAxUSm8CJAnvU/Oe/T43VyHrYupXisRtFkNgOb4=,tag:4EnE9Ner+TwAlCgX9Wr5nQ==,type:str]
-                          value: ENC[AES256_GCM,data:buCMpg==,iv:Aaii/TYmvKBFvqRVip4C2d/lqdXqqTORATt3E0ac/IE=,tag:Z0fb/Z9L1raZEkk2Ychakw==,type:str]
+        extraSecrets:
+            password_config:
+                enabled: ENC[AES256_GCM,data:QKVhUbw=,iv:rIAFOrqfsGTYb0Q+qeV+C0FteKqfHtZIL5sLX4l4upo=,tag:qUausmhrjVXJjCACDoUWdg==,type:bool]
+            url_preview_enabled: ENC[AES256_GCM,data:y4CARg==,iv:EUlSRqhTI4uWx1Q1Hb7SNGW6fYPrJqOSz8K4Wnm5SSM=,tag:kx/IJe0fxGkfI98b9oTLIA==,type:bool]
+            url_preview_ip_range_blacklist:
+                - ENC[AES256_GCM,data:Aazhg8z6+BA0dyA=,iv:QzkMe9Z2DKRKW0hLGpc7H1QhFwVsq2U8tIBtSz/Ey3Y=,tag:ya5eIPEVvnwoSIY4rFkjAQ==,type:str]
+                - ENC[AES256_GCM,data:BeqBhrn6BS6GLQ==,iv:N+/bnfXrYrxBXC+eu+HI5/r4+6nmDv/u6k/C3Kq9V7g=,tag:FbtdnGqlZ/TCtOOx255FwQ==,type:str]
+                - ENC[AES256_GCM,data:0uYrgtIHb5fxjG+biQ==,iv:CO/CP+9taE4kmTIOqjfRDBmRLWZgsiFgVVqiaOq/f98=,tag:mavORFlVIjt0doVCyXRElg==,type:str]
+                - ENC[AES256_GCM,data:AMHYVsG+3K37fQp/+Fc=,iv:Qou6DVsPVu2T50IZmJH32QCGIvgXJ3mklnGTGJqP/fg=,tag:41lj5HYy/pNHCzgS6rgEYQ==,type:str]
+                - ENC[AES256_GCM,data:WfT1RudfHqmqBWVvgA==,iv:r46IyEe5KsJ1baNVxkvs+hV/Z/flvRi+U0AkNgglz9k=,tag:j49A6TvZVIikLraSgZZRfA==,type:str]
+                - ENC[AES256_GCM,data:GboZjkngSmpdHbsH+LA=,iv:3P/LiJAosY6R+mZYUT/gcBdMX3hWX5wL8/mSQWQ3P1s=,tag:DiLojqBeZNWfVDqf9+/EVw==,type:str]
+                - ENC[AES256_GCM,data:5wfteLS7QA==,iv:v0VJ/jJFYkAVU1FWfC3csTU6hQ4UGyITxP1fvgnR9F0=,tag:r1rs6qoWD9ZOU6GkDjGZSw==,type:str]
+                - ENC[AES256_GCM,data:NU/EluWKq2Xi,iv:EouEucz5mSNUlSlaziamBHFpM4eISE2vL66V8vIQI/s=,tag:jAl2Mot/GZFd4Yu55WSVOw==,type:str]
+                - ENC[AES256_GCM,data:hddrMMWp33M=,iv:IMtkQQ+LEBbmPUSz5AP/K73DTdEpH6ENcihMk1LGZ4k=,tag:KfTJFqKrPeqbslsRFlISFw==,type:str]
+            max_spider_size: ENC[AES256_GCM,data:H63R,iv:5GPFxpNqofe9gmzEWyhK1iiHaLTtFHG4osiAEeQcvYw=,tag:tmnf0ETz7VuIY78GN3fRqQ==,type:str]
+            oidc_providers:
+                - idp_id: ENC[AES256_GCM,data:rCJ68FphDPc=,iv:R46NhZ4vCU+ZQiA5aviDZGU0J4phuBv8C3VurBm6Yfs=,tag:40QEbhvdWfEea7IBv1s8EA==,type:str]
+                  idp_name: ENC[AES256_GCM,data:bfV5IfhglQ==,iv:Smky2E5vCnp/y3ZBaM8KKSLxP4MWvOUHpDmrYe7/gGU=,tag:N4pk6MCT6ktAxAD/IYMhUw==,type:str]
+                  issuer: ENC[AES256_GCM,data:k98lFyvNW4KDlQhgW1jr8Wc28jZ41qXYOICYB/PKLNhKQuB8qwvUpAnygwSHojMCd15HUFVfd8hgetIw,iv:EjSrjZluv6TlDa3dGR4BTwDaQzC1Utth0WQI2EFQRpg=,tag:cmb6TyVI22mljRaNFPHKrg==,type:str]
+                  client_id: ENC[AES256_GCM,data:Wqq7fNbgrue1XCA=,iv:p59wB/Avgw5iZrUIkmMjBq/V/fFzG2cd6hf7+R6+gVk=,tag:cfN/4SUfrPmT+H8NOd9cRw==,type:str]
+                  client_secret: ENC[AES256_GCM,data:aqM46KQQ3eSIz6RHp662ttq1TgJSeQz9dTiBnOycBEQ=,iv:t7d0n2a1p7Um54EobxXmcTotymUEdguOuqzgzXZpzdk=,tag:mH9dn4le9VxDoAmMT6ep3Q==,type:str]
+                  scopes:
+                    - ENC[AES256_GCM,data:sG7jWfGV,iv:MYOknIP/N5B5ANWzV8CA3H688hguYh9urZnBs0+sYBM=,tag:Oa0/8vMJsrdnQC+rJNuacQ==,type:str]
+                    - ENC[AES256_GCM,data:XA7dcd4ktw==,iv:y81jidW50mvW6zIlC7Cr09iwDVtOI8zc/ib0/PW7HPY=,tag:sL/ei66Ktfagd/auG+GZCw==,type:str]
+                  allow_existing_users: ENC[AES256_GCM,data:BgBzlw==,iv:oUF838nl4Me/sXIVkZesa0F1D5cMzsDtNloi1u2IsoE=,tag:zxDVaST/GJNf6yR10Xq7uA==,type:bool]
+                  user_mapping_provider:
+                    config:
+                        localpart_template: ENC[AES256_GCM,data:dS9n9czPP142xKOdnZJnRZWtVCvRtI/cMLfn7c8=,iv:roCEEivw20CmEsyl6qp6fyIXzErtPQbAxiWVmhjXA9U=,tag:GrEMvqHnwhpJCj9zWKB9Iw==,type:str]
+                        display_name_template: ENC[AES256_GCM,data:/N566/Ssxc4t9gToyzYb,iv:F54PehLh05M8zFdMqeTm3dPiSNBQTmuF+7rtDhlAJl0=,tag:pp+7Z2l+GGlfQTM4nnZzKw==,type:str]
+                  attribute_requirements:
+                    - attribute: ENC[AES256_GCM,data:ejDMyzE=,iv:YuJMgflJ5WK/IauLtJw2pvI/Yw8dtuRJkBgsKwdEc/k=,tag:rjl/7sVuscNc+t84iBT5Jg==,type:str]
+                      value: ENC[AES256_GCM,data:AhKGmQ==,iv:gzDymgNtaTF8ytOZfcO6zyaJLWyHfmeKjFp8Lmh+v6w=,tag:vQ5na4Dj672IoXZPkUp5MA==,type:str]
        persistence:
            size: 20Gi
        signingkey:
@@ -80,8 +80,8 @@ sops:
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2022-04-19T15:47:33Z"
-    mac: ENC[AES256_GCM,data:euxIrXjyaCKhZnw25gS9iWn6vw/MKQRR8kJmqdBba3QA8GfErYzPUaWTvRJ+huk89R13EDzo/dQ/WG+UNKMG2081O2Xqi8dpt/YkIv5AJsz/x8KYQj28Mor7J2q1PwG51cKIICCFS16Z2Bb37GPb6Rmn/Gt2AWOGka1ombPzkcE=,iv:AnamspByIyzyHeT1yJU/FBYTV4Wh/6m78hcsXdwjwxA=,tag:dr5bBW6aIaK+WoYNT0IAPg==,type:str]
+    lastmodified: "2022-04-19T16:03:35Z"
+    mac: ENC[AES256_GCM,data:Ee06x3lm+B0ZsmWusJV4oUU1Mv/Xj3YXI7TZoCNmxQ2Jqe7fNb2n/oDgOUrfFKOEoi8Bx7kwXi22epomTmm6Oi15pIyR/lauK9LJUfLqG07PQWXtdGGRirxTG3OAyoFDUTSg9yjDu1F2NbpBkvL2GO/bKik000F2XCKslN/wHXI=,iv:qVW2YYIrQU47aoSzIphnLuEk4zGcI83SZ+XeuXwsyqA=,tag:7DgEvCknEBaoiURdGgn5JA==,type:str]
    pgp:
        - created_at: "2022-04-19T15:47:33Z"
          enc: |-