Skip to content

Commit 6dcf058

Browse files
docktermjdocktermj
authored
#318 Prepare for versioned release (#319)
1 parent 79287fa commit 6dcf058

7 files changed

+27
-29
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
-
1212

13+
## [0.8.1] - 2024-08-27
14+
15+
### Changed in 0.8.1
16+
17+
- Modify method calls to match Senzing API 4.0.0-24237
18+
1319
## [0.8.0] - 2024-08-23
1420

1521
### Changed in 0.8.0

‎go.mod

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/senzing-garage/serve-grpc
22

3-
go 1.21
3+
go 1.21.0
4+
5+
toolchain go1.22.0
46

57
require (
68
github.com/aquilax/truncate v1.0.0
@@ -9,7 +11,7 @@ require (
911
github.com/senzing-garage/go-logging v1.5.0
1012
github.com/senzing-garage/go-observing v0.3.2
1113
github.com/senzing-garage/sz-sdk-go v0.14.0
12-
github.com/senzing-garage/sz-sdk-go-core v0.8.0
14+
github.com/senzing-garage/sz-sdk-go-core v0.8.1
1315
github.com/senzing-garage/sz-sdk-proto v0.7.6
1416
github.com/spf13/cobra v1.8.1
1517
github.com/spf13/viper v1.19.0
@@ -25,7 +27,7 @@ require (
2527
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2628
github.com/magiconair/properties v1.8.7 // indirect
2729
github.com/mitchellh/mapstructure v1.5.0 // indirect
28-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
30+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
2931
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3032
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3133
github.com/sagikazarmark/locafero v0.6.0 // indirect
@@ -41,7 +43,7 @@ require (
4143
golang.org/x/net v0.28.0 // indirect
4244
golang.org/x/sys v0.24.0 // indirect
4345
golang.org/x/text v0.17.0 // indirect
44-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
46+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
4547
google.golang.org/protobuf v1.34.2 // indirect
4648
gopkg.in/ini.v1 v1.67.0 // indirect
4749
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

+6-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ github.com/aquilax/truncate v1.0.0 h1:UgIGS8U/aZ4JyOJ2h3xcF5cSQ06+gGBnjxH2RUHJe0
22
github.com/aquilax/truncate v1.0.0/go.mod h1:BeMESIDMlvlS3bmg4BVvBbbZUNwWtS8uzYPAKXwwhLw=
33
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
44
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
5-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
65
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
76
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
87
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -24,9 +23,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
2423
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
2524
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
2625
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
27-
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
28-
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
29-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
26+
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
27+
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
3028
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
3129
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3230
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -49,8 +47,8 @@ github.com/senzing-garage/go-observing v0.3.2 h1:jXW5u656aZywe/UEUi7ga7nieBSW4CU
4947
github.com/senzing-garage/go-observing v0.3.2/go.mod h1:5yHCwaaIrwX81JOghAL/1Q1V8eF7SQhyBBdhTb7+rgY=
5048
github.com/senzing-garage/sz-sdk-go v0.14.0 h1:Pv+CGgl3qFmaksMlzkcMATdFplnWZi3oFx+enFU9rcM=
5149
github.com/senzing-garage/sz-sdk-go v0.14.0/go.mod h1:pr9d622FPNGFPgAFooCcUWNeh+AEyVDkvR3Fmsp6whg=
52-
github.com/senzing-garage/sz-sdk-go-core v0.8.0 h1:cUvAZ82ZedmxAwK1TOXwZPvBEqQrXaVlH6ehzL72n9k=
53-
github.com/senzing-garage/sz-sdk-go-core v0.8.0/go.mod h1:b2bLdApK/a03UrK0PMWCXAnjG1gHZ1Zkf73qGB7wTxk=
50+
github.com/senzing-garage/sz-sdk-go-core v0.8.1 h1:cONM0+0UxqrNbeXja0fUOnof1NVqJAui3B212BwgmDc=
51+
github.com/senzing-garage/sz-sdk-go-core v0.8.1/go.mod h1:n86mrlWjLnrJLDSAxnNCPji0ycKUI2WoBJ7iXMHKqJM=
5452
github.com/senzing-garage/sz-sdk-proto v0.7.6 h1:mHiZr094UTBcRW1OkNam1Pu/pMLZRO/4cIIyjQ/yDlY=
5553
github.com/senzing-garage/sz-sdk-proto v0.7.6/go.mod h1:7CZSZ5yEVmT2T0yiijjdq7dWsdQ/KtRgvKRqCy+j7SI=
5654
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -65,13 +63,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
6563
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6664
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
6765
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
68-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
69-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
70-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
71-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
72-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
73-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
74-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
7566
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
7667
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7768
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
@@ -86,8 +77,8 @@ golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
8677
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
8778
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
8879
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
89-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd h1:6TEm2ZxXoQmFWFlt1vNxvVOa1Q0dXFQD1m/rYjXmS0E=
90-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
9182
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
9283
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
9384
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
@@ -97,6 +88,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
9788
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
9889
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
9990
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
100-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
10191
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
10292
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎package.Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# -----------------------------------------------------------------------------
44

55
ARG IMAGE_SENZINGAPI_RUNTIME=senzing/senzingapi-runtime-staging:latest
6-
ARG IMAGE_GO_BUILDER=golang:1.22.3-bullseye
7-
ARG IMAGE_FPM_BUILDER=dockter/fpm:latest
6+
ARG IMAGE_BUILDER=golang:1.22.3-bullseye
7+
ARG IMAGE_FPM=dockter/fpm:latest
88
ARG IMAGE_FINAL=alpine
99

1010
# -----------------------------------------------------------------------------
@@ -14,10 +14,10 @@ ARG IMAGE_FINAL=alpine
1414
FROM ${IMAGE_SENZINGAPI_RUNTIME} AS senzingapi_runtime
1515

1616
# -----------------------------------------------------------------------------
17-
# Stage: go_builder
17+
# Stage: builder
1818
# -----------------------------------------------------------------------------
1919

20-
FROM ${IMAGE_GO_BUILDER} AS go_builder
20+
FROM ${IMAGE_BUILDER} AS builder
2121
ENV REFRESHED_AT=2024-07-01
2222
LABEL Name="senzing/go-builder" \
2323
Maintainer="[email protected]" \
@@ -51,12 +51,12 @@ RUN mkdir -p /output \
5151
&& cp -R ${GOPATH}/src/${GO_PACKAGE_NAME}/target/* /output/
5252

5353
# -----------------------------------------------------------------------------
54-
# Stage: fpm_builder
54+
# Stage: fpm
5555
# - Reference: https://github.com/jordansissel/fpm/blob/master/Dockerfile
5656
# - FPM: https://fpm.readthedocs.io/en/latest/cli-reference.html
5757
# -----------------------------------------------------------------------------
5858

59-
FROM ${IMAGE_FPM_BUILDER} AS fpm_builder
59+
FROM ${IMAGE_FPM} AS fpm
6060
ENV REFRESHED_AT=2024-07-01
6161
LABEL Name="senzing/fpm-builder" \
6262
Maintainer="[email protected]" \
@@ -71,7 +71,7 @@ ARG GO_PACKAGE_NAME
7171

7272
# Copy files from prior stage.
7373

74-
COPY --from=go_builder "/output/linux-amd64/*" "/output/linux-amd64/"
74+
COPY --from=builder "/output/linux-amd64/*" "/output/linux-amd64/"
7575

7676
# Create Linux RPM package.
7777

@@ -117,8 +117,8 @@ ARG PROGRAM_NAME
117117

118118
# Copy files from prior step.
119119

120-
COPY --from=fpm_builder "/output/*" "/output/"
121-
COPY --from=fpm_builder "/output/linux-amd64/${PROGRAM_NAME}" "/output/linux-amd64/${PROGRAM_NAME}"
120+
COPY --from=fpm "/output/*" "/output/"
121+
COPY --from=fpm "/output/linux-amd64/${PROGRAM_NAME}" "/output/linux-amd64/${PROGRAM_NAME}"
122122

123123
USER 1001
124124
CMD ["/bin/bash"]

‎testdata/sqlite/G2C-empty.db

Whitespace-only changes.

‎testdata/sqlite/G2C-with-config.db

300 KB
Binary file not shown.

‎testdata/sqlite/G2C-with-schema.db

47 KB
Binary file not shown.

0 commit comments

Comments
 (0)