Skip to content

Commit 5118f6c

Browse files
authored
#62 Change servegrpc to serve-grpc (#63)
* #62 Change servegrpc to serve-grpc * #62 Savepoint * #62 Savepoint
1 parent 6a116c6 commit 5118f6c

23 files changed

+218
-201
lines changed

.github/workflows/go-proxy-pull.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: Pull new module version
2020
uses: andrewslotin/[email protected]
2121
with:
22-
import_path: github.com/senzing/servegrpc
22+
import_path: github.com/senzing/serve-grpc

CHANGELOG.md

+7
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.4.0] - 2023-03-27
14+
15+
### Added in 0.4.0
16+
17+
- Repository name change from `servegrpc` to `serve-grpc`
18+
1319
## [0.3.9] - 2023-03-27
1420

1521
### Added in 0.3.9
@@ -19,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1925
- g2engineserver.StreamExportCSVEntityReport()
2026
- g2engineserver.StreamExportJSONEntityReport()
2127
- Update dependencies
28+
- Last versioned release before name change to serve-grpc
2229

2330
## [0.3.8] - 2023-03-14
2431

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ The variables are used throughout the installation procedure.
8383

8484
```console
8585
export GIT_ACCOUNT=senzing
86-
export GIT_REPOSITORY=servegrpc
86+
export GIT_REPOSITORY=serve-grpc
8787
```
8888

8989
Synthesize environment variables.

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG IMAGE_FINAL=senzing/senzingapi-runtime:3.4.2
1111

1212
FROM ${IMAGE_GO_BUILDER} as go_builder
1313
ENV REFRESHED_AT 2023-03-08
14-
LABEL Name="senzing/servegrpc-builder" \
14+
LABEL Name="senzing/serve-grpc-builder" \
1515
Maintainer="[email protected]" \
1616
Version="0.3.6"
1717

@@ -55,7 +55,7 @@ RUN mkdir -p /output \
5555

5656
FROM ${IMAGE_FINAL} as final
5757
ENV REFRESHED_AT 2023-03-08
58-
LABEL Name="senzing/servegrpc" \
58+
LABEL Name="senzing/serve-grpc" \
5959
Maintainer="[email protected]" \
6060
Version="0.3.6"
6161

@@ -66,7 +66,7 @@ COPY ./testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
6666

6767
# Copy files from prior step.
6868

69-
COPY --from=go_builder "/output/linux/servegrpc" "/app/servegrpc"
69+
COPY --from=go_builder "/output/linux/serve-grpc" "/app/serve-grpc"
7070

7171
# Runtime environment variables.
7272

@@ -76,4 +76,4 @@ ENV SENZING_TOOLS_DATABASE_URL=sqlite3://na:na@/tmp/sqlite/G2C.db
7676
# Runtime execution.
7777

7878
WORKDIR /app
79-
ENTRYPOINT ["/app/servegrpc"]
79+
ENTRYPOINT ["/app/serve-grpc"]

Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile that builds servegrpc, a "go" program.
1+
# Makefile that builds serve-grpc, a "go" program.
22

33
# "Simple expanded" variables (':=')
44

@@ -57,8 +57,8 @@ build-linux:
5757
GOARCH=amd64 \
5858
go build \
5959
-ldflags \
60-
"-X 'github.com/senzing/servegrpc/cmd.buildVersion=${BUILD_VERSION}' \
61-
-X 'github.com/senzing/servegrpc/cmd.buildIteration=${BUILD_ITERATION}' \
60+
"-X 'github.com/senzing/serve-grpc/cmd.buildVersion=${BUILD_VERSION}' \
61+
-X 'github.com/senzing/serve-grpc/cmd.buildIteration=${BUILD_ITERATION}' \
6262
" \
6363
-o $(GO_PACKAGE_NAME)
6464
@mkdir -p $(TARGET_DIRECTORY)/linux || true
@@ -138,13 +138,13 @@ docker-run:
138138
$(DOCKER_IMAGE_NAME)
139139

140140

141-
.PHONY: run-servegrpc
142-
run-servegrpc: build
143-
@target/linux/servegrpc
141+
.PHONY: run-serve-grpc
142+
run-serve-grpc: build
143+
@target/linux/serve-grpc
144144

145-
.PHONY: run-servegrpc-trace
146-
run-servegrpc-trace: build
147-
@target/linux/servegrpc --log-level TRACE --engine-log-level 1
145+
.PHONY: run-serve-grpc-trace
146+
run-serve-grpc-trace: build
147+
@target/linux/serve-grpc --log-level TRACE --engine-log-level 1
148148

149149
# -----------------------------------------------------------------------------
150150
# Utility targets

