Bump github.com/senzing-garage/go-sdk-abstract-factory from 0.9.4 to …

…0.9.5 (#334) * Bump github.com/senzing-garage/go-sdk-abstract-factory Bumps [github.com/senzing-garage/go-sdk-abstract-factory](https://github.com/senzing-garage/go-sdk-abstract-factory) from 0.9.4 to 0.9.5. - [Release notes](https://github.com/senzing-garage/go-sdk-abstract-factory/releases) - [Changelog](https://github.com/senzing-garage/go-sdk-abstract-factory/blob/main/CHANGELOG.md) - [Commits](senzing-garage/go-sdk-abstract-factory@0.9.4...0.9.5) --- updated-dependencies: - dependency-name: github.com/senzing-garage/go-sdk-abstract-factory dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update dependencies * Refactor to template-go * Fix code * Fix code * Debug -1 * Debug - 2 * Debug - 3 * Debug - 4 * Debug - 5 * Prepare for versioned release --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: docktermj <[email protected]>
senzing-garage · Feb 28, 2025 · 362499e · 362499e
1 parent 30ef9d2
commit 362499e
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 100 deletions.
diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml
@@ -3,21 +3,19 @@ name: Go test darwin
 on: [pull_request, workflow_dispatch]
 
 env:
-  DYLD_LIBRARY_PATH: /opt/senzing/er/lib:/opt/senzing/er/lib/macos
-  LD_LIBRARY_PATH: /opt/senzing/er/lib:/opt/senzing/er/lib/macos
+  SENZING_LOG_LEVEL: TRACE
   SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 
 permissions:
   contents: read
 
 jobs:
   go-test-darwin:
-    name: "Go test with Senzing: ${{ matrix.senzingsdk-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
-    runs-on: ${{ matrix.os }}
+    name: "Go test with Senzing: ${{ matrix.senzingsdk-version }}; OS: macos-latest; Go: ${{ matrix.go }}"
+    runs-on: macos-latest
     strategy:
       matrix:
         go: ["1.21"]
-        os: [macos-latest]
         senzingsdk-version: [staging-v4]
 
     steps:
@@ -41,8 +39,20 @@ jobs:
         with:
           senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }}
 
+      - name: Set environment variables
+        run: |
+          SENZING_PATH="${HOME}/senzing"
+          {
+            echo "SENZING_PATH=${SENZING_PATH}"
+            echo "LD_LIBRARY_PATH=${SENZING_PATH}/er/lib:${SENZING_PATH}/er/lib/macos"
+            echo "DYLD_LIBRARY_PATH=${SENZING_PATH}/er/lib:${SENZING_PATH}/er/lib/macos"
+            echo "SENZING_DATA_DIR=${SENZING_PATH}/er/data"
+            echo  CGO_CFLAGS="-g -I${SENZING_PATH}/er/sdk/c"
+            echo  CGO_LDFLAGS="-L${SENZING_PATH}/er/lib -lSz -Wl,-no_warn_duplicate_libraries"
+          } >> "$GITHUB_ENV"
+
       - name: Run go test
-        run: go test -exec /Users/runner/work/init-database/init-database/bin/macos_exec_dyld.sh -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt
+        run: go test -exec "${GITHUB_WORKSPACE}/bin/macos_exec_dyld.sh" -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt
 
       - name: Store coverage file
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml
@@ -3,7 +3,6 @@ name: Go test linux
 on: [push]
 
 env:
-  LD_LIBRARY_PATH: /opt/senzing/er/lib
   SENZING_LOG_LEVEL: TRACE
   SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 
@@ -12,12 +11,13 @@ permissions:
 
 jobs:
   go-test-linux:
-    name: "Go test with OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
+    name: "Go test with Senzing: ${{ matrix.senzingsdk-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         go: ["1.21"]
         os: [ubuntu-latest]
+        senzingsdk-version: [staging-v4]
 
     steps:
       - name: Checkout repository
