diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 17e8a25..47a17f1 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -62,7 +62,7 @@ this action runs [golangci-lint] to run multiple linters against the code. - [.golangci.yaml] - Uses: - [actions/checkout] - - [senzing-factory/github-action-install-senzing-api] + - [senzing-factory/github-action-install-senzing-sdk] - [actions/setup-go] - [golangci/golangci-lint-action] @@ -85,7 +85,7 @@ this action runs `go test` with coverage testing on macOS. - [actions/checkout] - [actions/setup-go] - [gotesttools/gotestfmt-action] - - [senzing-factory/github-action-install-senzing-api] + - [senzing-factory/github-action-install-senzing-sdk] - [actions/upload-artifact] - [senzing-factory/build-resources/.../go-coverage.yaml] @@ -100,7 +100,7 @@ this action runs `go test` with coverage testing on Linux. - [actions/checkout] - [actions/setup-go] - [gotesttools/gotestfmt-action] - - [senzing-factory/github-action-install-senzing-api] + - [senzing-factory/github-action-install-senzing-sdk] - [actions/upload-artifact] - [senzing-factory/build-resources/.../go-coverage.yaml] @@ -115,7 +115,7 @@ this action runs `go test` with coverage testing on Windows. - [actions/checkout] - [actions/setup-go] - [gotesttools/gotestfmt-action] - - [senzing-factory/github-action-install-senzing-api] + - [senzing-factory/github-action-install-senzing-sdk] - [actions/upload-artifact] - [senzing-factory/build-resources/.../go-coverage.yaml] @@ -199,7 +199,7 @@ this action moves the PR on the "Garage" project board to "Done". [senzing-factory/build-resources/.../make-go-github-file.yaml]: https://github.com/senzing-factory/build-resources/blob/main/.github/workflows/make-go-github-file.yaml [senzing-factory/build-resources/.../move-pr-to-done-dependabot.yaml]: https://github.com/senzing-factory/build-resources/blob/main/.github/workflows/move-pr-to-done-dependabot.yaml [senzing-factory/github-action-docker-buildx-build]: https://github.com/senzing-factory/github-action-docker-buildx-build -[senzing-factory/github-action-install-senzing-api]: https://github.com/senzing-factory/github-action-install-senzing-api +[senzing-factory/github-action-install-senzing-sdk]: https://github.com/senzing-factory/github-action-install-senzing-sdk [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 diff --git a/Dockerfile b/Dockerfile index 4b30105..1c36a90 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,14 @@ # Stages # ----------------------------------------------------------------------------- -ARG IMAGE_BUILDER=golang:1.23.2-bullseye -ARG IMAGE_FINAL=senzing/senzingapi-runtime-beta:latest +ARG IMAGE_BUILDER=golang:1.23.4-bullseye +ARG IMAGE_FINAL=senzing/senzingsdk-runtime-beta:latest # ----------------------------------------------------------------------------- -# Stage: senzingapi_runtime +# Stage: senzingsdk_runtime # ----------------------------------------------------------------------------- -FROM ${IMAGE_FINAL} AS senzingapi_runtime +FROM ${IMAGE_FINAL} AS senzingsdk_runtime # ----------------------------------------------------------------------------- # Stage: builder @@ -32,8 +32,8 @@ COPY . ${GOPATH}/src/observe # Copy files from prior stage. -COPY --from=senzingapi_runtime "/opt/senzing/er/lib/" "/opt/senzing/er/lib/" -COPY --from=senzingapi_runtime "/opt/senzing/er/sdk/c/" "/opt/senzing/er/sdk/c/" +COPY --from=senzingsdk_runtime "/opt/senzing/er/lib/" "/opt/senzing/er/lib/" +COPY --from=senzingsdk_runtime "/opt/senzing/er/sdk/c/" "/opt/senzing/er/sdk/c/" # Set path to Senzing libs. @@ -69,7 +69,7 @@ COPY ./rootfs / # Copy files from prior stage. -COPY --from=builder "/output/linux-amd64/observe" "/app/observe" +COPY --from=builder /output/linux-amd64/observe /app/observe # Run as non-root container diff --git a/README.md b/README.md index 15b57db..ba58425 100644 --- a/README.md +++ b/README.md @@ -106,13 +106,13 @@ This usage shows how to initialze a database with a Docker container. ## References -1. [API documentation] +1. [SDK documentation] 1. [Development] 1. [Errors] 1. [Examples] 1. [Package reference] -[API documentation]: https://pkg.go.dev/github.com/senzing-garage/observe +[SDK documentation]: https://pkg.go.dev/github.com/senzing-garage/observe [Development]: docs/development.md [Errors]: docs/errors.md [Examples]: docs/examples.md diff --git a/go.mod b/go.mod index d41b3a3..097bf0a 100644 --- a/go.mod +++ b/go.mod @@ -32,12 +32,12 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sys v0.27.0 // indirect - golang.org/x/text v0.20.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect + golang.org/x/net v0.32.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect + google.golang.org/protobuf v1.35.2 // 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 0e8306d..df4e773 100644 --- a/go.sum +++ b/go.sum @@ -58,20 +58,20 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= 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/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= -golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0= +golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= +golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:hgh8P4EuoxpsuKMXX/To36nOFD7vixReXgn8lPGnt+o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/package.Dockerfile b/package.Dockerfile index fe3f88b..253b524 100755 --- a/package.Dockerfile +++ b/package.Dockerfile @@ -2,7 +2,7 @@ # Stages # ----------------------------------------------------------------------------- -ARG IMAGE_BUILDER=golang:1.22.4-bullseye +ARG IMAGE_BUILDER=golang:1.23.4-bullseye ARG IMAGE_FPM=dockter/fpm:latest ARG IMAGE_FINAL=alpine