senzing-garage · docktermj · Sep 30, 2024 · Sep 30, 2024
@@ -16,12 +16,12 @@ linters:
     - bidichk
     - bodyclose
     - contextcheck
+    - copyloopvar
     - durationcheck
     - errcheck
     - errchkjson
     - errorlint
     - exhaustive
-    - exportloopref
     - gocheckcompilerdirectives
     - gochecksumtype
     - gocritic

@@ -6,23 +6,23 @@ When issues are opened,
 this action adds appropriate labels to the issue.
 (e.g. "triage", "customer-submission")
 
-- [Add Labels Standardized GitHub action]
+- [Add Labels Standardized GitHub Action]
   - Uses: [senzing-factory/build-resources/.../add-labels-to-issue.yaml]
 
 ## add-to-project-garage-dependabot.yaml
 
 When a Dependabot Pull Request (PR) is made against `main` branch,
 this action adds the PR to the "Garage" project board as "In Progress".
 
-- [Add to Project Garage Dependabot GitHub action]
+- [Add to Project Garage Dependabot GitHub Action]
   - Uses: [senzing-factory/build-resources/.../add-to-project-dependabot.yaml]
 
 ## add-to-project-garage.yaml
 
 When an issue is created,
 this action adds the issue to the "Garage" board as "Backlog".
 
-- [Add to Project Garage GitHub action]
+- [Add to Project Garage GitHub Action]
   - Uses: [senzing-factory/build-resources/.../add-to-project.yaml]
 
 ## dependabot-approve-and-merge.yaml
@@ -31,33 +31,33 @@ When a Dependabot Pull Request (PR) is made against the `main` branch,
 this action determines if it should be automatically approved and merged into the `main` branch.
 Once this action occurs [move-pr-to-done-dependabot.yaml] moves the PR on the "Garage" project board to "Done".
 
-- [Dependabot Approve and Merge GitHub action]
+- [Dependabot Approve and Merge GitHub Action]
   - Uses: [senzing-factory/build-resources/.../dependabot-approve-and-merge.yaml]
 
 ## docker-build-container.yaml
 
 When a Pull Request is made against the `main` branch,
 this action verifies that the `Dockerfile` can be successfully built.
 
-*Note:* The Docker image is **not** pushed to [DockerHub].
+_Note:_ The Docker image is **not** pushed to [DockerHub].
 
-- [Docker Build Container GitHub action]
+- [Docker Build Container GitHub Action]
   - Uses: [senzing-factory/github-action-docker-buildx-build]
 
 ## docker-push-containers-to-dockerhub.yaml
 
 After a [Semantic Version] release is created,
 this action builds Docker images on multiple architectures and pushes the Docker images to [DockerHub].
 
-- [Docker Push Containers to DockerHub GitHub action]
+- [Docker Push Containers to DockerHub GitHub Action]
   - Uses: [senzing-factory/github-action-docker-buildx-build]
 
 ## golangci-lint.yaml
 
 When a change is committed to GitHub or a Pull Request is made against the `main` branch,
 this action runs [golangci-lint] to run multiple linters against the code.
 
-- [Golangci Lint GitHub action]
+- [Golangci Lint GitHub Action]
   - Configuration:
     - [.golangci.yaml]
   - Uses:
@@ -71,15 +71,15 @@ this action runs [golangci-lint] to run multiple linters against the code.
 After a [Semantic Version] release is created,
 this action expedites the Go publishing process.
 
-- [Go Proxy Pull GitHub action]
+- [Go Proxy Pull GitHub Action]
   - Uses: [andrewslotin/go-proxy-pull-action]
 
 ## go-test-darwin.yaml
 
 When a Pull Request is made against the `main` branch,
 this action runs `go test` with coverage testing on macOS.
 
-- [Go Test Darwin GitHub action]
+- [Go Test Darwin GitHub Action]
   - Configuration: [testcoverage.yaml]
   - Uses:
     - [actions/checkout]
@@ -94,7 +94,7 @@ this action runs `go test` with coverage testing on macOS.
 When a change is committed to GitHub or a Pull Request is made against the `main` branch,
 this action runs `go test` with coverage testing on Linux.
 
-- [Go Test Linux GitHub action]
+- [Go Test Linux GitHub Action]
   - Configuration: [testcoverage.yaml]
   - Uses:
     - [actions/checkout]
@@ -109,7 +109,7 @@ this action runs `go test` with coverage testing on Linux.
 When a Pull Request is made against the `main` branch,
 this action runs `go test` with coverage testing on Windows.
 