@@ -46,7 +46,10 @@ jobs:
           senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }}
 
       - name: Run go test
-        run: go test -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt
+        run: |
+          export SENZING_PATH="/opt/senzing"
+          export LD_LIBRARY_PATH="${SENZING_PATH}/er/lib:${SENZING_PATH}/er/lib/macos"
+          go test -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt
 
       - name: Store coverage file
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml
@@ -3,19 +3,19 @@ name: Go test windows
 on: [pull_request, workflow_dispatch]
 
 env:
+  SENZING_LOG_LEVEL: TRACE
   SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@nowhere/C:\\Temp\\sqlite\\G2C.db"
 
 permissions:
   contents: read
 
 jobs:
   go-test-windows:
-    name: "Go test with Senzing: ${{ matrix.senzingsdk-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
-    runs-on: ${{ matrix.os }}
+    name: "Go test with Senzing: ${{ matrix.senzingsdk-version }}; OS: windows-latest; Go: ${{ matrix.go }}"
+    runs-on: windows-latest
     strategy:
       matrix:
         go: ["1.21"]
-        os: [windows-latest]
         senzingsdk-version: [staging-v4]
 
     steps:
@@ -40,17 +40,18 @@ jobs:
           senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }}
 
       - name: Add to "Path" environment variable
-        run: |
-          # shellcheck disable=SC2028
-          echo "C:\Program Files\Senzing\er\lib" >> "$env:GITHUB_PATH"
+        run: Add-Content "$env:GITHUB_PATH" "$Env:USERPROFILE\Senzing\er\lib"
 
       - name: Create empty database file
         run: |
           mkdir "C:\Temp\sqlite"
-          New-Item -Path "C:\Temp\sqlite\G2C.db" -ItemType File
+          # New-Item -Path "C:\Temp\sqlite\G2C.db" -ItemType File
 
       - name: Run go test
         run: |
+          $Env:SENZING_PATH = "$Env:USERPROFILE\Senzing"
+          $Env:CGO_CFLAGS = "-g -I$Env:SENZING_PATH\er\sdk\c"
+          $Env:CGO_LDFLAGS = "-L$Env:SENZING_PATH\er\lib -lSz"
           go test -json -v -p 1 -coverprofile=cover -covermode=atomic -coverpkg=./... ./... 2>&1 | tee "C:\Temp\gotest.log" | gotestfmt
           cp cover cover.out
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning].
 
 -
 
+## [0.7.5] - 2025-02-28
+
+### Changed in 0.7.5
+
+- Update dependencies
+
 ## [0.7.4] - 2024-12-10
 
 ### Changed in 0.7.4

diff --git a/bin/macos_exec_dyld.sh b/bin/macos_exec_dyld.sh
@@ -1,6 +1,7 @@
 #!/bin/zsh
 
-export DYLD_LIBRARY_PATH=/opt/senzing/er/lib:/opt/senzing/er/lib/macos
+export SENZING_PATH=${HOME}/senzing
+export DYLD_LIBRARY_PATH=${SENZING_PATH}/er/lib:${SENZING_PATH}/er/lib/macos
 export LD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
 
 "$@"
