Skip to content

Commit

Permalink
#81 Refactor to template-go
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj committed Sep 13, 2024
1 parent edd50c8 commit e61485b
Show file tree
Hide file tree
Showing 14 changed files with 107 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .github/linters/.golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ linters:
- bidichk
- bodyclose
- contextcheck
- copyloopvar
- durationcheck
- errcheck
- errchkjson
- errorlint
- exhaustive
- exportloopref
- gocheckcompilerdirectives
- gochecksumtype
- gocritic
Expand Down
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
[markdownlint](https://dlaa.me/markdownlint/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
The format is based on [Keep a Changelog], [markdownlint],
and this project adheres to [Semantic Versioning].

## [Unreleased]

## [0.2.1] - 2024-09-13

### Changed in 0.2.1

- Update dependencies

## [0.2.0] - 2024-08-09

### Changed in 0.2.0
Expand Down Expand Up @@ -55,3 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Entity Search
- Swagger UI
- XTerm

[Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
[markdownlint]: https://dlaa.me/markdownlint/
[Semantic Versioning]: https://semver.org/spec/v2.0.0.html
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at <[email protected]>. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Stages
# -----------------------------------------------------------------------------

ARG IMAGE_BUILDER=golang:1.22.3-bullseye
ARG IMAGE_BUILDER=golang:1.22.4-bullseye
ARG IMAGE_FINAL=senzing/senzingapi-runtime-staging:latest

# -----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ BUILD_VERSION := $(shell git describe --always --tags --abbrev=0 --dirty | sed
DOCKER_CONTAINER_NAME := $(PROGRAM_NAME)
DOCKER_IMAGE_NAME := senzing/$(PROGRAM_NAME)
DOCKER_BUILD_IMAGE_NAME := $(DOCKER_IMAGE_NAME)-build
DOCKER_SUT_IMAGE_NAME := $(PROGRAM_NAME)_sut
GIT_REMOTE_URL := $(shell git config --get remote.origin.url)
GIT_REPOSITORY_NAME := $(shell basename `git rev-parse --show-toplevel`)
GIT_VERSION := $(shell git describe --always --tags --long --dirty | sed -e 's/\-0//' -e 's/\-g.......//')
Expand Down Expand Up @@ -69,11 +70,10 @@ hello-world: hello-world-osarch-specific
# -----------------------------------------------------------------------------

.PHONY: dependencies-for-development
dependencies-for-development:
dependencies-for-development: dependencies-for-development-osarch-specific
@go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
@go install github.com/vladopajic/go-test-coverage/v2@latest
@go install golang.org/x/tools/cmd/godoc@latest
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.58.1


.PHONY: dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Example:

```console
cd ${GIT_REPOSITORY_DIR}
make docker-test
make clean docker-test

```

Expand Down
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module github.com/senzing-garage/demo-quickstart

go 1.21.0
go 1.22.0

toolchain go1.22.0
toolchain go1.23.1

require (
github.com/docktermj/cloudshell v0.2.0
github.com/flowchartsman/swaggerui v0.0.0-20221017034628-909ed4f3701b
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
github.com/senzing-garage/demo-entity-search v0.2.0
github.com/senzing-garage/go-cmdhelping v0.3.0
github.com/senzing-garage/demo-entity-search v0.2.1
github.com/senzing-garage/go-cmdhelping v0.3.1
github.com/senzing-garage/go-helpers v0.6.1
github.com/senzing-garage/go-observing v0.3.3
github.com/senzing-garage/go-rest-api-service v0.10.0
github.com/senzing-garage/go-rest-api-service v0.10.1
github.com/senzing-garage/go-rest-api-service-legacy v0.1.1
github.com/senzing-garage/serve-grpc v0.8.1
github.com/senzing-garage/serve-grpc v0.8.2
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -46,43 +46,43 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/ogen-go/ogen v1.3.0 // indirect
github.com/ogen-go/ogen v1.4.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_golang v1.20.3 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.57.0 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/senzing-garage/go-logging v1.5.0 // indirect
github.com/senzing-garage/go-logging v1.5.1 // indirect
github.com/senzing-garage/go-messaging v1.5.2 // indirect
github.com/senzing-garage/go-sdk-abstract-factory v0.9.1 // indirect
github.com/senzing-garage/sz-sdk-go v0.14.0 // indirect
github.com/senzing-garage/sz-sdk-go-core v0.8.1 // indirect
github.com/senzing-garage/sz-sdk-go-grpc v0.8.1 // indirect
github.com/senzing-garage/sz-sdk-go-mock v0.8.0 // indirect
github.com/senzing-garage/sz-sdk-json-type-definition v0.2.6 // indirect
github.com/senzing-garage/sz-sdk-proto v0.7.6 // indirect
github.com/senzing-garage/go-sdk-abstract-factory v0.9.2 // indirect
github.com/senzing-garage/sz-sdk-go v0.14.1 // indirect
github.com/senzing-garage/sz-sdk-go-core v0.8.2 // indirect
github.com/senzing-garage/sz-sdk-go-grpc v0.8.2 // indirect
github.com/senzing-garage/sz-sdk-go-mock v0.8.1 // indirect
github.com/senzing-garage/sz-sdk-json-type-definition v0.2.7 // indirect
github.com/senzing-garage/sz-sdk-proto v0.7.7 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit e61485b

Please sign in to comment.