-- [Go Test Windows GitHub action]
+- [Go Test Windows GitHub Action]
   - Configuration: [testcoverage.yaml]
   - Uses:
     - [actions/checkout]
@@ -124,7 +124,7 @@ this action runs `go test` with coverage testing on Windows.
 When a change is committed to GitHub or a Pull Request is made against the `main` branch,
 this action runs [super-linter] to run multiple linters against the code.
 
-- [Lint Workflows GitHub action]
+- [Lint Workflows GitHub Action]
   - Configuration:
     - [.checkov.yaml]
     - [.jscpd.json]
@@ -137,7 +137,7 @@ After a [Semantic Version] release is created,
 this action creates a Pull Request for an updated [github.go] file
 for the **next** Semantic Version release by increasing the Semantic Version's Patch value.
 
-- [Make Go GitHub File GitHub action]
+- [Make Go GitHub File GitHub Action]
   - Uses: [senzing-factory/build-resources/.../make-go-github-file.yaml]
 
 ## make-go-tag.yaml
@@ -146,7 +146,7 @@ After a [Semantic Version] release is created,
 this action creates a tag in the form `vM.m.P` using the SHA of the `M.m.P` release.
 The `v` prefix is standard usage in [Go].
 
-- [Make Go Tag GitHub action]
+- [Make Go Tag GitHub Action]
   - Uses:
     - [actions/checkout]
     - [senzing-factory/github-action-make-go-tag]
@@ -156,38 +156,38 @@ The `v` prefix is standard usage in [Go].
 When a Pull Request is merged into the `main` branch,
 this action moves the PR on the "Garage" project board to "Done".
 
-- [Move PR to Done Dependabot GitHub action]
+- [Move PR to Done Dependabot GitHub Action]
   - Uses: [senzing-factory/build-resources/.../move-pr-to-done-dependabot.yaml]
 
-[.checkov.yaml]:  ../linters/README.md#checkovyaml
+[.checkov.yaml]: ../linters/README.md#checkovyaml
 [.golangci.yaml]: ../linters/README.md#golangciyaml
 [.jscpd.json]: ../linters/README.md#jscpdjson
 [.yaml-lint.yml]: ../linters/README.md#yaml-lintyml
 [actions/checkout]: https://github.com/actions/checkout
 [actions/setup-go]: https://github.com/actions/setup-go
 [actions/upload-artifact]: https://github.com/actions/upload-artifact
-[Add Labels Standardized GitHub action]: add-labels-standardized.yaml
-[Add to Project Garage Dependabot GitHub action]: add-to-project-garage-dependabot.yaml
-[Add to Project Garage GitHub action]: add-to-project-garage.yaml
+[Add Labels Standardized GitHub Action]: add-labels-standardized.yaml
+[Add to Project Garage Dependabot GitHub Action]: add-to-project-garage-dependabot.yaml
+[Add to Project Garage GitHub Action]: add-to-project-garage.yaml
 [andrewslotin/go-proxy-pull-action]: https://github.com/andrewslotin/go-proxy-pull-action
-[Dependabot Approve and Merge GitHub action]: dependabot-approve-and-merge.yaml
-[Docker Build Container GitHub action]: docker-build-container.yaml
-[Docker Push Containers to DockerHub GitHub action]: docker-push-containers-to-dockerhub.yaml
+[Dependabot Approve and Merge GitHub Action]: dependabot-approve-and-merge.yaml
+[Docker Build Container GitHub Action]: docker-build-container.yaml
+[Docker Push Containers to DockerHub GitHub Action]: docker-push-containers-to-dockerhub.yaml
 [DockerHub]: https://hub.docker.com/
 [github.go]: ../../cmd/github.go
-[Go Proxy Pull GitHub action]: go-proxy-pull.yaml
-[Go Test Darwin GitHub action]: go-test-darwin.yaml
-[Go Test Linux GitHub action]: go-test-linux.yaml
-[Go Test Windows GitHub action]: go-test-windows.yaml
+[Go Proxy Pull GitHub Action]: go-proxy-pull.yaml
+[Go Test Darwin GitHub Action]: go-test-darwin.yaml
+[Go Test Linux GitHub Action]: go-test-linux.yaml
+[Go Test Windows GitHub Action]: go-test-windows.yaml
 [Go]: https://go.dev/
