Remove directory-mock dir, align everything with directory schema

Author: kurtnordstrom

.github/dependabot.yml

@@ -5,7 +5,6 @@ updates:
     directories:
       - "/broker"
       - "/directory"
-      - "/directory-mock"
       - "/httpclient"
       - "/illmock"
       - "/iso18626"

Makefile

@@ -1,6 +1,6 @@
 GO ?= go
-SUBDIRS := testutil iso18626 ncip directory directory-mock sru marcxml httpclient zoom illmock broker
-TOOL_SUBDIRS := iso18626 ncip directory directory-mock sru marcxml broker
+SUBDIRS := testutil iso18626 ncip directory sru marcxml httpclient zoom illmock broker
+TOOL_SUBDIRS := iso18626 ncip directory sru marcxml broker
 TOOL_SUBDIR_TARGETS := $(TOOL_SUBDIRS:%=%-tools-update)
 GOALS := $(or $(MAKECMDGOALS),all)
 SUBDIR_GOALS := $(filter-out tools-update,$(GOALS))

broker/Dockerfile

@@ -8,7 +8,6 @@ WORKDIR /app
 COPY broker/go.mod broker/go.sum ./broker/
 COPY directory/go.mod directory/go.sum ./directory/
 COPY illmock/go.mod illmock/go.sum ./illmock/
-COPY directory-mock/go.mod directory-mock/go.sum ./directory-mock/
 COPY httpclient/go.mod httpclient/go.sum ./httpclient/
 COPY iso18626/go.mod iso18626/go.sum ./iso18626/
 COPY marcxml/go.mod marcxml/go.sum ./marcxml/
@@ -21,7 +20,6 @@ RUN go work init \
     ./broker \
     ./directory \
     ./illmock \
-    ./directory-mock \
     ./httpclient \
     ./iso18626 \
     ./marcxml \

broker/go.mod

@@ -16,7 +16,6 @@ require (
 
 replace (
 	github.com/indexdata/crosslink/directory => ../directory
-	github.com/indexdata/crosslink/directory-mock => ../directory-mock
 	github.com/indexdata/crosslink/httpclient => ../httpclient
 	github.com/indexdata/crosslink/illmock => ../illmock
 	github.com/indexdata/crosslink/iso18626 => ../iso18626
@@ -84,7 +83,6 @@ require (
 	github.com/google/cel-go v0.28.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/indexdata/crosslink/directory-mock v0.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect

broker/test/catalog/holdings_test.go

@@ -110,7 +110,7 @@ func TestMain(m *testing.M) {
 	test.Expect(os.Setenv("PEER_URL", brokerUrl), "failed to set peer URL")
 	app.AVAILABILITY_ADAPTER = catalog.LookupAdapterZoom
 	app.DIRECTORY_ADAPTER = "api"
-	app.DIRECTORY_API_URL = "http://localhost:" + strconv.Itoa(mockPort) + "/directory/entries"
+	app.DIRECTORY_API_URL = "http://localhost:" + strconv.Itoa(mockPort) + "/rsdir/entries"
 	app.HOLDINGS_ADAPTER = "consortium"
 	app.CONSORTIUM_SYMBOL = "ISIL:GVIC"
 

bruno/docker-compose-reservoir.yml

@@ -37,7 +37,7 @@ services:
       HOLDINGS_ISXN_LOOKUP: "true"
       SRU_URL: http://reservoir:8082/reservoir/sru
       DIRECTORY_ADAPTER: api
-      DIRECTORY_API_URL: http://illmock:8081/directory/entries
+      DIRECTORY_API_URL: http://illmock:8081/rsdir/entries
       TENANT_TO_SYMBOL: "ISIL:US-{tenant}"
     ports:
       - "8080:8080"

bruno/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       DB_PROVISION: "true"
       DB_MIGRATE: "true"
       DIRECTORY_ADAPTER: api
-      DIRECTORY_API_URL: http://illmock:8081/directory/entries
+      DIRECTORY_API_URL: http://illmock:8081/rsdir/entries
       TENANT_TO_SYMBOL: "ISIL:US-{tenant}"
     ports:
       - "8080:8080"