README.md

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
# servegrpc
1+
# serve-grpc
22

3-
## :warning: WARNING: servegrpc is still in development :warning: _
3+
## :warning: WARNING: serve-grpc is still in development :warning: _
44

55
At the moment, this is "work-in-progress" with Semantic Versions of `0.n.x`.
66
Although it can be reviewed and commented on,
77
the recommendation is not to use it yet.
88

99
## Synopsis
1010

11-
`servegrpc` is a command in the
11+
`serve-grpc` is a command in the
1212
[senzing-tools](https://github.com/Senzing/senzing-tools)
1313
suite of tools.
1414
This command is a
1515
[gRPC](https://grpc.io/)
1616
server application that supports requests to the Senzing SDK via network access.
1717

18-
[![Go Reference](https://pkg.go.dev/badge/github.com/senzing/servegrpc.svg)](https://pkg.go.dev/github.com/senzing/servegrpc)
19-
[![Go Report Card](https://goreportcard.com/badge/github.com/senzing/servegrpc)](https://goreportcard.com/report/github.com/senzing/servegrpc)
18+
[![Go Reference](https://pkg.go.dev/badge/github.com/senzing/serve-grpc.svg)](https://pkg.go.dev/github.com/senzing/serve-grpc)
19+
[![Go Report Card](https://goreportcard.com/badge/github.com/senzing/serve-grpc)](https://goreportcard.com/report/github.com/senzing/serve-grpc)
20+
[![go-test.yaml](https://github.com/Senzing/serve-grpc/actions/workflows/go-test.yaml/badge.svg)](https://github.com/Senzing/serve-grpc/actions/workflows/go-test.yaml)
2021

2122
## Overview
2223

23-
`servegrpc` supports the
24+
`serve-grpc` supports the
2425
[Senzing Protocol Buffer definitions](https://github.com/Senzing/g2-sdk-proto).
2526
Under the covers, the gRPC request is translated by the gRPC server into a Senzing Go SDK API call using
2627
[senzing/g2-sdk-go-base](https://github.com/Senzing/g2-sdk-go-base).
@@ -33,7 +34,7 @@ Senzing SDKs for accessing the gRPC server:
3334

3435
## Install
3536

36-
1. The `servegrpc` command is installed with the
37+
1. The `serve-grpc` command is installed with the
3738
[senzing-tools](https://github.com/Senzing/senzing-tools)
3839
suite of tools.
3940
See senzing-tools [install](https://github.com/Senzing/senzing-tools#install).
@@ -42,16 +43,16 @@ Senzing SDKs for accessing the gRPC server:
4243

4344
```console
4445
export LD_LIBRARY_PATH=/opt/senzing/g2/lib/
45-
senzing-tools servegrpc [flags]
46+
senzing-tools serve-grpc [flags]
4647
```
4748

4849
1. For options and flags:
49-
1. [Online documentation](https://hub.senzing.com/senzing-tools/senzing-tools_servegrpc.html)
50+
1. [Online documentation](https://hub.senzing.com/senzing-tools/senzing-tools_serve-grpc.html)
5051
1. Runtime documentation:
5152

5253
```console
5354
export LD_LIBRARY_PATH=/opt/senzing/g2/lib/
54-
senzing-tools servegrpc --help
55+
senzing-tools serve-grpc --help
5556
```
5657

5758
1. In addition to the following simple usage examples, there are additional [Examples](docs/examples.md).
@@ -63,7 +64,7 @@ senzing-tools servegrpc [flags]
6364

6465
```console
6566
export LD_LIBRARY_PATH=/opt/senzing/g2/lib/
66-
senzing-tools servegrpc --database-url postgresql://username:[email protected]:5432/G2
67+
senzing-tools serve-grpc --database-url postgresql://username:[email protected]:5432/G2
6768
```
6869

6970
1. See [Parameters](#parameters) for additional parameters.
@@ -76,7 +77,7 @@ senzing-tools servegrpc [flags]
7677
```console
7778
export SENZING_TOOLS_DATABASE_URL=postgresql://username:[email protected]:5432/G2
7879
export LD_LIBRARY_PATH=/opt/senzing/g2/lib/
79-
senzing-tools servegrpc
80+
senzing-tools serve-grpc
8081
```
8182

8283
1. See [Parameters](#parameters) for additional parameters.
@@ -95,7 +96,7 @@ This usage shows how to initialze a database with a Docker container.
9596
--publish 8258:8258 \
9697
--rm \
9798
--tty \
98-
senzing/senzing-tools servegrpc
99+
senzing/senzing-tools serve-grpc
99100

100101
```
101102

@@ -117,7 +118,7 @@ This usage shows how to initialze a database with a Docker container.
117118

118119
## References
119120

120-
- [Command reference](https://hub.senzing.com/senzing-tools/senzing-tools_servegrpc.html)
121+
- [Command reference](https://hub.senzing.com/senzing-tools/senzing-tools_serve-grpc.html)
121122
- [Development](docs/development.md)
122123
- [Errors](docs/errors.md)
123124
- [Examples](docs/examples.md)

cmd/completion.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ var completionCmd = &cobra.Command{
1414
Use: "completion",
1515
Short: "Generate bash completion for the command",
1616
Long: `To load completions, run:
17-
source < (servegrpc completion)
17+
source < (serve-grpc completion)
1818
1919
To load completions automaticallon on login, add this line to your .bashrc file:
20-
source < (servegrpc completion)
20+
source < (serve-grpc completion)
2121
`,
2222
RunE: func(cmd *cobra.Command, args []string) error {
2323
return completionAction(os.Stdout)

cmd/docs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var docsCmd = &cobra.Command{
2121
return err
2222
}
2323
if dir == "" {
24-
if dir, err = os.MkdirTemp("", "servegrpc"); err != nil {
24+
if dir, err = os.MkdirTemp("", "serve-grpc"); err != nil {
2525
return err
2626
}
2727
}

cmd/root.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/senzing/senzing-tools/envar"
1616
"github.com/senzing/senzing-tools/helper"
1717
"github.com/senzing/senzing-tools/option"
18-
"github.com/senzing/servegrpc/grpcserver"
18+
"github.com/senzing/serve-grpc/grpcserver"
1919
"github.com/spf13/cobra"
2020
"github.com/spf13/viper"
2121
)
@@ -37,7 +37,7 @@ const (
3737
var (
3838
buildIteration string = "0"
3939
buildVersion string = "0.3.7"
40-
defaultEngineModuleName string = fmt.Sprintf("servegrpc-%d", time.Now().Unix())
40+
defaultEngineModuleName string = fmt.Sprintf("serve-grpc-%d", time.Now().Unix())
4141
)
4242

4343
// If a configuration file is present, load it.
@@ -54,7 +54,7 @@ func loadConfigurationFile(cobraCommand *cobra.Command) {
5454

5555
// Specify configuration file name.
5656

57-
viper.SetConfigName("servegrpc")
57+
viper.SetConfigName("serve-grpc")
5858
viper.SetConfigType("yaml")
5959

6060
// Define search path order.
@@ -120,11 +120,11 @@ func loadOptions(cobraCommand *cobra.Command) {
120120

121121
// RootCmd represents the command.
122122
var RootCmd = &cobra.Command{
123-
Use: "servegrpc",
123+
Use: "serve-grpc",
124124
Short: "Start a gRPC server for the Senzing SDK API",
125125
Long: `
126126
Start a gRPC server for the Senzing SDK API.
127-
For more information, visit https://github.com/Senzing/servegrpc
127+
For more information, visit https://github.com/Senzing/serve-grpc
128128
`,
129129
PreRun: func(cobraCommand *cobra.Command, args []string) {
130130
loadConfigurationFile(cobraCommand)

doc.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ One or two paragraph overview of this module...
77
88
(This page describes the nature of the entire Go module or the top-level command, not an individual package.)
99
10-
More information at https://github.com/senzing/servegrpc
10+
More information at https://github.com/senzing/serve-grpc
1111
1212
# Example Package
1313
@@ -16,7 +16,7 @@ documentation, tests, and examples should be done. This paragraph (or two)
1616
should provide a brief overview while linking the reader to the documentation
1717
included in the package itself.
1818
19-
More information can be found in the [pkg/github.com/senzing/servegrpc/examplepackage] documentation.
19+
More information can be found in the [pkg/github.com/senzing/serve-grpc/examplepackage] documentation.
2020
2121
# Another Header: Package or other module features...
2222
@@ -33,8 +33,8 @@ Examples of use can be seen in the main_test.go files.
3333
import (
3434
fmt
3535
36-
"github.com/senzing/servegrpc/examplepackage"
37-
"github.com/senzing/servegrpc/anotherpackage"
36+
"github.com/senzing/serve-grpc/examplepackage"
37+
"github.com/senzing/serve-grpc/anotherpackage"
3838
)
3939
4040
func main() {

docs/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# servegrpc
1+
# serve-grpc
22

33
## Commands
44

5-
1. [senzing-tools servegrpc](https://hub.senzing.com/senzing-tools/senzing-tools_servegrpc.html)
5+
1. [senzing-tools serve-grpc](https://hub.senzing.com/senzing-tools/senzing-tools_serve-grpc.html)
66

77
## Examples
88

0 commit comments

Comments
 (0)