WPB-4262: Fixing tests for inbound federator calls.

charts/federator/templates/tests/configmap.yaml

@@ -26,3 +26,5 @@ data:
       host: federation-test-helper.{{ .Release.Namespace }}.svc.cluster.local
       port: 443
     originDomain: federation-test-helper.{{ .Release.Namespace }}.svc.cluster.local
+    backendTwo:
+      originDomain: federation-test-helper.{{ .Release.Namespace }}-fed2.svc.cluster.local

charts/integration/templates/configmap.yaml

@@ -109,6 +109,9 @@ data:
 
       originDomain: federation-test-helper.{{ .Release.Namespace }}-fed2.svc.cluster.local
 
+      backendTwo:
+        originDomain: federation-test-helper.{{ .Release.Namespace }}-fed2.svc.cluster.local
+
     dynamicBackends:
       {{- range $name, $dynamicBackend := .Values.config.dynamicBackends }}
       {{ $name }}:

docs/src/developer/developer/pr-guidelines.md

@@ -81,7 +81,8 @@ Add to `charts/nginz/values.yaml`, under the `galley` section:
 If a PR adds new configuration options for say brig, the following files need to be edited:
 
 * [ ] The parser under `services/brig/src/Brig/Options.hs`
-* [ ] The integration test config: `services/brig/brig.integration.yaml`
+* [ ] The legacy integration test config: `services/brig/brig.integration.yaml`
+* [ ] The new integration test config: `charts/integration/templates/configmap.yaml`
 * [ ] The charts: `charts/brig/templates/configmap.yaml`
 * [ ] The default values: `charts/brig/values.yaml`
 * [ ] The values files for CI: `hack/helm_vars/wire-server/values.yaml.gotmpl`

services/federator/test/integration/Test/Federator/IngressSpec.hs

@@ -145,7 +145,7 @@ inwardBrigCallViaIngressWithSettings ::
 inwardBrigCallViaIngressWithSettings sslCtx requestPath payload =
   do
     Endpoint ingressHost ingressPort <- nginxIngress . view teTstOpts <$> input
-    originDomain <- originDomain . view teTstOpts <$> input
+    originDomain <- (._teTstOpts.backendTwo.originDomain) <$> input @TestEnv
     let target = SrvTarget (cs ingressHost) ingressPort
         headers = [(originDomainHeaderName, Text.encodeUtf8 originDomain)]
     mgr <- liftToCodensity . liftIO $ http2ManagerWithSSLCtx sslCtx

services/federator/test/integration/Test/Federator/InwardSpec.hs

@@ -75,9 +75,11 @@ spec env =
         _ <- putHandle brig (userId user) hdl
 
         let expectedProfile = (publicProfile user UserLegalHoldNoConsent) {profileHandle = Just (Handle hdl)}
+        backendTwoDomain <- toByteString' <$> asks (._teTstOpts.backendTwo.originDomain)
         bdy <-
           responseJsonError
-            =<< inwardCall "/federation/brig/get-user-by-handle" (encode hdl)
+            -- Explicitly make the call from a domain outside of Federator's own domain
+            =<< inwardCallWithOriginDomain backendTwoDomain "/federation/brig/get-user-by-handle" (encode hdl)
               <!! const 200 === statusCode
         liftIO $ bdy `shouldBe` expectedProfile
 
@@ -126,7 +128,7 @@ spec env =
     -- and "IngressSpec".
     it "rejectRequestsWithoutClientCertInward" $
       runTestFederator env $ do
-        originDomain <- originDomain <$> view teTstOpts
+        originDomain <- (.originDomain) <$> view teTstOpts
         hdl <- randomHandle
         inwardCallWithHeaders
           "federation/brig/get-user-by-handle"
@@ -160,7 +162,7 @@ inwardCall ::
   LBS.ByteString ->
   m (Response (Maybe LByteString))
 inwardCall requestPath payload = do
-  originDomain :: Text <- originDomain <$> view teTstOpts
+  originDomain :: Text <- (.originDomain) <$> view teTstOpts
   inwardCallWithOriginDomain (toByteString' originDomain) requestPath payload
 
 inwardCallWithOriginDomain ::

services/federator/test/integration/Test/Federator/Util.hs

@@ -108,12 +108,18 @@ data IntegrationConfig = IntegrationConfig
     cargohold :: Endpoint,
     federatorExternal :: Endpoint,
     nginxIngress :: Endpoint,
-    originDomain :: Text
+    originDomain :: Text,
+    backendTwo :: BackendTwoConfig
   }
   deriving (Show, Generic)
 
-deriveFromJSON deriveJSONOptions ''IntegrationConfig
+newtype BackendTwoConfig = BackendTwoConfig
+  { originDomain :: Text
+  }
+  deriving (Show, Generic)
 
+deriveFromJSON deriveJSONOptions ''BackendTwoConfig
+deriveFromJSON deriveJSONOptions ''IntegrationConfig
 makeLenses ''TestEnv
 
 -- | Call 'mkEnv' with options from config files.