Skip to content

Commit

Permalink
Fix federator tests (#2298)
Browse files Browse the repository at this point in the history
* Renew integration test certificate

* Allow example.com search in integration tests
  • Loading branch information
pcapriotti authored Apr 21, 2022
1 parent a6fd08f commit 7fe73c7
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 59 deletions.
1 change: 1 addition & 0 deletions changelog.d/5-internal/fix-federator-tests
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix federator integration tests
34 changes: 17 additions & 17 deletions deploy/services-demo/conf/nginz/integration-ca.pem
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDAjCCAeqgAwIBAgIUJ+1IpVKexlyGhgZaOZi2Ka01Q2QwDQYJKoZIhvcNAQEL
BQAwGTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5jb20wHhcNMjEwMzA5MjA0MDAwWhcN
MjYwMzA4MjA0MDAwWjAZMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNvbTCCASIwDQYJ
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcH/9ndmK2kA6QoqT1bWEfuwTbuOwIJ
A+5BbxoaMSYQz+wrFFXaalOYLFVaPJL4ZIeJNbbCcrllnip+qYjUl8VAhSHPNCpF
D4LGH+b/kQV6+9xXYHsx0DYTYtHUWQofmBv4Te6Tl+OvgdD8isFBDE3lKos5JhVO
bSCzzDMgwBsdQadiwaCYuLvuPH80wzGlkl5wlRdOBvfgOCw88NHz3QzICixIlyfB
j6D7NHDbOjCaBQ4KXoM8tZr+1+6LZkVU2mn2RneE06OpRgtlVUkubaY+EH8/z8cg
iyu7X+dN9xzVhCcwMOos0V6fOPVX3qx7mBGz/tpXsTZPbZeOQbBYZK8CAwEAAaNC
MEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFLJ
Dc8PpKsUGFi33sK+r5Xgi97XMA0GCSqGSIb3DQEBCwUAA4IBAQBtiav0b3r4k3CC
N1DRNNpcvpHR8odPJkxR2r0kCLRqwu2YDxQYxCK5wCPNcpzGDd6nyg/nLWBzl4Vd
UwBIUPSVavDAeQ8VL0YNCNhQlL4x6z5rT1aSRdp0VlRnnl4zjilWSN/IB5Y61i0Q
Ww7Sd5T9hZUCOJm5bAeLo4+cxkOwN6jdT2wmLtgFkj4CFVvS/8nL8ZwC1qvt3mLs
E8q7/KelKgddU5AET8Viim20m6ZxgGNWIX33LBiJ3Rg3QuJMnWyfBI6PCORRrdTb
0AH/F3iUKQL8Zv6twr++S7VPeDllVgEXkq457ZBi2qJPikL5cUprV/0bWQxgf4+1
L70TaNMy
MIIDAjCCAeqgAwIBAgIUBTz/WN3KPdXZnUyhrinjprCSy2QwDQYJKoZIhvcNAQEL
BQAwGTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5jb20wHhcNMjIwNDIwMTMyMDAwWhcN
MjcwNDE5MTMyMDAwWjAZMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNvbTCCASIwDQYJ
KoZIhvcNAQEBBQADggEPADCCAQoCggEBALfeLu+by+cSkuhiB2eJJpFb0OUTNBzT
YiNK5yfLhHhfQRUkWJQMn9+Zis+thgJDUOuiZ7A6OaDNGNRnlJL62Wz7OgpUFWdt
kdHvmRK+rfAbYeCTOjTWTRBbMrqmRX1WO6tqn6EBttIcS4ND+Bl0tjpf2i8JR+AV
37yHuj/zoBtWHtEFhkCs2vYS09KWuYYBaaj90QKt16f1+Mp3s6OUreB/YzxsCb7d
C4aPPKrloBcI/HZu71AYiQb6WPO1LjyMFMvpYz/ty6V+l69tupYIBJUyoZ+mrY2F
XemRd/Xv3HcJRCBrwx70gER5XNg/IO5vAuRQ9DZqsbEsZApArSbM9RMCAwEAAaNC
MEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFCiX
sxgN51cGwv39O8DGk6bVuL4aMA0GCSqGSIb3DQEBCwUAA4IBAQBvQU5dywshZbUp
8/MJI36hrI3IGsf9Asc9Yb3g9Zdc1npWY7F4Mtb6wsaQt1QUWgGcZ2Om6aYQu2iH
TN5a7D1Lxm99BgSLBWeGky/Wgl3XaGKV/2ch9n2eYyz1ukiOF1yvghsNovBvQF11
nnHLTKZQLtEvawicYB/wdRJOiGp30Ze8DjOeoiPEHHolQa/a1DFlO58tPU1TAr+b
BLmxIEPP6BiIbZHZVQY8aosITMqvY1MCZKTtlXxzRZpxNfQNPYAVjA9D/UWfxpPS
b45eCIIQmctfL5smaY32QFuYsmqOH6OiVm7wm/hkGZCTqfumPR7MpJmJ4LYhpSC4
IZ1eInXn
-----END CERTIFICATE-----
50 changes: 25 additions & 25 deletions deploy/services-demo/conf/nginz/integration-leaf-key.pem
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
34 changes: 17 additions & 17 deletions deploy/services-demo/conf/nginz/integration-leaf.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
-----BEGIN CERTIFICATE-----
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
-----END CERTIFICATE-----
3 changes: 3 additions & 0 deletions services/brig/brig.integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ optSettings:
# Remember to keep it the same in Galley.
setFederationDomain: example.com
setFeatureFlags: # see #RefConfigOptions in `/docs/reference`
setFederationDomainConfigs:
- domain: example.com
search_policy: full_search

logLevel: Warn
# ^ NOTE: We log too much in brig, if we set this to Info like other services, running tests
Expand Down

0 comments on commit 7fe73c7

Please sign in to comment.