From 6d43134a3c83415eaedb178934bf4698c68eb217 Mon Sep 17 00:00:00 2001 From: Michael Dockter Date: Tue, 30 Jan 2024 11:25:14 -0500 Subject: [PATCH] 21.dockter.2 (#30) * #21 Update dependencies * #21 Prepare for versioned release * #21 Remove linters --- .../dependabot-approve-and-merge.yaml | 6 ++-- .github/workflows/go-proxy-pull.yaml | 8 +---- .github/workflows/go-test-darwin.yaml | 10 +++--- .github/workflows/go-test-linux.yaml | 9 +++--- .github/workflows/go-test-windows.yaml | 11 ++++--- .github/workflows/gofmt.yaml | 4 +-- .github/workflows/gosec.yaml | 8 ++--- CHANGELOG.md | 8 +++++ README.md | 2 +- go.mod | 16 +++++----- go.sum | 32 +++++++++---------- 11 files changed, 61 insertions(+), 53 deletions(-) diff --git a/.github/workflows/dependabot-approve-and-merge.yaml b/.github/workflows/dependabot-approve-and-merge.yaml index 0c15821..c357735 100644 --- a/.github/workflows/dependabot-approve-and-merge.yaml +++ b/.github/workflows/dependabot-approve-and-merge.yaml @@ -1,12 +1,14 @@ -name: dependabot-approve-and-merge.yaml +name: 'dependabot approve and merge' + on: pull_request: branches: [main] + jobs: dependabot-approve-and-merge: permissions: contents: write pull-requests: write - uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main secrets: SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }} + uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@v1 diff --git a/.github/workflows/go-proxy-pull.yaml b/.github/workflows/go-proxy-pull.yaml index a2f03be..d1fca26 100644 --- a/.github/workflows/go-proxy-pull.yaml +++ b/.github/workflows/go-proxy-pull.yaml @@ -1,10 +1,4 @@ -# 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 +name: 'go proxy pull' on: push: diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index 6b259b1..ca10f20 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -1,7 +1,4 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment - -name: go-test-darwin.yaml +name: 'go test darwin' on: [push] @@ -27,17 +24,22 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup go uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} + - name: Install Senzing API uses: Senzing/github-action-install-senzing-api@latest with: senzingapi-version: ${{ matrix.senzingapi-version }} + - name: Copy /etc files run: sudo cp testdata/senzing-license/g2.lic /opt/senzing/g2/etc/g2.lic + - name: Copy test database files run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db + - name: Run go test run: go test -exec /Users/runner/work/demo-entity-search/demo-entity-search/bin/macos_exec_dyld.sh -v -p 1 ./... diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml index 2d5bc38..2ed030e 100644 --- a/.github/workflows/go-test-linux.yaml +++ b/.github/workflows/go-test-linux.yaml @@ -1,7 +1,4 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment - -name: go-test-linux.yaml +name: 'go test linux' on: [push] @@ -26,16 +23,20 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup go uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} + - name: Install Senzing API uses: Senzing/github-action-install-senzing-api@latest with: senzingapi-version: ${{ matrix.senzingapi-version }} + - name: Copy /etc files run: sudo cp testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic + - name: Copy test database files run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db - name: Run go test diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml index fd7c076..3cbbb78 100644 --- a/.github/workflows/go-test-windows.yaml +++ b/.github/workflows/go-test-windows.yaml @@ -1,7 +1,4 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment - -name: go-test-windows.yaml +name: 'go test windows' on: [push] @@ -25,19 +22,25 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup go uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} + - name: Install Senzing API uses: Senzing/github-action-install-senzing-api@latest with: senzingapi-version: ${{ matrix.senzingapi-version }} + - name: Add to "Path" environment variable run: echo "C:\Program Files\Senzing\g2\lib" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Copy /etc files run: copy testdata/senzing-license/g2.lic "C:\Program Files\Senzing\g2\etc\g2.lic" + - name: Copy test database files run: mkdir "C:\Temp\sqlite" && copy testdata/sqlite/G2C.db "C:\Temp\sqlite\G2C.db" + - name: Run go test run: go test -v -p 1 ./... diff --git a/.github/workflows/gofmt.yaml b/.github/workflows/gofmt.yaml index 59ced20..6f08ffb 100644 --- a/.github/workflows/gofmt.yaml +++ b/.github/workflows/gofmt.yaml @@ -1,4 +1,4 @@ -name: gofmt.yaml +name: 'gofmt' on: pull_request: @@ -9,4 +9,4 @@ permissions: jobs: gofmt: - uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@main + uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@v1 diff --git a/.github/workflows/gosec.yaml b/.github/workflows/gosec.yaml index ee7679b..4cfbf57 100644 --- a/.github/workflows/gosec.yaml +++ b/.github/workflows/gosec.yaml @@ -1,7 +1,4 @@ -# Based on -# - https://github.com/securego/gosec - -name: gosec.yaml +name: 'gosec' on: push: @@ -22,7 +19,8 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 + - name: Run Gosec Security Scanner - uses: securego/gosec@master + uses: securego/gosec@v2.18.2 with: args: ./... diff --git a/CHANGELOG.md b/CHANGELOG.md index 9130089..646202b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - +## [0.1.1] - 2024-01-30 + +### Changed in 0.1.1 + +- Update dependencies + - github.com/senzing-garage/go-rest-api-service v0.9.1 + - google.golang.org/grpc v1.61.0 + ## [0.1.0] - 2024-01-03 ### Changed in 0.1.0 diff --git a/README.md b/README.md index 1f5f5a6..a1331f5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Heck, it may not even be appropriate for your application of Senzing! ## Synopsis `demo-entity-search` is a command in the -[senzing-tools](https://github.com/Senzing/senzing-tools) +[senzing-tools](https://github.com/senzing-garage/senzing-tools) suite of tools. This command is a demonstration of entity search. diff --git a/go.mod b/go.mod index 9420336..4f5d3f6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/senzing-garage/go-cmdhelping v0.2.0 github.com/senzing-garage/go-observing v0.3.0 - github.com/senzing-garage/go-rest-api-service v0.9.0 + github.com/senzing-garage/go-rest-api-service v0.9.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 @@ -25,7 +25,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.5.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -38,14 +38,14 @@ require ( github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/segmentio/asm v1.2.0 // indirect + github.com/senzing-garage/g2-sdk-go v0.9.0 // indirect + github.com/senzing-garage/g2-sdk-go-base v0.5.0 // indirect + github.com/senzing-garage/g2-sdk-go-grpc v0.6.0 // indirect github.com/senzing-garage/g2-sdk-json-type-definition v0.2.0 // indirect + github.com/senzing-garage/g2-sdk-proto/go v0.0.0-20240126210601-d02d3beb81d4 // indirect github.com/senzing-garage/go-logging v1.4.0 // indirect github.com/senzing-garage/go-messaging v1.4.0 // indirect - github.com/senzing/g2-sdk-go v0.8.0 // indirect - github.com/senzing/g2-sdk-go-base v0.4.0 // indirect - github.com/senzing/g2-sdk-go-grpc v0.5.0 // indirect - github.com/senzing/g2-sdk-proto/go v0.0.0-20240115134958-8e806054968d // indirect - github.com/senzing/go-sdk-abstract-factory v0.5.0 // indirect + github.com/senzing-garage/go-sdk-abstract-factory v0.6.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect @@ -61,7 +61,7 @@ require ( golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 1bf5f1c..a5ba7a2 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -71,8 +71,16 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/senzing-garage/g2-sdk-go v0.9.0 h1:Noa62gKeY5opeUwIi7/VHKjDR/VX21BZiooqt1ewJBI= +github.com/senzing-garage/g2-sdk-go v0.9.0/go.mod h1:09Rk4ZnOgXuN/uwnBHSs/TJ27IP8Dg7jW8vK4MWEEWY= +github.com/senzing-garage/g2-sdk-go-base v0.5.0 h1:qyf7vkncP7UCmpQqnDth0zErbLE2OboVYxXkGa1qJh4= +github.com/senzing-garage/g2-sdk-go-base v0.5.0/go.mod h1:ohjqSwsrzQJC9ugLwF7QB96UgT+4cqE9fHgOHqELkc0= +github.com/senzing-garage/g2-sdk-go-grpc v0.6.0 h1:fhJTOLDg3cIt8ImY/x2ZD2wpA/V0zxHf4yrM+WoHL90= +github.com/senzing-garage/g2-sdk-go-grpc v0.6.0/go.mod h1:DyOK3ZS/GsO1YOtgh19P/D1JaeEqIMCimZa//OJZQsk= github.com/senzing-garage/g2-sdk-json-type-definition v0.2.0 h1:3lTvJshOrT3hk3c9YlMHu0h0eZg3nY4he3Ial2oeB5A= github.com/senzing-garage/g2-sdk-json-type-definition v0.2.0/go.mod h1:tL1JoqR3GiwiPUrSm1is/sPBwHmYlxz9Jsv/3yHINqM= +github.com/senzing-garage/g2-sdk-proto/go v0.0.0-20240126210601-d02d3beb81d4 h1:G++g9Eky1SrzDQzruhkG9MwWBlscc9RlAzWZScXMdcc= +github.com/senzing-garage/g2-sdk-proto/go v0.0.0-20240126210601-d02d3beb81d4/go.mod h1:Wc4apKs4NfTnCewdQZqS+KCO1BoxabG4DR/CTGA0968= github.com/senzing-garage/go-cmdhelping v0.2.0 h1:c1T1v+FUtQ31Lzo7VXmSKGEuIBXPi4RGPjnwy+Lt3Ao= github.com/senzing-garage/go-cmdhelping v0.2.0/go.mod h1:+IYFvjFPJlF1Nfxq0RdWqePj8NzPPKEOCYPTLCtk/ic= github.com/senzing-garage/go-common v0.4.0 h1:/6/5yNY80udkbOzSAX0Vvx2+0kD9JF7fhqNUlRj2Vho= @@ -83,18 +91,10 @@ github.com/senzing-garage/go-messaging v1.4.0 h1:XNnOsx4yHslhggNJkZD+p3/Fv/zwhbx github.com/senzing-garage/go-messaging v1.4.0/go.mod h1:V/B3SZSZY7cw2Nc7rZQkLaJu/PRyDA4AbviccDRjW1I= github.com/senzing-garage/go-observing v0.3.0 h1:uWKZtiW4dwQJx8i7Y+7QrdrBJ8NPSOTZu2+6q0gy1DI= github.com/senzing-garage/go-observing v0.3.0/go.mod h1:Bxl4c7G9hQ8iqSxZp/omolUhmkEdrbCzLt0s0VkPdnw= -github.com/senzing-garage/go-rest-api-service v0.9.0 h1:jZWUKjCqzb0mfH1UO7/Dhx0x+oQjn8/F6DVqTSbsdls= -github.com/senzing-garage/go-rest-api-service v0.9.0/go.mod h1:zEAE3YqsxmGrb/axpk7tX2mEtHotGteH03C5IW1LHEY= -github.com/senzing/g2-sdk-go v0.8.0 h1:yIjEd9VG6JjqfOdCjcfBngdA4dVT09VoDi0mrK9lGvQ= -github.com/senzing/g2-sdk-go v0.8.0/go.mod h1:Yhl21r6uadwAfVcVu0OojXLT/N+Abbpft+rNzsWFcRM= -github.com/senzing/g2-sdk-go-base v0.4.0 h1:UdSpwY+wY8thKmRJ1t8KsnRWyEQQEu8SgAOlynptM2w= -github.com/senzing/g2-sdk-go-base v0.4.0/go.mod h1:+odv+iRUY5h113T0c4SzKgy0dEbnYGPy+f2Z2U0iTeU= -github.com/senzing/g2-sdk-go-grpc v0.5.0 h1:l1EB2yQFFUhi5pJUYfP2ROQyG3Hp8rVGsRFyehooG04= -github.com/senzing/g2-sdk-go-grpc v0.5.0/go.mod h1:rDnRBJA/FgZjIrRQea9uGRZOSHQ4uObDZt+iRidFeyE= -github.com/senzing/g2-sdk-proto/go v0.0.0-20240115134958-8e806054968d h1:urvVlkRwML7e2qgLt0z6RrjHVhqfXmvEu+ajvF80FJU= -github.com/senzing/g2-sdk-proto/go v0.0.0-20240115134958-8e806054968d/go.mod h1:Ux8LjqUsKd/Xie4i+2PHMulY2vlSubmmVatjQta3JqA= -github.com/senzing/go-sdk-abstract-factory v0.5.0 h1:heWbXpxm0oeKR0G8RDA69OLZEnsr7UP4javU42oYEhs= -github.com/senzing/go-sdk-abstract-factory v0.5.0/go.mod h1:Kzt8To9fBTD8/MDoi+0q8p6h/cQ2iAF8P1dh0b5Ghxw= +github.com/senzing-garage/go-rest-api-service v0.9.1 h1:u1tzi7+EzT9QSripNUyHBGe9aPXPaUJwbw4jlJrEV9s= +github.com/senzing-garage/go-rest-api-service v0.9.1/go.mod h1:8/SyoqCZz6xmt9d/EZ0j5qImgTOeMzukc7qdh97jOtQ= +github.com/senzing-garage/go-sdk-abstract-factory v0.6.0 h1:icVGWsHVzS9RuLTL8mSXo0PShPtrL6LvlqRv6jAbVC8= +github.com/senzing-garage/go-sdk-abstract-factory v0.6.0/go.mod h1:3AnQZoiQ7W8XkjDUDZ/RkreN0XMVAZad+m+/ld1hGjw= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= @@ -146,8 +146,8 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=