140.dockter.1 (#145)

* #140 Update dependencies * #140 Prepare for versioned release * #140 migrate from senzing to senzing-garage * #140 Update dependencies * update go workflow permissions * #140 Prepare for versioned release --------- Co-authored-by: Sam <109683132+kernelsam@users.noreply.github.com>
senzing-garage · Jan 26, 2024 · db5bf3b · db5bf3b
1 parent 3866f08
commit db5bf3b
Show file tree

Hide file tree

Showing 25 changed files with 114 additions and 72 deletions.
diff --git a/.github/workflows/go-proxy-pull.yaml b/.github/workflows/go-proxy-pull.yaml
@@ -1,19 +1,18 @@
-# Based on
-# - https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
-# - https://github.com/marketplace/actions/go-proxy-warming
-# - https://github.com/andrewslotin/go-proxy-pull-action
-# - https://futurestud.io/tutorials/github-actions-run-a-workflow-when-creating-a-tag
-
 name: go-proxy-pull.yaml
+
 on:
   push:
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
+
+permissions:
+  contents: write
+
 jobs:
   go-proxy-pull:
     runs-on: ubuntu-latest
     steps:
       - name: Pull new module version
         uses: andrewslotin/go-proxy-pull-action@v1.1.0
         with:
-          import_path: github.com/senzing/g2-sdk-go-base
+          import_path: github.com/senzing-garage/g2-sdk-go-base
diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml
@@ -2,11 +2,17 @@
 # - https://github.com/marketplace/actions/setup-go-environment
 
 name: go-test-darwin.yaml
+
 on: [push]
+
 env:
   DYLD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
   LD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
   SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@/tmp/sqlite/G2C.db"
+
+permissions:
+  contents: read
+
 jobs:
   go-test-darwin:
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml
@@ -2,10 +2,16 @@
 # - https://github.com/marketplace/actions/setup-go-environment
 
 name: go-test-linux.yaml
+
 on: [push]
+
 env:
   LD_LIBRARY_PATH: /opt/senzing/g2/lib
   SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@/tmp/sqlite/G2C.db"
+
+permissions:
+  contents: read
+
 jobs:
   go-test-linux:
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml
@@ -2,9 +2,15 @@
 # - https://github.com/marketplace/actions/setup-go-environment
 
 name: go-test-windows.yaml
+
 on: [push]
+
 env:
   SENZING_TOOLS_DATABASE_URL: 'sqlite3://na:na@nowhere/C:\Temp\sqlite\G2C.db'
+
+permissions:
+  contents: read
+
 jobs:
   go-test-windows:
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/gofmt.yaml b/.github/workflows/gofmt.yaml
@@ -1,7 +1,12 @@
 name: gofmt.yaml
+
 on:
   pull_request:
     branches: [main]
+
+permissions:
+  contents: read
+
 jobs:
   gofmt:
     uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@main
diff --git a/.github/workflows/gosec.yaml b/.github/workflows/gosec.yaml
@@ -2,15 +2,21 @@
 # - https://github.com/securego/gosec
 
 name: gosec.yaml
+
 on:
   push:
     branches:
       - main
   pull_request:
     branches:
       - main
+
 env:
   LD_LIBRARY_PATH: /opt/senzing/g2/lib
+
+permissions:
+  contents: read
+
 jobs:
   gosec:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/make-go-tag.yaml b/.github/workflows/make-go-tag.yaml
@@ -1,9 +1,13 @@
 name: make-go-tag.yaml
+
 on:
   push:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-permissions: write-all
+
+permissions:
+  contents: write
+
 jobs:
   make-go-tag:
     name: Make a vM.m.P tag

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -
 
+## [0.5.0] - 2024-01-26
+
+### Changed in 0.5.0
+
+- Renamed module to `github.com/senzing-garage/g2-sdk-go-base`
+- Refactor to [template-go](https://github.com/senzing-garage/template-go)
+- Update dependencies
+  - github.com/senzing-garage/g2-sdk-go v0.9.0
+  - google.golang.org/grpc v1.61.0
+
 ## [0.4.0] - 2024-01-02
 
 ### Changed in 0.4.0

diff --git a/README.md b/README.md
@@ -25,8 +25,8 @@ The Senzing g2-sdk-go-base packages provide a
 language Software Development Kit that wraps the
 Senzing C SDK APIs.
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/senzing/g2-sdk-go-base.svg)](https://pkg.go.dev/github.com/senzing/g2-sdk-go-base)
-[![Go Report Card](https://goreportcard.com/badge/github.com/senzing/g2-sdk-go-base)](https://goreportcard.com/report/github.com/senzing/g2-sdk-go-base)
+[![Go Reference](https://pkg.go.dev/badge/github.com/senzing-garage/g2-sdk-go-base.svg)](https://pkg.go.dev/github.com/senzing-garage/g2-sdk-go-base)
+[![Go Report Card](https://goreportcard.com/badge/github.com/senzing-garage/g2-sdk-go-base)](https://goreportcard.com/report/github.com/senzing-garage/g2-sdk-go-base)
 [![License](https://img.shields.io/badge/License-Apache2-brightgreen.svg)](https://github.com/senzing-garage/g2-sdk-go-base/blob/main/LICENSE)
 
 [![gosec.yaml](https://github.com/senzing-garage/g2-sdk-go-base/actions/workflows/gosec.yaml/badge.svg)](https://github.com/senzing-garage/g2-sdk-go-base/actions/workflows/gosec.yaml)
@@ -64,4 +64,4 @@ interface include:
 1. [Development](docs/development.md)
 1. [Errors](docs/errors.md)
 1. [Examples](docs/examples.md)
-1. [Package reference](https://pkg.go.dev/github.com/senzing/g2-sdk-go-base)
+1. [Package reference](https://pkg.go.dev/github.com/senzing-garage/g2-sdk-go-base)
diff --git a/doc.go b/doc.go
@@ -9,7 +9,7 @@ The Senzing g2-sdk-go-base packages enable Go programs to call Senzing library f
 Under the covers, Golang's CGO is used by the g2-sdk-go-base packages to make the calls
 to the Senzing functions.
 
-More information at https://github.com/senzing/g2-sdk-go-base
+More information at https://github.com/senzing-garage/g2-sdk-go-base
 
 # Installing Senzing library
 
@@ -34,7 +34,7 @@ Using Docker, build an installer:
 
 	curl -X GET \
 	    --output /tmp/senzing-versions-latest.sh \
-	    https://raw.githubusercontent.com/Senzing/knowledge-base/main/lists/senzing-versions-latest.sh
+	    https://raw.githubusercontent.com/senzing-garage/knowledge-base/main/lists/senzing-versions-latest.sh
 	source /tmp/senzing-versions-latest.sh
 
 	sudo docker build \
@@ -43,7 +43,7 @@ Using Docker, build an installer:
 	    --build-arg SENZING_DATA_VERSION=${SENZING_VERSION_SENZINGDATA} \
 	    --no-cache \
 	    --tag senzing/installer:${SENZING_VERSION_SENZINGAPI} \
-	    https://github.com/senzing/docker-installer.git#main
+	    https://github.com/senzing-garage/docker-installer.git#main
 
 Using Docker, install Senzing:
 

diff --git a/docs/development.md b/docs/development.md
@@ -90,11 +90,11 @@ in testing the `g2-sdk-go-base` packages.
 
     curl -X GET \
         --output ${SENZING_DEMO_DIR}/docker-versions-stable.sh \
-        https://raw.githubusercontent.com/Senzing/knowledge-base/main/lists/docker-versions-stable.sh
+        https://raw.githubusercontent.com/senzing-garage/knowledge-base/main/lists/docker-versions-stable.sh
     source ${SENZING_DEMO_DIR}/docker-versions-stable.sh
     curl -X GET \
         --output ${SENZING_DEMO_DIR}/docker-compose.yaml \
-        "https://raw.githubusercontent.com/Senzing/docker-compose-demo/main/resources/postgresql/docker-compose-postgresql.yaml"
+        "https://raw.githubusercontent.com/senzing-garage/docker-compose-demo/main/resources/postgresql/docker-compose-postgresql.yaml"
 
     cd ${SENZING_DEMO_DIR}
     sudo --preserve-env docker-compose up
@@ -106,7 +106,7 @@ in testing the `g2-sdk-go-base` packages.
    Example:
 
     ```console
-    export LOCAL_IP_ADDRESS=$(curl --silent https://raw.githubusercontent.com/Senzing/knowledge-base/main/gists/find-local-ip-address/find-local-ip-address.py | python3 -)
+    export LOCAL_IP_ADDRESS=$(curl --silent https://raw.githubusercontent.com/senzing-garage/knowledge-base/main/gists/find-local-ip-address/find-local-ip-address.py | python3 -)
     export SENZING_TOOLS_DATABASE_URL=postgresql://postgres:postgres@${LOCAL_IP_ADDRESS}:5432/G2/?sslmode=disable
 
     ```

diff --git a/g2config/g2config.go b/g2config/g2config.go
@@ -24,12 +24,12 @@ import (
 	"time"
 	"unsafe"
 
+	g2configapi "github.com/senzing-garage/g2-sdk-go/g2config"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	"github.com/senzing-garage/go-logging/logging"
 	"github.com/senzing-garage/go-observing/notifier"
 	"github.com/senzing-garage/go-observing/observer"
 	"github.com/senzing-garage/go-observing/subject"
-	g2configapi "github.com/senzing/g2-sdk-go/g2config"
-	"github.com/senzing/g2-sdk-go/g2error"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2config/g2config_test.go b/g2config/g2config_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 
 	truncator "github.com/aquilax/truncate"
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	g2configapi "github.com/senzing-garage/g2-sdk-go/g2config"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	futil "github.com/senzing-garage/go-common/fileutil"
 	"github.com/senzing-garage/go-common/g2engineconfigurationjson"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go/g2api"
-	g2configapi "github.com/senzing/g2-sdk-go/g2config"
-	"github.com/senzing/g2-sdk-go/g2error"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/g2configmgr/g2configmgr.go b/g2configmgr/g2configmgr.go
@@ -24,12 +24,12 @@ import (
 	"time"
 	"unsafe"
 
+	g2configmgrapi "github.com/senzing-garage/g2-sdk-go/g2configmgr"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	"github.com/senzing-garage/go-logging/logging"
 	"github.com/senzing-garage/go-observing/notifier"
 	"github.com/senzing-garage/go-observing/observer"
 	"github.com/senzing-garage/go-observing/subject"
-	g2configmgrapi "github.com/senzing/g2-sdk-go/g2configmgr"
-	"github.com/senzing/g2-sdk-go/g2error"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2configmgr/g2configmgr_examples_test.go b/g2configmgr/g2configmgr_examples_test.go
@@ -6,8 +6,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/senzing-garage/g2-sdk-go-base/g2config"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go-base/g2config"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2configmgr/g2configmgr_test.go b/g2configmgr/g2configmgr_test.go
@@ -11,14 +11,14 @@ import (
 	"time"
 
 	truncator "github.com/aquilax/truncate"
+	"github.com/senzing-garage/g2-sdk-go-base/g2config"
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	g2configmgrapi "github.com/senzing-garage/g2-sdk-go/g2configmgr"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	futil "github.com/senzing-garage/go-common/fileutil"
 	"github.com/senzing-garage/go-common/g2engineconfigurationjson"
 	"github.com/senzing-garage/go-common/truthset"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go-base/g2config"
-	"github.com/senzing/g2-sdk-go/g2api"
-	g2configmgrapi "github.com/senzing/g2-sdk-go/g2configmgr"
-	"github.com/senzing/g2-sdk-go/g2error"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/g2diagnostic/g2diagnostic.go b/g2diagnostic/g2diagnostic.go
@@ -24,12 +24,12 @@ import (
 	"time"
 	"unsafe"
 
+	g2diagnosticapi "github.com/senzing-garage/g2-sdk-go/g2diagnostic"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	"github.com/senzing-garage/go-logging/logging"
 	"github.com/senzing-garage/go-observing/notifier"
 	"github.com/senzing-garage/go-observing/observer"
 	"github.com/senzing-garage/go-observing/subject"
-	g2diagnosticapi "github.com/senzing/g2-sdk-go/g2diagnostic"
-	"github.com/senzing/g2-sdk-go/g2error"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2diagnostic/g2diagnostic_test.go b/g2diagnostic/g2diagnostic_test.go
@@ -10,16 +10,16 @@ import (
 	"time"
 
 	truncator "github.com/aquilax/truncate"
+	"github.com/senzing-garage/g2-sdk-go-base/g2config"
+	"github.com/senzing-garage/g2-sdk-go-base/g2configmgr"
+	"github.com/senzing-garage/g2-sdk-go-base/g2engine"
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	g2diagnosticapi "github.com/senzing-garage/g2-sdk-go/g2diagnostic"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	futil "github.com/senzing-garage/go-common/fileutil"
 	"github.com/senzing-garage/go-common/g2engineconfigurationjson"
 	"github.com/senzing-garage/go-common/truthset"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go-base/g2config"
-	"github.com/senzing/g2-sdk-go-base/g2configmgr"
-	"github.com/senzing/g2-sdk-go-base/g2engine"
-	"github.com/senzing/g2-sdk-go/g2api"
-	g2diagnosticapi "github.com/senzing/g2-sdk-go/g2diagnostic"
-	"github.com/senzing/g2-sdk-go/g2error"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/g2engine/g2engine.go b/g2engine/g2engine.go
@@ -24,13 +24,13 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	g2engineapi "github.com/senzing-garage/g2-sdk-go/g2engine"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	"github.com/senzing-garage/go-logging/logging"
 	"github.com/senzing-garage/go-observing/notifier"
 	"github.com/senzing-garage/go-observing/observer"
 	"github.com/senzing-garage/go-observing/subject"
-	"github.com/senzing/g2-sdk-go/g2api"
-	g2engineapi "github.com/senzing/g2-sdk-go/g2engine"
-	"github.com/senzing/g2-sdk-go/g2error"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2engine/g2engine_test.go b/g2engine/g2engine_test.go
@@ -13,17 +13,17 @@ import (
 	"time"
 
 	truncator "github.com/aquilax/truncate"
+	"github.com/senzing-garage/g2-sdk-go-base/g2config"
+	"github.com/senzing-garage/g2-sdk-go-base/g2configmgr"
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	g2engineapi "github.com/senzing-garage/g2-sdk-go/g2engine"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
 	futil "github.com/senzing-garage/go-common/fileutil"
 	"github.com/senzing-garage/go-common/g2engineconfigurationjson"
 	"github.com/senzing-garage/go-common/record"
 	"github.com/senzing-garage/go-common/testfixtures"
 	"github.com/senzing-garage/go-common/truthset"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go-base/g2config"
-	"github.com/senzing/g2-sdk-go-base/g2configmgr"
-	"github.com/senzing/g2-sdk-go/g2api"
-	g2engineapi "github.com/senzing/g2-sdk-go/g2engine"
-	"github.com/senzing/g2-sdk-go/g2error"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/g2product/g2product.go b/g2product/g2product.go
@@ -24,12 +24,12 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/senzing-garage/g2-sdk-go/g2error"
+	g2productapi "github.com/senzing-garage/g2-sdk-go/g2product"
 	"github.com/senzing-garage/go-logging/logging"
 	"github.com/senzing-garage/go-observing/notifier"
 	"github.com/senzing-garage/go-observing/observer"
 	"github.com/senzing-garage/go-observing/subject"
-	"github.com/senzing/g2-sdk-go/g2error"
-	g2productapi "github.com/senzing/g2-sdk-go/g2product"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/g2product/g2product_test.go b/g2product/g2product_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 
 	truncator "github.com/aquilax/truncate"
+	"github.com/senzing-garage/g2-sdk-go/g2api"
+	"github.com/senzing-garage/g2-sdk-go/g2error"
+	g2productapi "github.com/senzing-garage/g2-sdk-go/g2product"
 	futil "github.com/senzing-garage/go-common/fileutil"
 	"github.com/senzing-garage/go-common/g2engineconfigurationjson"
 	"github.com/senzing-garage/go-logging/logging"
-	"github.com/senzing/g2-sdk-go/g2api"
-	"github.com/senzing/g2-sdk-go/g2error"
-	g2productapi "github.com/senzing/g2-sdk-go/g2product"
 	"github.com/stretchr/testify/assert"
 )