From bb2f6e83d9e33f22ba0c075224851ef81a4629e0 Mon Sep 17 00:00:00 2001 From: Michael Dockter Date: Thu, 31 Oct 2024 10:54:52 -0400 Subject: [PATCH] #57 Update dependencies (#294) --- .dockerignore | 2 +- .github/workflows/golangci-lint.yaml | 20 ++++++++--------- CHANGELOG.md | 6 ++++++ Dockerfile | 4 ++-- go.mod | 16 +++++++------- go.sum | 32 ++++++++++++++-------------- makefiles/darwin.mk | 1 - 7 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.dockerignore b/.dockerignore index 253d5ef..5a6443c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,6 @@ docs/ CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md -docker-compose.test.yml +docker-compose.test.yaml LICENSE README.md diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 7caf1dc..0d38b8c 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -30,21 +30,21 @@ jobs: - name: Copy Senzing headers run: | - mkdir --parents ./szconfig/gohelpers + mkdir --parents ./szconfig/szhelpers cp /opt/senzing/er/sdk/c/*.h ./szconfig/ - cp /opt/senzing/er/sdk/c/gohelpers/*.h ./szconfig/gohelpers - mkdir --parents ./szconfigmanager/gohelpers + cp /opt/senzing/er/sdk/c/szhelpers/*.h ./szconfig/szhelpers + mkdir --parents ./szconfigmanager/szhelpers cp /opt/senzing/er/sdk/c/*.h ./szconfigmanager/ - cp /opt/senzing/er/sdk/c/gohelpers/*.h ./szconfigmanager/gohelpers - mkdir --parents ./szdiagnostic/gohelpers + cp /opt/senzing/er/sdk/c/szhelpers/*.h ./szconfigmanager/szhelpers + mkdir --parents ./szdiagnostic/szhelpers cp /opt/senzing/er/sdk/c/*.h ./szdiagnostic/ - cp /opt/senzing/er/sdk/c/gohelpers/*.h ./szdiagnostic/gohelpers - mkdir --parents ./szengine/gohelpers + cp /opt/senzing/er/sdk/c/szhelpers/*.h ./szdiagnostic/szhelpers + mkdir --parents ./szengine/szhelpers cp /opt/senzing/er/sdk/c/*.h ./szengine/ - cp /opt/senzing/er/sdk/c/gohelpers/*.h ./szengine/gohelpers - mkdir --parents ./szproduct/gohelpers + cp /opt/senzing/er/sdk/c/szhelpers/*.h ./szengine/szhelpers + mkdir --parents ./szproduct/szhelpers cp /opt/senzing/er/sdk/c/*.h ./szproduct/ - cp /opt/senzing/er/sdk/c/gohelpers/*.h ./szproduct/gohelpers + cp /opt/senzing/er/sdk/c/szhelpers/*.h ./szproduct/szhelpers - name: Setup go uses: actions/setup-go@v5 diff --git a/CHANGELOG.md b/CHANGELOG.md index cf45d0a..064a605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning]. - +## [0.7.2] - 2024-10-31 + +### Changed in 0.7.2 + +- Update dependencies + ## [0.7.1] - 2024-09-13 ### Changed in 0.7.1 diff --git a/Dockerfile b/Dockerfile index 5a0ac0c..5c16589 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Stages # ----------------------------------------------------------------------------- -ARG IMAGE_BUILDER=golang:1.22.4-bullseye +ARG IMAGE_BUILDER=golang:1.23.2-bullseye ARG IMAGE_FINAL=senzing/senzingapi-runtime-beta:latest # ----------------------------------------------------------------------------- @@ -57,7 +57,7 @@ FROM ${IMAGE_FINAL} AS final ENV REFRESHED_AT=2024-07-01 LABEL Name="senzing/init-database" \ Maintainer="support@senzing.com" \ - Version="0.5.2" + Version="0.7.2" HEALTHCHECK CMD ["/app/healthcheck.sh"] USER root diff --git a/go.mod b/go.mod index d80633f..52ef4d9 100644 --- a/go.mod +++ b/go.mod @@ -22,9 +22,9 @@ require ( github.com/senzing-garage/go-helpers v0.6.1 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.2 - github.com/senzing-garage/sz-sdk-go v0.14.2 - github.com/senzing-garage/sz-sdk-go-core v0.8.3 + github.com/senzing-garage/go-sdk-abstract-factory v0.9.3 + github.com/senzing-garage/sz-sdk-go v0.14.3 + github.com/senzing-garage/sz-sdk-go-core v0.8.4 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 @@ -35,7 +35,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/fsnotify/fsnotify v1.7.0 // 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/godror/godror v0.44.8 // indirect @@ -56,9 +56,9 @@ require ( github.com/sagikazarmark/locafero v0.6.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.3 // indirect - github.com/senzing-garage/sz-sdk-go-mock v0.8.2 // indirect - github.com/senzing-garage/sz-sdk-proto v0.7.8 // indirect + github.com/senzing-garage/sz-sdk-go-grpc v0.8.4 // indirect + github.com/senzing-garage/sz-sdk-go-mock v0.8.3 // indirect + github.com/senzing-garage/sz-sdk-proto v0.7.10 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.7.0 // indirect @@ -70,7 +70,7 @@ require ( golang.org/x/net v0.30.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/protobuf v1.35.1 // 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 0112d68..19485d3 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= @@ -96,18 +96,18 @@ github.com/senzing-garage/go-messaging v1.5.2 h1:lU9W2HV3zKQsDU9Vs7lwe/C/LbHVCMn github.com/senzing-garage/go-messaging v1.5.2/go.mod h1:iEWGVuDGWjolIkwLqnn9oJS7ifF3aoZjTtI44tf1gWQ= github.com/senzing-garage/go-observing v0.3.3 h1:AhQYgOG012sDZtWXYcXVAaS5qEoDjlWmPYJDVCUZ/g0= github.com/senzing-garage/go-observing v0.3.3/go.mod h1:qFUi5Dwb6vmd7izTZGjGbWKUGRHzWzsgbsX3oNSD198= -github.com/senzing-garage/go-sdk-abstract-factory v0.9.2 h1:jho2zzi/M+u5RoXTobqzjW2/Rt/yD2qL86uS715s9Cs= -github.com/senzing-garage/go-sdk-abstract-factory v0.9.2/go.mod h1:+XfiCxZfPgCYzqv5gv7OiEGzof6q/xMqF1dr/rpozqw= -github.com/senzing-garage/sz-sdk-go v0.14.2 h1:1LksQW0+epSY0DhlxThxrnfeDwgyLPvyqG9NehZmz04= -github.com/senzing-garage/sz-sdk-go v0.14.2/go.mod h1:rj9HH6qo+kW5PsFSRnEIUQqDZBE34gZjQGsDvAxw6dI= -github.com/senzing-garage/sz-sdk-go-core v0.8.3 h1:FlBRkqQd9QKPmr9KVVtG+FsoczqO+fXhRoZ9DnnvP0Y= -github.com/senzing-garage/sz-sdk-go-core v0.8.3/go.mod h1:uwAgQ/Ai8gKhJL/5TYMWYoDte7wnDqJXPWRD5A/Ushg= -github.com/senzing-garage/sz-sdk-go-grpc v0.8.3 h1:9UNfFOHkMYMl7xv3itTAdLy+XqUfSNMol293/L1fmcs= -github.com/senzing-garage/sz-sdk-go-grpc v0.8.3/go.mod h1:cBX6LXYLNyrNNRhPQ+XTWtpELydFKki+MvQWi/RqrLY= -github.com/senzing-garage/sz-sdk-go-mock v0.8.2 h1:59mspw8IozgZNMYIJ4840G7JLoBcVw4EaKJkCPSsZN8= -github.com/senzing-garage/sz-sdk-go-mock v0.8.2/go.mod h1:azVWET6la8ozTv0h5ZEd84MHNK5E1I2prffDszGIv4I= -github.com/senzing-garage/sz-sdk-proto v0.7.8 h1:kh1Xas66cPj41rOwdfGZ54agyiQJCxh82QXH+mT+qEk= -github.com/senzing-garage/sz-sdk-proto v0.7.8/go.mod h1:zvm6iJkUSGyXCVSjDE3KzL815uRcoEXocgGsPc0lWAQ= +github.com/senzing-garage/go-sdk-abstract-factory v0.9.3 h1:V2Iq//f3kyGdf9W0sH12fQ9dVnQADTd5jxkhqogvg9w= +github.com/senzing-garage/go-sdk-abstract-factory v0.9.3/go.mod h1:O9TZ/T5DQqBt2kqmleFdbSM26fJuRogFHGz4wWRAr/c= +github.com/senzing-garage/sz-sdk-go v0.14.3 h1:vcTJDn84bTGuFt2kWw8jDf4FfgUSePB+UJg3C2cPIBk= +github.com/senzing-garage/sz-sdk-go v0.14.3/go.mod h1:rj9HH6qo+kW5PsFSRnEIUQqDZBE34gZjQGsDvAxw6dI= +github.com/senzing-garage/sz-sdk-go-core v0.8.4 h1:Iy9KqdkP9Wf2w9jUa3jsiQEJF7CAazpoGsNXAUK9+68= +github.com/senzing-garage/sz-sdk-go-core v0.8.4/go.mod h1:p+ntbY2lgZBVpSNPGUxhifcFa12VOY/54TdhJWKbkKM= +github.com/senzing-garage/sz-sdk-go-grpc v0.8.4 h1:vRU5rn/QSMoUbXvLOdYJP41xsYrx22P15U+yUdbgjxg= +github.com/senzing-garage/sz-sdk-go-grpc v0.8.4/go.mod h1:CdjUjZJIPHJQsBkaPamMeRZO2CKGxTDUFUsWUp2aeS0= +github.com/senzing-garage/sz-sdk-go-mock v0.8.3 h1:QrqBqfksWY8LdGgpbMz/5ReRKpyvEHmW+qD7qp6dlns= +github.com/senzing-garage/sz-sdk-go-mock v0.8.3/go.mod h1:SoHQBFq9KkNywhh4IaJsOKWmxySrAxOFq1nFROPtpXI= +github.com/senzing-garage/sz-sdk-proto v0.7.10 h1:T5T4W63awD9znLrDk94vVzgy1+GBb1ouEkCbtCqJans= +github.com/senzing-garage/sz-sdk-proto v0.7.10/go.mod h1:pvaLa5AR36n5T59Perh/zulKKPe6EB1HTWGhSP4smb4= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -140,8 +140,8 @@ golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk index 8e6450e..2f21e04 100644 --- a/makefiles/darwin.mk +++ b/makefiles/darwin.mk @@ -6,7 +6,6 @@ SENZING_DIR ?= /opt/senzing/er SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR) - LD_LIBRARY_PATH ?= $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos DYLD_LIBRARY_PATH := $(LD_LIBRARY_PATH) SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db