-[Golangci Lint GitHub action]: golangci-lint.yaml
+[Golangci Lint GitHub Action]: golangci-lint.yaml
 [golangci-lint]: https://github.com/golangci/golangci-lint
 [golangci/golangci-lint-action]: https://github.com/golangci/golangci-lint-action
 [gotesttools/gotestfmt-action]: https://github.com/gotesttools/gotestfmt-action
-[Lint Workflows GitHub action]: lint-workflows.yaml
-[Make Go GitHub File GitHub action]: make-go-github-file.yaml
-[Make Go Tag GitHub action]: make-go-tag.yaml
-[Move PR to Done Dependabot GitHub action]: move-pr-to-done-dependabot.yaml
+[Lint Workflows GitHub Action]: lint-workflows.yaml
+[Make Go GitHub File GitHub Action]: make-go-github-file.yaml
+[Make Go Tag GitHub Action]: make-go-tag.yaml
+[Move PR to Done Dependabot GitHub Action]: move-pr-to-done-dependabot.yaml
 [move-pr-to-done-dependabot.yaml]: move-pr-to-done-dependabotyaml
 [Semantic Version]: https://semver.org/
 [senzing-factory/build-resources/.../add-labels-to-issue.yaml]: https://github.com/senzing-factory/build-resources/blob/main/.github/workflows/add-labels-to-issue.yaml
@@ -202,4 +202,4 @@ this action moves the PR on the "Garage" project board to "Done".
 [senzing-factory/github-action-install-senzing-api]: https://github.com/senzing-factory/github-action-install-senzing-api
 [senzing-factory/github-action-make-go-tag]: https://github.com/senzing-factory/github-action-make-go-tag
 [super-linter]: https://github.com/super-linter/super-linter
-[testcoverage.yaml]:  ../coverage/README.md#testcoverageyaml
+[testcoverage.yaml]: ../coverage/README.md#testcoverageyaml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>sz-sdk-go</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
 </projectDescription>
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at <[email protected]>. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

@@ -19,6 +19,10 @@ DIST_DIRECTORY := $(MAKEFILE_DIRECTORY)/dist
 BUILD_TAG := $(shell git describe --always --tags --abbrev=0  | sed 's/v//')
 BUILD_ITERATION := $(shell git log $(BUILD_TAG)..HEAD --oneline | wc -l | sed 's/^ *//')
 BUILD_VERSION := $(shell git describe --always --tags --abbrev=0 --dirty  | sed 's/v//')
+DOCKER_CONTAINER_NAME := $(PROGRAM_NAME)
+DOCKER_IMAGE_NAME := senzing/$(PROGRAM_NAME)
+DOCKER_BUILD_IMAGE_NAME := $(DOCKER_IMAGE_NAME)-build
+DOCKER_SUT_IMAGE_NAME := $(PROGRAM_NAME)_sut
 GIT_REMOTE_URL := $(shell git config --get remote.origin.url)
 GIT_REPOSITORY_NAME := $(shell basename `git rev-parse --show-toplevel`)
 GIT_VERSION := $(shell git describe --always --tags --long --dirty | sed -e 's/\-0//' -e 's/\-g.......//')
@@ -35,6 +39,7 @@ GO_ARCH = $(word 2, $(GO_OSARCH))
 # Can be overridden with "export"
 # Example: "export LD_LIBRARY_PATH=/path/to/my/senzing/er/lib"
 
+DOCKER_IMAGE_TAG ?= $(GIT_REPOSITORY_NAME):$(GIT_VERSION)
 GOBIN ?= $(shell go env GOPATH)/bin
 LD_LIBRARY_PATH ?= /opt/senzing/er/lib
 
@@ -65,11 +70,11 @@ hello-world: hello-world-osarch-specific
 # -----------------------------------------------------------------------------
 
 .PHONY: dependencies-for-development
-dependencies-for-development:
+dependencies-for-development: dependencies-for-development-osarch-specific
 	@go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
 	@go install github.com/vladopajic/go-test-coverage/v2@latest
 	@go install golang.org/x/tools/cmd/godoc@latest
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.58.1
+	@docker-compose pull 2>/dev/null || true
 
 
 .PHONY: dependencies
@@ -150,7 +155,7 @@ coverage: coverage-osarch-specific
 check-coverage: export SENZING_LOG_LEVEL=TRACE
 check-coverage:
 	@go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
-	@${GOBIN}/go-test-coverage --config=.github/coverage/.testcoverage.yaml
+	@${GOBIN}/go-test-coverage --config=.github/coverage/testcoverage.yaml
 
 # -----------------------------------------------------------------------------
 # Documentation
