Merge branch 'main' into fix/remove-beta-libs

ONSdigital · Aug 14, 2022 · df7ba85 · df7ba85
2 parents 4897e37 + 9db75cb
commit df7ba85
Show file tree

Hide file tree

Showing 56 changed files with 362 additions and 3,594 deletions.
diff --git a/Makefile b/Makefile
@@ -1,40 +1,15 @@
-example:
-	go build -o ./example/example example/main.go
-	go run -race example/main.go
-.PHONY: example
-
-test: test-v2
-	go test -race -cover ./...
-.PHONY: test
-
-test-v2:
-	cd v2 && make test
-.PHONY: test-v2
-
-clean:
-	rm example/example
+test:
+	go test -count=1 -v -race -cover ./...
 .PHONY: test
 
-audit: audit-v2
+audit:
 	go list -json -m all | nancy sleuth
 .PHONY: audit
 
-audit-v2:
-	cd v2 && make audit
-.PHONY: audit-v2
-
-build: build-v2
+build:
 	go build ./...
 .PHONY: build
 
-build-v2:
-	cd v2 && make build
-.PHONY: build-v2
-
-lint: lint-v2
+lint:
 	exit
 .PHONY: lint
-
-lint-v2:
-	cd v2 && make lint
-.PHONY: lint-v2
diff --git a/README.md b/README.md
diff --git a/auth/dataset_permissions_request_builder.go b/auth/dataset_permissions_request_builder.go
diff --git a/auth/dataset_permissions_request_builder_test.go b/auth/dataset_permissions_request_builder_test.go