Merge pull request #637 from alphagov/timeout

Apply timeout on web Google calls

Author: sihugh

app/services/discovery_engine/clients.rb

@@ -3,15 +3,19 @@ module Clients
   module_function
 
     def completion_service
-      @completion_service ||= Google::Cloud::DiscoveryEngine.completion_service(version: :v1)
+      @completion_service ||= Google::Cloud::DiscoveryEngine.completion_service(version: :v1) do |config|
+        config.timeout = 1
+      end
     end
 
     def document_service
       @document_service ||= Google::Cloud::DiscoveryEngine.document_service(version: :v1)
     end
 
     def search_service
-      @search_service ||= Google::Cloud::DiscoveryEngine.search_service(version: :v1)
+      @search_service ||= Google::Cloud::DiscoveryEngine.search_service(version: :v1) do |config|
+        config.timeout = 4
+      end
     end
 
     def user_event_service

spec/services/discovery_engine/clients_spec.rb

@@ -0,0 +1,41 @@
+RSpec.describe DiscoveryEngine::Clients do
+  after do
+    described_class.instance_variable_set(:@completion_service, nil)
+    described_class.instance_variable_set(:@search_service, nil)
+  end
+
+  shared_examples "a client with timeout configured" do |service_name, timeout|
+    let(:config) { double("config") }
+    let(:client) { double("client") }
+
+    before do
+      allow(config).to receive(:timeout=)
+      allow(Google::Cloud::DiscoveryEngine).to receive(service_name) do |**_kwargs, &block|
+        block.call(config) if block
+        client
+      end
+    end
+
+    it "initialises the client with the v1 API version" do
+      subject
+      expect(Google::Cloud::DiscoveryEngine).to have_received(service_name).with(version: :v1)
+    end
+
+    it "configures the client with a timeout" do
+      subject
+      expect(config).to have_received(:timeout=).with(timeout)
+    end
+  end
+
+  describe ".search_service with 3 second timeout" do
+    subject { described_class.search_service }
+
+    include_examples "a client with timeout configured", :search_service, 4
+  end
+
+  describe ".completion_service with one second timeout" do
+    subject { described_class.completion_service }
+
+    include_examples "a client with timeout configured", :completion_service, 1
+  end
+end