From 8c290cf360d29e26cdf8a6d2a9707029ca34a663 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:06:50 -0800 Subject: [PATCH] senzing-factory/build-resources#15 update go workflow permissions (#40) --- .../add-to-project-garage-dependabot.yaml | 29 ++++------ .github/workflows/add-to-project-garage.yaml | 8 ++- .../dependabot-approve-and-merge.yaml | 6 +- .github/workflows/docker-build-container.yaml | 6 +- .github/workflows/go-proxy-pull.yaml | 11 ++-- .github/workflows/go-test-darwin.yaml | 14 ++++- .github/workflows/go-test-linux.yaml | 16 ++++-- .github/workflows/go-test-windows.yaml | 15 ++++- .github/workflows/gofmt.yaml | 9 ++- .github/workflows/gosec.yaml | 11 ++-- .github/workflows/make-go-github-file.yaml | 15 +++-- .github/workflows/make-go-tag.yaml | 11 +++- .github/workflows/move-pr-to-done.yaml | 9 --- CHANGELOG.md | 9 +++ README.md | 2 +- go.mod | 26 ++++----- go.sum | 56 +++++++++---------- input/rabbitmq/rabbitmq.go | 4 +- input/sqs/sqs.go | 4 +- 19 files changed, 151 insertions(+), 110 deletions(-) delete mode 100644 .github/workflows/move-pr-to-done.yaml diff --git a/.github/workflows/add-to-project-garage-dependabot.yaml b/.github/workflows/add-to-project-garage-dependabot.yaml index 91cb367..d7adc03 100644 --- a/.github/workflows/add-to-project-garage-dependabot.yaml +++ b/.github/workflows/add-to-project-garage-dependabot.yaml @@ -1,21 +1,14 @@ -name: add-to-project-garage-dependabot.yaml +name: 'add to project garage dependabot' + on: pull_request: - types: - - opened - - reopened -env: - CREATOR: ${{ github.event.pull_request.user.login }} + branches: [main] + jobs: - add-to-project: - name: Add dependabot pull request to project - runs-on: ubuntu-latest - steps: - - name: Assign pull request to project - env: - BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }} - if: ${{ env.BOOL == 'true' }} - uses: actions/add-to-project@v0.5.0 - with: - project-url: https://github.com/orgs/senzing-garage/projects/3 - github-token: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} + + add-to-project-dependabot: + secrets: + SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }} + uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@main + with: + project: ${{ vars.SENZING_PROJECT_GARAGE }} diff --git a/.github/workflows/add-to-project-garage.yaml b/.github/workflows/add-to-project-garage.yaml index 4599e4e..ddebc40 100644 --- a/.github/workflows/add-to-project-garage.yaml +++ b/.github/workflows/add-to-project-garage.yaml @@ -1,9 +1,11 @@ -name: add-to-project-garage.yaml +name: 'add to project garage' + on: issues: types: - - reopened - opened + - reopened + jobs: add-to-project: name: Add issue to project @@ -12,5 +14,5 @@ jobs: - name: Assign issue to project uses: actions/add-to-project@v0.5.0 with: - project-url: https://github.com/orgs/senzing-garage/projects/3 + project-url: https://github.com/orgs/${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}/projects/${{ vars.SENZING_PROJECT_GARAGE }} github-token: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} 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/docker-build-container.yaml b/.github/workflows/docker-build-container.yaml index d1cb2a6..239301a 100644 --- a/.github/workflows/docker-build-container.yaml +++ b/.github/workflows/docker-build-container.yaml @@ -1,15 +1,17 @@ -name: docker-build-container.yaml +name: 'docker build container' + on: pull_request: branches: - main workflow_dispatch: + jobs: docker-build-container: runs-on: ubuntu-latest steps: - name: Build docker image - uses: senzing-factory/github-action-docker-buildx-build@latest + uses: senzing-factory/github-action-docker-buildx-build@v1 with: image-repository: senzing/load password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} diff --git a/.github/workflows/go-proxy-pull.yaml b/.github/workflows/go-proxy-pull.yaml index f9c41ab..e95e58f 100644 --- a/.github/workflows/go-proxy-pull.yaml +++ b/.github/workflows/go-proxy-pull.yaml @@ -1,14 +1,13 @@ -# 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' -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 diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index da683d7..13cef89 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -1,12 +1,15 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment +name: 'go test darwin' -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 }} @@ -21,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/load/load/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 ed779e2..f0cf0b7 100644 --- a/.github/workflows/go-test-linux.yaml +++ b/.github/workflows/go-test-linux.yaml @@ -1,11 +1,14 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment +name: 'go test linux' -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 }} @@ -13,24 +16,29 @@ jobs: matrix: go: ["1.21"] os: [ubuntu-latest] - senzingapi-version: [staging] + senzingapi-version: [latest] name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}" steps: - name: Checkout repository 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 run: go test -v -p 1 ./... diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml index f78538a..3cbbb78 100644 --- a/.github/workflows/go-test-windows.yaml +++ b/.github/workflows/go-test-windows.yaml @@ -1,10 +1,13 @@ -# Based on -# - https://github.com/marketplace/actions/setup-go-environment +name: 'go test windows' -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 }} @@ -19,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 6bf9fbe..6f08ffb 100644 --- a/.github/workflows/gofmt.yaml +++ b/.github/workflows/gofmt.yaml @@ -1,7 +1,12 @@ -name: gofmt.yaml +name: 'gofmt' + on: pull_request: branches: [main] + +permissions: + contents: read + 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 42443d8..4cfbf57 100644 --- a/.github/workflows/gosec.yaml +++ b/.github/workflows/gosec.yaml @@ -1,7 +1,5 @@ -# Based on -# - https://github.com/securego/gosec +name: 'gosec' -name: gosec.yaml on: push: branches: @@ -9,6 +7,10 @@ on: pull_request: branches: - main + +permissions: + contents: read + jobs: gosec: runs-on: ubuntu-latest @@ -17,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/.github/workflows/make-go-github-file.yaml b/.github/workflows/make-go-github-file.yaml index 7ba655b..a4f506b 100644 --- a/.github/workflows/make-go-github-file.yaml +++ b/.github/workflows/make-go-github-file.yaml @@ -1,13 +1,18 @@ -name: make-go-github-file.yaml +name: 'make go github file' + on: push: tags: - "[0-9]+.[0-9]+.[0-9]+" -permissions: write-all + +permissions: + contents: write + pull-requests: write + jobs: make-go-github-file: - uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@main + uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@v1 secrets: - SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }} - SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }} SENZING_GITHUB_ACTOR: ${{ secrets.SENZING_GITHUB_ACTOR }} + SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }} + SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }} diff --git a/.github/workflows/make-go-tag.yaml b/.github/workflows/make-go-tag.yaml index ad7670f..f8603a4 100644 --- a/.github/workflows/make-go-tag.yaml +++ b/.github/workflows/make-go-tag.yaml @@ -1,9 +1,13 @@ -name: make-go-tag.yaml +name: 'make go tag' + 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 @@ -11,5 +15,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + - name: Make go version tag - uses: senzing-factory/github-action-make-go-tag@main + uses: senzing-factory/github-action-make-go-tag@v1 diff --git a/.github/workflows/move-pr-to-done.yaml b/.github/workflows/move-pr-to-done.yaml deleted file mode 100644 index 099d1b4..0000000 --- a/.github/workflows/move-pr-to-done.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: move-pr-to-done.yaml -on: - pull_request: - types: [closed] -jobs: - move-pr-to-done: - uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done.yaml@main - secrets: - SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index fb2b228..d8d5d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - +## [0.1.1] - 2024-01-29 + +### Changed in 0.1.1 + +- Update dependencies + - github.com/senzing-garage/g2-sdk-go v0.9.0 + - github.com/senzing-garage/go-queueing v0.2.1 + - github.com/senzing-garage/go-sdk-abstract-factory v0.6.0 + ## [0.1.0] - 2024-01-03 ### Changed in 0.1.0 diff --git a/README.md b/README.md index 80a4853..53baaeb 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Heck, it may not even be appropriate for your application of Senzing! ## Synopsis `load` 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 can pull records from a variety of sources and insert into the Senzing database. diff --git a/go.mod b/go.mod index 4e8cb0a..9832720 100644 --- a/go.mod +++ b/go.mod @@ -3,27 +3,27 @@ module github.com/senzing-garage/load go 1.21 require ( + github.com/senzing-garage/g2-sdk-go v0.9.0 github.com/senzing-garage/go-cmdhelping v0.2.0 github.com/senzing-garage/go-logging v1.4.0 - github.com/senzing-garage/go-queueing v0.2.0 - github.com/senzing/g2-sdk-go v0.8.0 - github.com/senzing/go-sdk-abstract-factory v0.5.0 + github.com/senzing-garage/go-queueing v0.2.1 + github.com/senzing-garage/go-sdk-abstract-factory v0.6.0 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 ) require ( github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.26.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.16.15 // indirect + github.com/aws/aws-sdk-go-v2/config v1.26.6 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect github.com/aws/aws-sdk-go-v2/service/sqs v1.29.7 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect github.com/aws/smithy-go v1.19.0 // indirect @@ -40,24 +40,24 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.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-proto/go v0.0.0-20240126210601-d02d3beb81d4 // indirect github.com/senzing-garage/go-common v0.4.0 // indirect github.com/senzing-garage/go-messaging v1.4.0 // indirect github.com/senzing-garage/go-observing v0.3.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/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect 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-20240112132812-db7319d0e0e3 // indirect + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/net v0.20.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/grpc v1.60.1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // 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 26509b1..d0764b0 100644 --- a/go.sum +++ b/go.sum @@ -2,26 +2,26 @@ github.com/aquilax/truncate v1.0.0 h1:UgIGS8U/aZ4JyOJ2h3xcF5cSQ06+gGBnjxH2RUHJe0 github.com/aquilax/truncate v1.0.0/go.mod h1:BeMESIDMlvlS3bmg4BVvBbbZUNwWtS8uzYPAKXwwhLw= github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= -github.com/aws/aws-sdk-go-v2/config v1.26.4 h1:Juj7LhtxNudNUlfX22K5AnLafO+v4eq9PA3VWSCIQs4= -github.com/aws/aws-sdk-go-v2/config v1.26.4/go.mod h1:tioqQ7wvxMYnTDpoTTLHhV3Zh+z261i/f2oz+ds8eNI= -github.com/aws/aws-sdk-go-v2/credentials v1.16.15 h1:P0/m1LU08MF2kRzx4P//+7lNjiJod1z4xI2WpWhdpTQ= -github.com/aws/aws-sdk-go-v2/credentials v1.16.15/go.mod h1:pgtMCf7Dx4GWw5EpHOTc2Sy17LIP0A0N2C9nQ83pQ/0= +github.com/aws/aws-sdk-go-v2/config v1.26.6 h1:Z/7w9bUqlRI0FFQpetVuFYEsjzE3h7fpU6HuGmfPL/o= +github.com/aws/aws-sdk-go-v2/config v1.26.6/go.mod h1:uKU6cnDmYCvJ+pxO9S4cWDb2yWWIH5hra+32hVh1MI4= +github.com/aws/aws-sdk-go-v2/credentials v1.16.16 h1:8q6Rliyv0aUFAVtzaldUEcS+T5gbadPbWdV1WcAddK8= +github.com/aws/aws-sdk-go-v2/credentials v1.16.16/go.mod h1:UHVZrdUsv63hPXFo1H7c5fEneoVo9UXiz36QG1GEPi0= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4= github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 h1:n3GDfwqF2tzEkXlv5cuy4iy7LpKDtqDMcNLfZDu9rls= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino= github.com/aws/aws-sdk-go-v2/service/sqs v1.29.7 h1:tRNrFDGRm81e6nTX5Q4CFblea99eAfm0dxXazGpLceU= github.com/aws/aws-sdk-go-v2/service/sqs v1.29.7/go.mod h1:8GWUDux5Z2h6z2efAtr54RdHXtLm8sq7Rg85ZNY/CZM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 h1:eajuO3nykDPdYicLlP3AGgOyVN3MOlFmZv7WGTuJPow= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.7/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 h1:QPMJf+Jw8E1l7zqhZmMlFw6w1NmfkfiSK8mS4zOx3BA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7/go.mod h1:ykf3COxYI0UJmxcfcxcVuz7b6uADi1FkiUz6Eb7AgM8= github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0= @@ -42,8 +42,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +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/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= @@ -76,6 +76,14 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +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-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= @@ -86,18 +94,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-queueing v0.2.0 h1:nnRl5YUkyzEgiuRM7iwScQUbh8kJvwcEsLLS7h4xO1E= -github.com/senzing-garage/go-queueing v0.2.0/go.mod h1:y/DJcvXA39ux7v7BtdGQDgGWGp9NsHQwvnWcl0KlAL4= -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-queueing v0.2.1 h1:pI92Pwd8Z6iOpnNAJMIhgGxm9GXqsGTYjKhm8bSLoCw= +github.com/senzing-garage/go-queueing v0.2.1/go.mod h1:alM+G5see/8T9Lbix1FXU6TMVCulztLVD6MNMjr27EQ= +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/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= @@ -123,8 +123,8 @@ go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= 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-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= @@ -132,10 +132,10 @@ 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/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +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= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= diff --git a/input/rabbitmq/rabbitmq.go b/input/rabbitmq/rabbitmq.go index 5d92d49..86cb7b8 100644 --- a/input/rabbitmq/rabbitmq.go +++ b/input/rabbitmq/rabbitmq.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/senzing-garage/g2-sdk-go/g2api" "github.com/senzing-garage/go-logging/logging" "github.com/senzing-garage/go-queueing/queues/rabbitmq" - "github.com/senzing/g2-sdk-go/g2api" - "github.com/senzing/go-sdk-abstract-factory/factory" + "github.com/senzing-garage/go-sdk-abstract-factory/factory" ) // ---------------------------------------------------------------------------- diff --git a/input/sqs/sqs.go b/input/sqs/sqs.go index 0722e64..e4f124c 100644 --- a/input/sqs/sqs.go +++ b/input/sqs/sqs.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/senzing-garage/g2-sdk-go/g2api" "github.com/senzing-garage/go-logging/logging" "github.com/senzing-garage/go-queueing/queues/sqs" - "github.com/senzing/g2-sdk-go/g2api" - "github.com/senzing/go-sdk-abstract-factory/factory" + "github.com/senzing-garage/go-sdk-abstract-factory/factory" ) // ----------------------------------------------------------------------------