Merge branch 'release/0.6.0'

ONSdigital · Mar 31, 2023 · f340946 · f340946
2 parents d69ab98 + 49e1540
commit f340946
Show file tree

Hide file tree

Showing 39 changed files with 1,751 additions and 511 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -48,13 +48,12 @@ linters:
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    - deadcode
     - depguard
     - dogsled
     - errcheck
     - gochecknoinits
     - goconst
-    - gocritic
+   # - gocritic // This will be re added once datasets uri code is enabled.
     - gocyclo
     - gofmt
     - goimports
@@ -65,12 +64,10 @@ linters:
     - ineffassign
     - nakedret
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
-    - unused
-    - varcheck
+#- unused // This will be re added once datasets uri code is enabled.
     - whitespace
     - gocognit
     - prealloc
@@ -83,6 +80,7 @@ issues:
         - errcheck
         - dupl
         - gosec
+        - typecheck
   new: false
 
 # golangci.com configuration

diff --git a/Dockerfile.concourse b/Dockerfile.concourse
@@ -1,4 +1,4 @@
-FROM onsdigital/dp-concourse-tools-ubuntu
+FROM onsdigital/dp-concourse-tools-ubuntu-20:ubuntu20.4-rc.1
 
 WORKDIR /app/
 

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ build:
 
 .PHONY: lint
 lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.0
 	golangci-lint run ./...
 
 .PHONY: debug

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ a. To check if service produced an event for content-updated Topic
 
 make test
 
-b. set ContentUpdatedTopicFlag in config as true/false
+b. set EnablePublishContentUpdatedTopic in config as true/false
 
 c. build and run the service
 go build
@@ -66,7 +66,7 @@ make produce
 Type uri (any text)
 
 e. Check the service logs if either of the following appears and there is no error in service logs   
-ContentUpdatedTopic Flag is enabled/disabled
+EnablePublishContentUpdatedTopic Flag is enabled/disabled
 
 ### Contributing
 

diff --git a/ci/build.yml b/ci/build.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.8
+    tag: 1.19.2
 
 inputs:
   - name: dp-search-data-finder

diff --git a/ci/component.yml b/ci/component.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.8
+    tag: 1.19.2
 
 inputs:
   - name: dp-search-data-finder

diff --git a/ci/lint.yml b/ci/lint.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.8
+    tag: 1.19.2
 
 inputs:
   - name: dp-search-data-finder

diff --git a/ci/unit.yml b/ci/unit.yml
@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.8
+    tag: 1.19.2
 
 inputs:
   - name: dp-search-data-finder

diff --git a/clients/clients.go b/clients/clients.go
@@ -3,14 +3,24 @@ package clients
 import (
 	"context"
 
+	datasetclient "github.com/ONSdigital/dp-api-clients-go/v2/dataset"
 	zebedeeclient "github.com/ONSdigital/dp-api-clients-go/v2/zebedee"
 	"github.com/ONSdigital/dp-healthcheck/healthcheck"
 )
 
 //go:generate moq -out mock/mockZebedeeClient.go -pkg mock . ZebedeeClient
+//go:generate moq -out mock/mockDatasetAPIClient.go -pkg mock . DatasetAPIClient
 
 // ZebedeeClient defines the zebedee client
 type ZebedeeClient interface {
 	Checker(context.Context, *healthcheck.CheckState) error
 	GetPublishedIndex(ctx context.Context, publishedIndexRequestParams *zebedeeclient.PublishedIndexRequestParams) (zebedeeclient.PublishedIndex, error)
 }
+
+// DatasetAPIClient defines the dataset-api client
+type DatasetAPIClient interface {
+	Checker(context.Context, *healthcheck.CheckState) error
+	GetDatasets(ctx context.Context, userAuthToken, serviceAuthToken, collectionID string, q *datasetclient.QueryParams) (m datasetclient.List, err error)
+	GetFullEditionsDetails(ctx context.Context, userAuthToken, serviceAuthToken, collectionID, datasetID string) (m []datasetclient.EditionsDetails, err error)
+	GetVersionMetadata(ctx context.Context, userAuthToken, serviceAuthToken, collectionID, id, edition, version string) (m datasetclient.Metadata, err error)
+}