@@ -183,7 +188,7 @@ help:
 print-make-variables:
 	@$(foreach V,$(sort $(.VARIABLES)), \
 		$(if $(filter-out environment% default automatic, \
-		$(origin $V)),$(warning $V=$($V) ($(value $V)))))
+		$(origin $V)),$(info $V=$($V) ($(value $V)))))
 
 
 .PHONY: update-pkg-cache

@@ -1,6 +1,6 @@
 module github.com/senzing-garage/sz-sdk-go
 
-go 1.21
+go 1.22
 
 require (
 	github.com/aquilax/truncate v1.0.0

@@ -19,12 +19,14 @@ PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH)
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
 	@rm -f  $(GOPATH)/bin/$(PROGRAM_NAME) || true
+	@rm -f  $(MAKEFILE_DIRECTORY)/.coverage || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.html || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.out || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/cover.out || true
 	@rm -fr $(TARGET_DIRECTORY) || true
 	@rm -fr /tmp/sqlite || true
 	@pkill godoc || true
+	@docker-compose -f docker-compose.test.yaml down 2> /dev/null || true
 
 
 .PHONY: coverage-osarch-specific
@@ -35,8 +37,14 @@ coverage-osarch-specific:
 	@open file://$(MAKEFILE_DIRECTORY)/coverage.html
 
 
+.PHONY: dependencies-for-development-osarch-specific
+dependencies-for-development-osarch-specific:
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin latest
+
+
 .PHONY: documentation-osarch-specific
 documentation-osarch-specific:
+	@pkill godoc || true
 	@godoc &
 	@open http://localhost:6060
 

@@ -22,6 +22,7 @@ clean-osarch-specific:
 	@rm -fr $(TARGET_DIRECTORY) || true
 	@rm -fr /tmp/sqlite || true
 	@pkill godoc || true
+	@docker-compose -f docker-compose.test.yaml down 2> /dev/null || true
 
 
 .PHONY: coverage-osarch-specific
@@ -32,8 +33,14 @@ coverage-osarch-specific:
 	@xdg-open $(MAKEFILE_DIRECTORY)/coverage.html
 
 
+.PHONY: dependencies-for-development-osarch-specific
+dependencies-for-development-osarch-specific:
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin latest
+
+
 .PHONY: documentation-osarch-specific
 documentation-osarch-specific:
+	@pkill godoc || true
 	@godoc &
 	@xdg-open http://localhost:6060
 

@@ -18,6 +18,7 @@ clean-osarch-specific:
 	@del /F /S /Q $(TARGET_DIRECTORY)
 	@del /F /S /Q C:\Temp\sqlite
 	@taskkill /f /t/im godoc
+	@docker-compose -f docker-compose.test.yaml down
 
 
 .PHONY: coverage-osarch-specific
@@ -29,6 +30,7 @@ coverage-osarch-specific:
 
 .PHONY: documentation-osarch-specific
 documentation-osarch-specific:
+	@taskkill /f /t/im godoc
 	@start /b godoc
 	@explorer http://localhost:6060
 

@@ -1,7 +1,7 @@
 // DO NOT EDIT.  This code is generated.
 // Generated by: sz-sdk-go/bin/generate_senzing_unmarshal_test.py
 // Generated for: sz-sdk-go/senzing/unmarshal_test.go
-// Generated date: 2024-09-05T13:52:05.644233+00:00
+// Generated date: 2024-09-30T17:49:18.715755+00:00
 
 package response
 

@@ -68,7 +68,7 @@ const (
 	SzEntityIncludeRelatedRecordTypes // 29 Include the record types of the related entities
 	SzFindPathIncludeMatchingInfo     // 30 Include matching info on entity paths
 	SzEntityIncludeRecordUnmappedData // 31 Include the record unmapped data for the entity
-	SzEntityIncludeFeatureElements    // 32 Include feature elements
+	Bit33                             // 32
 	SzFindNetworkIncludeMatchingInfo  // 33 Include matching info on entity networks
 	SzIncludeMatchKeyDetails          // 34 Include internal features
 

@@ -192,8 +192,8 @@ var testCases = []struct {
 		expected: 0x0000000080000000,
 	},
 	{ // 33
-		name:     "SZ_ENTITY_INCLUDE_FEATURE_ELEMENTS",
-		actual:   SzEntityIncludeFeatureElements,
+		name:     "Bit33",
+		actual:   Bit33,
 		expected: 0x0000000100000000,
 	},
 	{ // 34