From 7da1ecad73442e3f5a61efb5ddb1dfc99434a1ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:27:09 +0000 Subject: [PATCH 1/4] Bump github.com/senzing-garage/go-helpers from 0.6.6 to 0.6.7 Bumps [github.com/senzing-garage/go-helpers](https://github.com/senzing-garage/go-helpers) from 0.6.6 to 0.6.7. - [Release notes](https://github.com/senzing-garage/go-helpers/releases) - [Changelog](https://github.com/senzing-garage/go-helpers/blob/main/CHANGELOG.md) - [Commits](https://github.com/senzing-garage/go-helpers/compare/0.6.6...0.6.7) --- updated-dependencies: - dependency-name: github.com/senzing-garage/go-helpers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3820ae4..feba001 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ toolchain go1.23.2 require ( 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.6 + github.com/senzing-garage/go-helpers v0.6.7 github.com/senzing-garage/go-sdk-abstract-factory v0.9.5 github.com/senzing-garage/sz-sdk-go v0.14.5 github.com/spf13/cobra v1.9.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa + golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 google.golang.org/grpc v1.70.0 ) diff --git a/go.sum b/go.sum index 5e47416..7ee8681 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,8 @@ github.com/senzing-garage/go-cmdhelping v0.3.2 h1:2uMgVpRygwqc/Otk95SUn40oYo1uoX github.com/senzing-garage/go-cmdhelping v0.3.2/go.mod h1:9ezBnHQYwrJpTPHKd968ScvMLAIaFbxXGX50aIbF8+A= github.com/senzing-garage/go-databasing v0.5.4 h1:dTur08dXBIwl5ZZJGnoAZR35XjHmwSrg+yDscO1vvGU= github.com/senzing-garage/go-databasing v0.5.4/go.mod h1:fPl315/XPkPY2i8Z10T0EReodKAiehldAQYVCRfRHQ8= -github.com/senzing-garage/go-helpers v0.6.6 h1:5eRkD4SXJz0e+nm6okTu7vSlcaPnNd5LIFgK0mEJt84= -github.com/senzing-garage/go-helpers v0.6.6/go.mod h1:252SDuNNlTJ5tOSgu5IvBEt+CNeCczB6g3WYNki2RKQ= +github.com/senzing-garage/go-helpers v0.6.7 h1:HZDQ2FElD3FQZt6+e3sGrDyvXXXIrLIV1JYTxQ5nBcA= +github.com/senzing-garage/go-helpers v0.6.7/go.mod h1:K37Wk2GkfS18UlHVT+HM4DmYCSsaLOVh8+ho4lX24s8= github.com/senzing-garage/go-logging v1.5.1 h1:3nqw75gN5x+6PQRop34/49+3kag1aE9dlFne7pILQAg= github.com/senzing-garage/go-logging v1.5.1/go.mod h1:ki4sQ46iI1Kjl1kkknYFQC2DY+zJj6Pod61wohGUs4E= github.com/senzing-garage/go-messaging v1.5.2 h1:lU9W2HV3zKQsDU9Vs7lwe/C/LbHVCMng9kQOL/r8pOI= @@ -141,8 +141,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= +golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 h1:aWwlzYV971S4BXRS9AmqwDLAD85ouC6X+pocatKY58c= +golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= From e87a6023478820c3b268cee9acefdeb252dc596c Mon Sep 17 00:00:00 2001 From: docktermj Date: Tue, 4 Mar 2025 11:24:53 -0500 Subject: [PATCH 2/4] Refactor to template-go --- .github/workflows/go-proxy-pull.yaml | 2 +- .github/workflows/go-test-darwin.yaml | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/go-proxy-pull.yaml b/.github/workflows/go-proxy-pull.yaml index 607520d..fd1cb33 100644 --- a/.github/workflows/go-proxy-pull.yaml +++ b/.github/workflows/go-proxy-pull.yaml @@ -14,6 +14,6 @@ jobs: steps: - name: Pull new module version - uses: andrewslotin/go-proxy-pull-action@v1.2.0 + uses: andrewslotin/go-proxy-pull-action@v1.3.0 with: import_path: github.com/${{ github.repository }} diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index 39a0100..c8436e4 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -52,7 +52,7 @@ jobs: } >> "$GITHUB_ENV" - name: Copy /etc files - run: sudo mkdir -p "${SENZING_PATH}/etc" && sudo cp testdata/senzing-license/g2.lic "${SENZING_PATH}/etc/g2.lic" + run: sudo mkdir -p "${SENZING_PATH}/etc" && sudo cp testdata/senzing-license/g2.lic "${SENZING_PATH}/er/etc/g2.lic" - name: Copy test database files run: mkdir -p /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/ diff --git a/go.mod b/go.mod index feba001..baa453f 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-sql-driver/mysql v1.9.0 // indirect - github.com/godror/godror v0.46.0 // indirect + github.com/godror/godror v0.47.0 // indirect github.com/godror/knownpb v0.2.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect @@ -59,7 +59,7 @@ require ( 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-20250224174004-546df14abb99 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // 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 diff --git a/go.sum b/go.sum index 7ee8681..0d591e5 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ 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-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo= github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw= -github.com/godror/godror v0.46.0 h1:/43db84UcoxlooASIsasH8TvZ7E1huwJ64yDtZ2504k= -github.com/godror/godror v0.46.0/go.mod h1:44hxVDzvFSwc+yGyRM+riCLNAY5SwZkUfLzVTh5MXCg= +github.com/godror/godror v0.47.0 h1:GZsaMOIvLqgTPPVXFIavRI4mqwNIhmcFfEZbzWeabGE= +github.com/godror/godror v0.47.0/go.mod h1:44hxVDzvFSwc+yGyRM+riCLNAY5SwZkUfLzVTh5MXCg= github.com/godror/knownpb v0.2.0 h1:RJLntksFiKUHoUz3wCCJ8+DBjxSLYHYDNl1xRz0/gXI= github.com/godror/knownpb v0.2.0/go.mod h1:kRahRJBwqTenpVPleymQ4k433Xz2Wuy7dOeFSuEpmkI= github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= @@ -153,8 +153,8 @@ golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 h1:ZSlhAUqC4r8TPzqLXQ0m3upBNZeF+Y8jQ3c4CR3Ujms= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= From 9c1c5d6278ebbc00fcd1b372134d621b36fcf281 Mon Sep 17 00:00:00 2001 From: docktermj Date: Tue, 4 Mar 2025 11:31:41 -0500 Subject: [PATCH 3/4] Refactor to template-go --- .github/workflows/go-test-darwin.yaml | 2 +- checkself/checkself_darwin_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index c8436e4..a890883 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -46,7 +46,7 @@ jobs: 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 "SENZING_DATA_DIR=${SENZING_PATH}/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" diff --git a/checkself/checkself_darwin_test.go b/checkself/checkself_darwin_test.go index 5262ca8..d9e32e4 100644 --- a/checkself/checkself_darwin_test.go +++ b/checkself/checkself_darwin_test.go @@ -22,7 +22,7 @@ func TestBasicCheckSelf_CheckSelf_Paths(test *testing.T) { ConfigPath: fmt.Sprintf("%s/er/etc", senzingPath), DatabaseURL: "sqlite3://na:na@/tmp/sqlite/G2C.db", ResourcePath: fmt.Sprintf("%s/er/resources", senzingPath), - SupportPath: fmt.Sprintf("%s/er/data", senzingPath), + SupportPath: fmt.Sprintf("%s/data", senzingPath), } err := testObject.CheckSelf(ctx) require.NoError(test, err) From 22f837461671d5090e42b15a960657f067ee7d96 Mon Sep 17 00:00:00 2001 From: docktermj Date: Tue, 4 Mar 2025 11:42:23 -0500 Subject: [PATCH 4/4] Refactor to template-go --- checkself/checkself_windows_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkself/checkself_windows_test.go b/checkself/checkself_windows_test.go index 7bb909b..9c3a779 100644 --- a/checkself/checkself_windows_test.go +++ b/checkself/checkself_windows_test.go @@ -22,7 +22,7 @@ func TestBasicCheckSelf_CheckSelf_Paths(test *testing.T) { ConfigPath: fmt.Sprintf("%s\\er\\etc", senzingPath), DatabaseURL: "sqlite3://na:na@nowhere/C:\\Temp\\sqlite\\G2C.db", ResourcePath: fmt.Sprintf("%s\\er\\resources", senzingPath), - SupportPath: fmt.Sprintf("%s\\er\\data", senzingPath), + SupportPath: fmt.Sprintf("%s\\data", senzingPath), } err := testObject.CheckSelf(ctx) require.NoError(test, err)