diff --git a/api/api_test.go b/api/api_test.go index b22c8547..7c69dcd4 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/ONSdigital/dis-bundle-api/store" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" "github.com/gorilla/mux" . "github.com/smartystreets/goconvey/convey" diff --git a/api/auth_test.go b/api/auth_test.go index 722874d2..d7ccf27b 100644 --- a/api/auth_test.go +++ b/api/auth_test.go @@ -9,7 +9,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/apierrors" "github.com/ONSdigital/dis-bundle-api/store" authorisationMock "github.com/ONSdigital/dp-authorisation/v2/authorisation/mock" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" "github.com/ONSdigital/dp-permissions-api/sdk" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" . "github.com/smartystreets/goconvey/convey" diff --git a/api/bundle_events_test.go b/api/bundle_events_test.go index 00cc6397..29f552bd 100644 --- a/api/bundle_events_test.go +++ b/api/bundle_events_test.go @@ -13,7 +13,7 @@ import ( slackMock "github.com/ONSdigital/dis-bundle-api/slack/mocks" "github.com/ONSdigital/dis-bundle-api/store" storetest "github.com/ONSdigital/dis-bundle-api/store/datastoretest" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" . "github.com/smartystreets/goconvey/convey" ) diff --git a/api/bundle_update_test.go b/api/bundle_update_test.go index b4bc0be5..9be7eda4 100644 --- a/api/bundle_update_test.go +++ b/api/bundle_update_test.go @@ -14,7 +14,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/models" "github.com/ONSdigital/dis-bundle-api/store" storetest "github.com/ONSdigital/dis-bundle-api/store/datastoretest" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPIModels "github.com/ONSdigital/dp-permissions-api/models" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" diff --git a/api/bundles_test.go b/api/bundles_test.go index 45d50319..131d2096 100644 --- a/api/bundles_test.go +++ b/api/bundles_test.go @@ -28,8 +28,8 @@ import ( "github.com/ONSdigital/dp-authorisation/v2/authorisation" authorisationMock "github.com/ONSdigital/dp-authorisation/v2/authorisation/mock" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" dprequest "github.com/ONSdigital/dp-net/v3/request" permissionsAPIModels "github.com/ONSdigital/dp-permissions-api/models" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" diff --git a/api/contents_test.go b/api/contents_test.go index 08e730d9..d0ffc035 100644 --- a/api/contents_test.go +++ b/api/contents_test.go @@ -15,8 +15,8 @@ import ( "github.com/ONSdigital/dis-bundle-api/store" storetest "github.com/ONSdigital/dis-bundle-api/store/datastoretest" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" . "github.com/smartystreets/goconvey/convey" ) diff --git a/application/application.go b/application/application.go index bde772dd..6f2f9214 100644 --- a/application/application.go +++ b/application/application.go @@ -19,7 +19,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/store" "github.com/ONSdigital/dis-bundle-api/utils" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" "github.com/ONSdigital/log.go/v2/log" ) diff --git a/application/application_test.go b/application/application_test.go index 5b0fd2f8..b9aa0a9e 100644 --- a/application/application_test.go +++ b/application/application_test.go @@ -17,8 +17,8 @@ import ( storetest "github.com/ONSdigital/dis-bundle-api/store/datastoretest" "github.com/ONSdigital/dis-bundle-api/utils" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPIMocks "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPIMocks "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPIModels "github.com/ONSdigital/dp-permissions-api/models" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" diff --git a/application/state_machine.go b/application/state_machine.go index c7070a86..589ad318 100644 --- a/application/state_machine.go +++ b/application/state_machine.go @@ -7,7 +7,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/apierrors" "github.com/ONSdigital/dis-bundle-api/models" "github.com/ONSdigital/dis-bundle-api/store" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" ) type StateMachine struct { diff --git a/application/state_machine_test.go b/application/state_machine_test.go index 2499e712..e1cd56a2 100644 --- a/application/state_machine_test.go +++ b/application/state_machine_test.go @@ -13,8 +13,8 @@ import ( slackMock "github.com/ONSdigital/dis-bundle-api/slack/mocks" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks" . "github.com/smartystreets/goconvey/convey" diff --git a/features/steps/bundle_component.go b/features/steps/bundle_component.go index bd541546..9da373fc 100644 --- a/features/steps/bundle_component.go +++ b/features/steps/bundle_component.go @@ -21,8 +21,8 @@ import ( componenttest "github.com/ONSdigital/dp-component-test" "github.com/ONSdigital/dp-component-test/utils" datasetAPIModels "github.com/ONSdigital/dp-dataset-api/models" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" "github.com/ONSdigital/dp-healthcheck/healthcheck" mongodriver "github.com/ONSdigital/dp-mongodb/v3/mongodb" permissionsAPIModels "github.com/ONSdigital/dp-permissions-api/models" diff --git a/go.mod b/go.mod index 1df146f8..61f8c992 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ module github.com/ONSdigital/dis-bundle-api -go 1.26.0 +go 1.26.4 require ( - github.com/ONSdigital/dp-api-clients-go/v2 v2.274.2 - github.com/ONSdigital/dp-authorisation/v2 v2.34.0 + github.com/ONSdigital/dp-api-clients-go/v2 v2.282.0 + github.com/ONSdigital/dp-authorisation/v2 v2.36.0 github.com/ONSdigital/dp-component-test v1.4.8 - github.com/ONSdigital/dp-dataset-api v1.113.0 + github.com/ONSdigital/dp-dataset-api v1.122.0 github.com/ONSdigital/dp-healthcheck v1.6.4 - github.com/ONSdigital/dp-mongodb/v3 v3.12.0 - github.com/ONSdigital/dp-net/v3 v3.10.0 - github.com/ONSdigital/dp-permissions-api v1.10.1 + github.com/ONSdigital/dp-mongodb/v3 v3.13.0 + github.com/ONSdigital/dp-net/v3 v3.13.0 + github.com/ONSdigital/dp-permissions-api v1.15.1 github.com/ONSdigital/log.go/v2 v2.5.2 - github.com/cucumber/godog v0.15.1 + github.com/cucumber/godog v0.16.0 github.com/gofrs/uuid v4.4.0+incompatible github.com/golang-jwt/jwt/v4 v4.5.2 github.com/google/go-cmp v0.7.0 @@ -21,7 +21,7 @@ require ( github.com/justinas/alice v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/pkg/errors v0.9.1 - github.com/slack-go/slack v0.17.3 + github.com/slack-go/slack v0.29.0 github.com/smartystreets/goconvey v1.8.1 github.com/testcontainers/testcontainers-go v0.44.0 github.com/testcontainers/testcontainers-go/modules/mongodb v0.44.0 @@ -44,8 +44,8 @@ require ( github.com/containerd/log v0.1.0 // indirect github.com/containerd/platforms v0.2.1 // indirect github.com/cpuguy83/dockercfg v0.3.2 // indirect - github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect - github.com/cucumber/messages/go/v21 v21.0.1 // indirect + github.com/cucumber/gherkin/go/v42 v42.0.0 // indirect + github.com/cucumber/messages/go/v34 v34.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/distribution/reference v0.6.0 // indirect @@ -55,18 +55,18 @@ require ( github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/ebitengine/purego v0.10.1 // indirect - github.com/fatih/color v1.18.0 // indirect + github.com/fatih/color v1.19.0 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect github.com/go-avro/avro v0.0.0-20171219232920-444163702c11 // indirect github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b // indirect - github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/gobwas/httphead v0.1.0 // indirect github.com/gobwas/pool v0.2.1 // indirect github.com/gobwas/ws v1.4.0 // indirect github.com/golang/snappy v1.0.0 // indirect - github.com/gopherjs/gopherjs v1.17.2 // indirect + github.com/gopherjs/gopherjs v1.21.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect @@ -84,8 +84,8 @@ require ( github.com/klauspost/compress v1.18.7 // indirect github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect github.com/magiconair/properties v1.8.10 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-colorable v0.1.15 // indirect + github.com/mattn/go-isatty v0.0.22 // indirect github.com/maxcnunes/httpfake v1.2.4 // indirect github.com/mdelapenya/tlscert v0.2.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect @@ -129,7 +129,7 @@ require ( go.opentelemetry.io/otel/trace v1.44.0 // indirect golang.org/x/crypto v0.54.0 // indirect golang.org/x/mod v0.38.0 // indirect - golang.org/x/net v0.56.0 // indirect + golang.org/x/net v0.57.0 // indirect golang.org/x/sync v0.22.0 // indirect golang.org/x/sys v0.47.0 // indirect golang.org/x/text v0.40.0 // indirect diff --git a/go.sum b/go.sum index 54fea584..f7594d38 100644 --- a/go.sum +++ b/go.sum @@ -8,26 +8,26 @@ github.com/IBM/sarama v1.42.1 h1:wugyWa15TDEHh2kvq2gAy1IHLjEjuYOYgXz/ruC/OSQ= github.com/IBM/sarama v1.42.1/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/ONSdigital/dp-api-clients-go/v2 v2.274.2 h1:u+0t0R9Ptsmkx/d9JHWahPjjFeBHKadn1jjAYJng60Y= -github.com/ONSdigital/dp-api-clients-go/v2 v2.274.2/go.mod h1:bLseTP21r8LCStUEeOdVPyqtrTomOFP/azPjKWW4deA= -github.com/ONSdigital/dp-authorisation/v2 v2.34.0 h1:Zc096gAh5S7PFG1LlbM/siZDvyzd7fU11dMK8X6m98k= -github.com/ONSdigital/dp-authorisation/v2 v2.34.0/go.mod h1:y3zXIX/x8baEKucG05v/PL86GtL7MAz9Eb3HcwZmuvQ= +github.com/ONSdigital/dp-api-clients-go/v2 v2.282.0 h1:9eR5jGMrJ7FIuALydLISRXefaZFnTvGxvX/ni7OlDNc= +github.com/ONSdigital/dp-api-clients-go/v2 v2.282.0/go.mod h1:vniCZ0iYfIQ5llsBigUS2khr8cSN1eXEsOKGYlopWHI= +github.com/ONSdigital/dp-authorisation/v2 v2.36.0 h1:jO0kOfBIMAIcxkuOtGj6kemVs/q9pbiEPVWGewULuxw= +github.com/ONSdigital/dp-authorisation/v2 v2.36.0/go.mod h1:5oYJyRP2t3FA/S5kcEoCNORptQMqDWnTMAkP3cQ5x6Y= github.com/ONSdigital/dp-component-test v1.4.8 h1:0EDz8FFgLM5un6oceBfvEKtXyLsZ6v4/aTTrtM+3Sc8= github.com/ONSdigital/dp-component-test v1.4.8/go.mod h1:Tb+HfUZXmJQ234GIG5vE0puV27v8WuWPURd2sEVnjCU= -github.com/ONSdigital/dp-dataset-api v1.113.0 h1:G5P4/Y6Ks1hC0fi54InRDLz8qmk6NQAkTes0mWTf1w4= -github.com/ONSdigital/dp-dataset-api v1.113.0/go.mod h1:OrS6Jf319mreFARWT1gmoTo1Q0o8AvZgT1lTJJ1Wpyo= +github.com/ONSdigital/dp-dataset-api v1.122.0 h1:OL5Ive7MY5GuNAt+d1KMi4xhe/EpuKgUL3GeCnnc94k= +github.com/ONSdigital/dp-dataset-api v1.122.0/go.mod h1:7n58xlgH6WFJ7ciJYdTfbFnjx37dcVqaefb1tVpKyOc= github.com/ONSdigital/dp-healthcheck v1.6.4 h1:FhWOuVmob36dYq7AzCdbgyf0Vk58IFitSl8y8pWJ8ck= github.com/ONSdigital/dp-healthcheck v1.6.4/go.mod h1:j3UNbGT4ZJg1chrRkPLE6YUVYCg1su3AAQ8frcBrvgc= github.com/ONSdigital/dp-kafka/v4 v4.3.0 h1:QGSB3v+ySj1VzuwG1M/BZLoA3dA/nrzYRqbmEKkqrc4= github.com/ONSdigital/dp-kafka/v4 v4.3.0/go.mod h1:XBdgWfGNQOXJCiRxWUTBiFXBsuBhwM5yQyvquHKePHY= github.com/ONSdigital/dp-mocking v0.11.0 h1:laln6e2JD4vtsYbg0cTw9ur1Xf390AUYdd85cG2UNQw= github.com/ONSdigital/dp-mocking v0.11.0/go.mod h1:oHkuukWnURnK7epY5TD5oYVkOwldR2La1D5LQBTxY0A= -github.com/ONSdigital/dp-mongodb/v3 v3.12.0 h1:lDURIMOvb0qq4hqTH37IGzcyv39/x4YiB86mKu1azdU= -github.com/ONSdigital/dp-mongodb/v3 v3.12.0/go.mod h1:0trEUsRcn7m46G8yUUjEf5V4xU9VArh3B27V+JNh2D4= -github.com/ONSdigital/dp-net/v3 v3.10.0 h1:/IF6dKThaHNpy6e+bdpkrKJQGSIjyfKSwdRXoAhOAu4= -github.com/ONSdigital/dp-net/v3 v3.10.0/go.mod h1:ur4LLCvd2xW2jpa785pElE6HB2bPvszZxdAjqv0XFGg= -github.com/ONSdigital/dp-permissions-api v1.10.1 h1:dOyPtS94CpBgS0Y1oZJy84UcKZOHkmDK+Zdg5OClEXs= -github.com/ONSdigital/dp-permissions-api v1.10.1/go.mod h1:436ej+daY+8+hNCReDvCIsI0iNRWKU/UZsxC09CRMNA= +github.com/ONSdigital/dp-mongodb/v3 v3.13.0 h1:nTb47hKUj4wI3+1Q9KxqYRr6iDfh6/xlum+T8qQJPR8= +github.com/ONSdigital/dp-mongodb/v3 v3.13.0/go.mod h1:/68EwFrtOgChAMMfaUTm3kTHe2zvB3MZtizrvz1vVxw= +github.com/ONSdigital/dp-net/v3 v3.13.0 h1:1fwK9G+f32k+NdJnzRT7EG0C9R7qcrHQs4Lah0hCczk= +github.com/ONSdigital/dp-net/v3 v3.13.0/go.mod h1:6CWNGULkexaBdw5/H4i080ufb5r4tuu/pMqWdUK9O78= +github.com/ONSdigital/dp-permissions-api v1.15.1 h1:K3wn6E0dYftpbGc10z0PjqZ965W5rjH+2dvSkagB9xI= +github.com/ONSdigital/dp-permissions-api v1.15.1/go.mod h1:sP8WfL4kg2CPbHemDuqUxI6elxs6VMr0c9bheBajGl0= github.com/ONSdigital/log.go/v2 v2.5.2 h1:V6NYtbi+thHYTwckxOXPklZUgQCNBo1/fyPPIutu4V4= github.com/ONSdigital/log.go/v2 v2.5.2/go.mod h1:KZNEweCUHD8dKwhlvoRvgd2Y2aUIuU3H9/MmbFyVzW8= github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A= @@ -58,16 +58,14 @@ github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpS github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA= github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= -github.com/cucumber/gherkin/go/v26 v26.2.0 h1:EgIjePLWiPeslwIWmNQ3XHcypPsWAHoMCz/YEBKP4GI= -github.com/cucumber/gherkin/go/v26 v26.2.0/go.mod h1:t2GAPnB8maCT4lkHL99BDCVNzCh1d7dBhCLt150Nr/0= -github.com/cucumber/godog v0.15.1 h1:rb/6oHDdvVZKS66hrhpjFQFHjthFSrQBCOI1LwshNTI= -github.com/cucumber/godog v0.15.1/go.mod h1:qju+SQDewOljHuq9NSM66s0xEhogx0q30flfxL4WUk8= -github.com/cucumber/messages/go/v21 v21.0.1 h1:wzA0LxwjlWQYZd32VTlAVDTkW6inOFmSM+RuOwHZiMI= -github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUtmYQAQPLk7w5vWsk5s= -github.com/cucumber/messages/go/v22 v22.0.0/go.mod h1:aZipXTKc0JnjCsXrJnuZpWhtay93k7Rn3Dee7iyPJjs= +github.com/cucumber/gherkin/go/v42 v42.0.0 h1:Ulh3E2awUUSSja+wonP/IOQ+ycmiZwZbgmzqk5H8JNI= +github.com/cucumber/gherkin/go/v42 v42.0.0/go.mod h1:CsaumaO2dR9XvBc6ZyiGLMhWCKtTRDxgoxqJigSjSSg= +github.com/cucumber/godog v0.16.0 h1:ezQbgItuWqZrjPUQwLJ3muwIlvzXBOfZso5QZfG7efE= +github.com/cucumber/godog v0.16.0/go.mod h1:EDUX9yCqANK+GpbftMDeu61sUDtdLuo1JJgXD2n3bbM= +github.com/cucumber/messages/go/v34 v34.2.0 h1:VCbcNOMz+f8ccjjOOx1NLBNhwvE7/X49Atc8klJa+i8= +github.com/cucumber/messages/go/v34 v34.2.0/go.mod h1:LYUPjqlTS1kS0pdkdf6sS5uirnjwiIzEGyXPezXNhL8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -88,8 +86,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY= github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= -github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= -github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= +github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE= github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc= github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -99,8 +97,8 @@ github.com/go-avro/avro v0.0.0-20171219232920-444163702c11/go.mod h1:kxj6THYP0dm github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU= github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -116,8 +114,6 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs= github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= @@ -131,8 +127,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= -github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= +github.com/gopherjs/gopherjs v1.21.0 h1:5HEGrz+XhpCchubMGzuyLuGoCTlL/yCT7sGsT5Se/dw= +github.com/gopherjs/gopherjs v1.21.0/go.mod h1:R2HIOen3IzYSzvmvkeD8WOfiLN9wueR/T5Y+6z326Ck= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -142,10 +138,8 @@ github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= github.com/hashicorp/go-memdb v1.3.5 h1:b3taDMxCBCBVgyRrS1AZVHO14ubMYZB++QpNhBg+Nyo= github.com/hashicorp/go-memdb v1.3.5/go.mod h1:8IVKKBkVe+fxFgdFOYxzQQNjz+sWCyHCdIC/+5+Vy1Y= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= @@ -160,7 +154,6 @@ github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iP github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f h1:7LYC+Yfkj3CTRcShK0KOL/w6iTiKyqqBA9a41Wnggw8= github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -183,7 +176,6 @@ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e github.com/klauspost/compress v1.18.7 h1:aUyZsS4kH3QTKurYhAOwAHxllVPnOthb3vPfnF1Ehjw= github.com/klauspost/compress v1.18.7/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -196,10 +188,10 @@ github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e h1:Q6MvJtQK/iRcRt github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= -github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY= +github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= +github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= github.com/maxcnunes/httpfake v1.2.4 h1:l7s/N7zuG6XpzG+5dUolg5SSoR3hANQxqzAkv+lREko= github.com/maxcnunes/httpfake v1.2.4/go.mod h1:rWVxb0bLKtOUM/5hN3UO1VEdEitz1hfcTXs7UyiK6r0= github.com/mdelapenya/tlscert v0.2.0 h1:7H81W6Z/4weDvZBNOfQte5GpIMo0lGYEeWbkGp5LJHI= @@ -250,22 +242,18 @@ github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4Vi github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shirou/gopsutil/v4 v4.26.6 h1:Mzr/npDtQC/xpeEuQKHZt8Zo9CmPvhTj8nkR8w5TLDs= github.com/shirou/gopsutil/v4 v4.26.6/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= -github.com/slack-go/slack v0.17.3 h1:zV5qO3Q+WJAQ/XwbGfNFrRMaJ5T/naqaonyPV/1TP4g= -github.com/slack-go/slack v0.17.3/go.mod h1:X+UqOufi3LYQHDnMG1vxf0J8asC6+WllXrVrhl8/Prk= +github.com/slack-go/slack v0.29.0 h1:ohhMNgp9DmPKiLhH/pNZV4NxhOXKgNy0SH8FzVHNerI= +github.com/slack-go/slack v0.29.0/go.mod h1:UEe+jmo9WLlwHB04qsOrTDvqM7Aa4rQL3O5wF3n0hx4= github.com/smarty/assertions v1.16.0 h1:EvHNkdRA4QHMrn75NZSoUQ/mAUXAYWfatfB01yTCzfY= github.com/smarty/assertions v1.16.0/go.mod h1:duaaFdCS0K9dnoM50iyek/eYINOZ64gbh1Xlf6LG7AI= github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/square/mongo-lock v0.0.0-20230808145049-cfcf499f6bf0 h1:wnVho7xObpxuF7Lr0146VZtfOLfbkXGcvzfFUw2LXuM= @@ -280,7 +268,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/testcontainers/testcontainers-go v0.44.0 h1:/Fwh6HY1mIikhnm9e7HwoxGycx0lzRAE0f5VQpjFxzI= @@ -348,8 +335,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= -golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/models/auth.go b/models/auth.go index 422eba46..ccdf3c97 100644 --- a/models/auth.go +++ b/models/auth.go @@ -1,7 +1,7 @@ package models import ( - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" ) diff --git a/service/initialise.go b/service/initialise.go index 12c8ebaf..c4a2adac 100644 --- a/service/initialise.go +++ b/service/initialise.go @@ -9,7 +9,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/slack" "github.com/ONSdigital/dis-bundle-api/store" "github.com/ONSdigital/dp-authorisation/v2/authorisation" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" "github.com/ONSdigital/dp-healthcheck/healthcheck" dphttp "github.com/ONSdigital/dp-net/v3/http" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" diff --git a/service/interfaces.go b/service/interfaces.go index 06116982..7c8aefe2 100644 --- a/service/interfaces.go +++ b/service/interfaces.go @@ -8,7 +8,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/slack" "github.com/ONSdigital/dis-bundle-api/store" "github.com/ONSdigital/dp-authorisation/v2/authorisation" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" "github.com/ONSdigital/dp-healthcheck/healthcheck" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" ) diff --git a/service/mock/initialiser.go b/service/mock/initialiser.go index da313541..4265a7d5 100644 --- a/service/mock/initialiser.go +++ b/service/mock/initialiser.go @@ -5,15 +5,16 @@ package mock import ( "context" + "net/http" + "sync" + "github.com/ONSdigital/dis-bundle-api/config" "github.com/ONSdigital/dis-bundle-api/service" "github.com/ONSdigital/dis-bundle-api/slack" "github.com/ONSdigital/dis-bundle-api/store" auth "github.com/ONSdigital/dp-authorisation/v2/authorisation" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" - "net/http" - "sync" ) // Ensure, that InitialiserMock does implement service.Initialiser. diff --git a/service/service.go b/service/service.go index 849b2d55..5f1cc37b 100644 --- a/service/service.go +++ b/service/service.go @@ -12,7 +12,7 @@ import ( "github.com/ONSdigital/dis-bundle-api/store" "github.com/ONSdigital/dp-api-clients-go/v2/health" auth "github.com/ONSdigital/dp-authorisation/v2/authorisation" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" dphttp "github.com/ONSdigital/dp-net/v3/http" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" "github.com/ONSdigital/log.go/v2/log" diff --git a/service/service_test.go b/service/service_test.go index d37196ee..e7406519 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -16,8 +16,8 @@ import ( storeMock "github.com/ONSdigital/dis-bundle-api/store/datastoretest" "github.com/ONSdigital/dp-authorisation/v2/authorisation" authorisationMock "github.com/ONSdigital/dp-authorisation/v2/authorisation/mock" - datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk" - datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/mocks" + datasetAPISDK "github.com/ONSdigital/dp-dataset-api/sdk/go" + datasetAPISDKMock "github.com/ONSdigital/dp-dataset-api/sdk/go/mocks" permissionsAPISDK "github.com/ONSdigital/dp-permissions-api/sdk" permissionsAPISDKMock "github.com/ONSdigital/dp-permissions-api/sdk/mocks"