diff --git a/app/clients/discovery_engine/control_client.rb b/app/clients/discovery_engine/control_client.rb index 56a1f741..d5df3556 100644 --- a/app/clients/discovery_engine/control_client.rb +++ b/app/clients/discovery_engine/control_client.rb @@ -5,7 +5,7 @@ class ControlClient def create(control) discovery_engine_client.create_control( control: control.to_discovery_engine_control, - control_id: control.discovery_engine_id, + control_id: control.remote_resource_id, parent: control.parent.name, ) rescue Google::Cloud::Error => e diff --git a/app/models/concerns/discovery_engine_nameable.rb b/app/models/concerns/discovery_engine_nameable.rb index f583e174..dcd9c3b6 100644 --- a/app/models/concerns/discovery_engine_nameable.rb +++ b/app/models/concerns/discovery_engine_nameable.rb @@ -5,12 +5,12 @@ # projects/{project}/locations/{location}/collections/{collection_id}/engines/ # {engine_id}/controls/{control_id} # -# Requires the including class to implement `#discovery_engine_id`, and optionally `#parent` if the +# Requires the including class to implement `#remote_resource_id`, and optionally `#parent` if the # parent resource is not the default collection. module DiscoveryEngineNameable # The name (fully qualified path) of this Discovery Engine resource on GCP def name - [parent_name, resource_path_fragment, discovery_engine_id].join("/") + [parent_name, resource_path_fragment, remote_resource_id].join("/") end private diff --git a/app/models/control.rb b/app/models/control.rb index bbaed379..a443ed0b 100644 --- a/app/models/control.rb +++ b/app/models/control.rb @@ -37,7 +37,7 @@ def parent end # The ID of the resource on Discovery Engine - def discovery_engine_id + def remote_resource_id "search-admin-#{id}" end end diff --git a/app/models/data_store.rb b/app/models/data_store.rb index 8094abaf..45146058 100644 --- a/app/models/data_store.rb +++ b/app/models/data_store.rb @@ -12,17 +12,17 @@ class DataStore # The ID of the default datastore created through Terraform in `govuk_infrastructure` DEFAULT_DATA_STORE_ID = "govuk_content".freeze - attr_reader :discovery_engine_id + attr_reader :remote_resource_id def self.default new(DEFAULT_DATA_STORE_ID) end - def initialize(discovery_engine_id) - @discovery_engine_id = discovery_engine_id + def initialize(remote_resource_id) + @remote_resource_id = remote_resource_id end def ==(other) - discovery_engine_id == other.discovery_engine_id + remote_resource_id == other.remote_resource_id end end diff --git a/app/models/engine.rb b/app/models/engine.rb index a44d19ee..0cec4cc5 100644 --- a/app/models/engine.rb +++ b/app/models/engine.rb @@ -14,17 +14,17 @@ class Engine # The ID of the default engine created through Terraform in `govuk-infrastructure` DEFAULT_ENGINE_ID = "govuk".freeze - attr_reader :discovery_engine_id + attr_reader :remote_resource_id def self.default new(DEFAULT_ENGINE_ID) end - def initialize(discovery_engine_id) - @discovery_engine_id = discovery_engine_id + def initialize(remote_resource_id) + @remote_resource_id = remote_resource_id end def ==(other) - discovery_engine_id == other.discovery_engine_id + remote_resource_id == other.remote_resource_id end end diff --git a/spec/models/control_spec.rb b/spec/models/control_spec.rb index 68a5c0ca..b870c764 100644 --- a/spec/models/control_spec.rb +++ b/spec/models/control_spec.rb @@ -34,9 +34,9 @@ let(:action) { build(:control_boost_action) } - describe "#discovery_engine_id" do + describe "#remote_resource_id" do it "builds an ID from the control's database ID" do - expect(control.discovery_engine_id).to eq("search-admin-42") + expect(control.remote_resource_id).to eq("search-admin-42") end end