diff --git a/cmd/root.go b/cmd/root.go
@@ -12,8 +12,8 @@ import (
 	"github.com/senzing-garage/go-cmdhelping/constant"
 	"github.com/senzing-garage/go-cmdhelping/option"
 	"github.com/senzing-garage/go-cmdhelping/option/optiontype"
+	"github.com/senzing-garage/go-cmdhelping/settings"
 	"github.com/senzing-garage/go-databasing/dbhelper"
-	"github.com/senzing-garage/go-helpers/settings"
 	"github.com/senzing-garage/go-helpers/settingsparser"
 	"github.com/senzing-garage/init-database/initializer"
 	"github.com/spf13/cobra"
@@ -103,7 +103,7 @@ func RunE(_ *cobra.Command, _ []string) error {
 	var err error
 	ctx := context.Background()
 
-	senzingSettings, err := buildSenzingEngineConfigurationJSON(ctx, viper.GetViper())
+	senzingSettings, err := settings.BuildAndVerifySettings(ctx, viper.GetViper())
 	if err != nil {
 		return err
 	}
@@ -131,33 +131,6 @@ func Version() string {
 // Private functions
 // ----------------------------------------------------------------------------
 
-// Construct the JSON string for the Senzing engine configuration.
-func buildSenzingEngineConfigurationJSON(ctx context.Context, aViper *viper.Viper) (string, error) {
-	var err error
-	var result string
-	result = aViper.GetString(option.EngineSettings.Arg)
-	if len(result) == 0 {
-		options := map[string]string{
-			"configPath":          aViper.GetString(option.ConfigPath.Arg),
-			"databaseURL":         aViper.GetString(option.DatabaseURL.Arg),
-			"licenseStringBase64": aViper.GetString(option.LicenseStringBase64.Arg),
-			"resourcePath":        aViper.GetString(option.ResourcePath.Arg),
-			"senzingDirectory":    aViper.GetString(option.SenzingDirectory.Arg),
-			"supportPath":         aViper.GetString(option.SupportPath.Arg),
-		}
-		result, err = settings.BuildSimpleSettingsUsingMap(options)
-		if err != nil {
-			return result, err
-		}
-	}
-
-	err = settings.VerifySettings(ctx, result)
-	if err != nil {
-		return result, err
-	}
-	return result, err
-}
-
 // Construct the path to the "g2config.json" file.
 func getEngineConfigurationFileDefault() string {
 	var result string
@@ -230,7 +203,7 @@ func getParsedEngineConfigurationJSON() (settingsparser.SettingsParser, error) {
 
 	// Build and parse Senzing engine configuration JSON.
 
-	senzingSettings, err := buildSenzingEngineConfigurationJSON(ctx, myViper)
+	senzingSettings, err := settings.BuildAndVerifySettings(ctx, viper.GetViper())
 	if err != nil {
 		return result, err
 	}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/senzing-garage/init-database
 
-go 1.22.7
+go 1.23.0
 
 toolchain go1.23.2
 
@@ -17,14 +17,14 @@ retract (
 )
 
 require (
-	github.com/senzing-garage/go-cmdhelping v0.3.1
+	github.com/senzing-garage/go-cmdhelping v0.3.2
 	github.com/senzing-garage/go-databasing v0.5.4
-	github.com/senzing-garage/go-helpers v0.6.5
+	github.com/senzing-garage/go-helpers v0.6.6
 	github.com/senzing-garage/go-logging v1.5.1
 	github.com/senzing-garage/go-observing v0.3.3
-	github.com/senzing-garage/go-sdk-abstract-factory v0.9.4
+	github.com/senzing-garage/go-sdk-abstract-factory v0.9.5
 	github.com/senzing-garage/sz-sdk-go v0.14.5
-	github.com/senzing-garage/sz-sdk-go-core v0.8.8
+	github.com/senzing-garage/sz-sdk-go-core v0.9.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
@@ -37,7 +37,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-sql-driver/mysql v1.9.0 // indirect
 	github.com/godror/godror v0.46.0 // indirect
 	github.com/godror/knownpb v0.2.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
@@ -54,25 +54,25 @@ require (
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/senzing-garage/go-messaging v1.5.2 // indirect
-	github.com/senzing-garage/sz-sdk-go-grpc v0.8.6 // indirect
+	github.com/senzing-garage/sz-sdk-go-grpc v0.9.0 // indirect
 	github.com/senzing-garage/sz-sdk-go-mock v0.8.4 // indirect
-	github.com/senzing-garage/sz-sdk-proto v0.7.10 // indirect
+	github.com/senzing-garage/sz-sdk-proto v0.8.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
-	google.golang.org/protobuf v1.36.4 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )