#276 Improve error wrapping

.github/linters/bearer.yml

@@ -0,0 +1,2 @@
+rule:
+  skip-rule: []

.github/workflows/bearer.yaml

@@ -18,3 +18,5 @@ jobs:
 
       - name: Bearer
         uses: bearer/bearer-action@v2
+        with:
+          config-file: .github/linters/bearer.yml

.github/workflows/go-test-linux.yaml

@@ -2,9 +2,10 @@ name: Go test linux
 
 on:
   push:
+  pull_request:
+    branches: [main]
   schedule:
     - cron: "15 7 * * *"
-  workflow_dispatch:
 
 env:
   SENZING_LOG_LEVEL: TRACE

.github/workflows/go-test-windows.yaml

@@ -28,8 +28,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup go ${{ matrix.go }}
         uses: actions/setup-go@v5

.vscode/cspell.json

@@ -74,6 +74,7 @@
     "**/*.go",
     "**/*.mod",
     "**/*.sum",
+    "bearer.ignore",
     "Makefile"
   ]
 }

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning].
 
 -
 
+## [0.9.10] - 2025-06-03
+
+### Changed in 0.9.10
+
+- Update dependencies
+
 ## [0.9.9] - 2025-05-09
 
 ### Changed in 0.9.9

Makefile

@@ -72,6 +72,7 @@ dependencies-for-development: dependencies-for-development-osarch-specific
 	@go install github.com/vladopajic/go-test-coverage/v2@latest
 	@go install golang.org/x/tools/cmd/godoc@latest
 	@go install golang.org/x/vuln/cmd/govulncheck@latest
+	@go install mvdan.cc/gofumpt@latest
 	@sudo npm install -g cspell@latest
 
 
@@ -181,7 +182,7 @@ update-pkg-cache:
 
 .PHONY: bearer
 bearer:
-	@bearer scan .
+	@bearer scan --config-file .github/linters/bearer.yml .
 
 
 .PHONY: cspell

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/senzing-garage/go-logging v1.5.3
 	github.com/senzing-garage/sz-sdk-go v0.15.4
 	github.com/senzing-garage/sz-sdk-go-core v0.9.6
-	github.com/senzing-garage/sz-sdk-go-grpc v0.9.5
+	github.com/senzing-garage/sz-sdk-go-grpc v0.9.6
 	github.com/senzing-garage/sz-sdk-go-mock v0.8.8
 	github.com/stretchr/testify v1.10.0
 	google.golang.org/grpc v1.72.2
@@ -23,7 +23,7 @@ require (
 	golang.org/x/net v0.40.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -34,8 +34,8 @@ github.com/senzing-garage/sz-sdk-go v0.15.4 h1:Q3dquqNBOtr25ICVk8KVj55qjvKib2eW2
 github.com/senzing-garage/sz-sdk-go v0.15.4/go.mod h1:RPZG4W1AgWxjpA1ogJ0r4TYX0ITx5YhWSIRqEXkdrrg=
 github.com/senzing-garage/sz-sdk-go-core v0.9.6 h1:qtXdf4VqcJIj+elfCciulKvW6kK/ckUAKnKo8608H74=
 github.com/senzing-garage/sz-sdk-go-core v0.9.6/go.mod h1:Wja8sgYbpZ6pvS/Y6wYqI1Nn6OjCTP2xP8+SqKqiMvM=
-github.com/senzing-garage/sz-sdk-go-grpc v0.9.5 h1:H5tdKnWAIRD3vumlguYkMg6A0hU41p0KqGVZZYElogg=
-github.com/senzing-garage/sz-sdk-go-grpc v0.9.5/go.mod h1:D5hsfbJi5nmXkc2V4DF+qOTZjLxT55x4ZjDyPj6njK8=
+github.com/senzing-garage/sz-sdk-go-grpc v0.9.6 h1:c3gD4Yc2GO5oc4yqACGSUlkhZ3nyCsat0DQJlJMo1wU=
+github.com/senzing-garage/sz-sdk-go-grpc v0.9.6/go.mod h1:cFVP4MaGePjGS3wqLXe9ycrvqr3lSKgS1FDdwPwCZNg=
 github.com/senzing-garage/sz-sdk-go-mock v0.8.8 h1:JF6Hqbl+LKR/l7ogPu15rd2vCVMjMbZARsird/P/2og=
 github.com/senzing-garage/sz-sdk-go-mock v0.8.8/go.mod h1:d7RC8/FXEr7SjIfu8AsUQoTGwFLilJGNK0mDQfT0y7c=
 github.com/senzing-garage/sz-sdk-proto v0.8.3 h1:tXnEA8LEcTvx7+kfS5CrC2UhT/tywqerog807zQvNVc=
@@ -62,8 +62,8 @@ golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
 google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=

main.go

@@ -38,7 +38,7 @@ var IDMessages = map[int]string{
 
 var logger logging.Logging
 
-var errMain = errors.New("main")
+var errForMain = errors.New("main")
 
 // ----------------------------------------------------------------------------
 // Main
@@ -105,7 +105,7 @@ func demonstrateAddRecord(ctx context.Context, szEngine senzing.SzEngine) (strin
 
 	result, err := szEngine.AddRecord(ctx, dataSourceCode, recordID, recordDefinition, flags)
 
-	return result, wraperror.Errorf(err, "demonstrateAddRecord error: %w", err)
+	return result, wraperror.Errorf(err, wraperror.NoMessage)
 }
 
 func demonstrateConfigFunctions(ctx context.Context, szAbstractFactory senzing.SzAbstractFactory) error {
@@ -115,40 +115,28 @@ func demonstrateConfigFunctions(ctx context.Context, szAbstractFactory senzing.S
 
 	szConfigManager, err := szAbstractFactory.CreateConfigManager(ctx)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateConfigFunctions.CreateConfigManager error: %w",
-			logger.NewError(5100, err),
-		)
+		return wraperror.Errorf(err, "CreateConfigManager")
 	}
 
 	szConfig, err := szConfigManager.CreateConfigFromTemplate(ctx)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateConfigFunctions.CreateConfigFromTemlate error: %w",
-			logger.NewError(5101, err),
-		)
+		return wraperror.Errorf(err, "CreateConfigFromTemlate")
 	}
 
 	// Using SzConfig: Add data sources to Senzing configuration.
 
 	for dataSourceCode := range truthset.TruthsetDataSources {
 		_, err := szConfig.AddDataSource(ctx, dataSourceCode)
 		if err != nil {
-			return wraperror.Errorf(
-				err,
-				"demonstrateConfigFunctions.AddDataSource error: %w",
-				logger.NewError(5102, err),
-			)
+			return wraperror.Errorf(err, "AddDataSource: %s", dataSourceCode)
 		}
 	}
 
 	// Using SzConfig: Persist configuration to a string.
 
 	configDefinition, err := szConfig.Export(ctx)
 	if err != nil {
-		return wraperror.Errorf(err, "demonstrateConfigFunctions.Export error: %w", logger.NewError(5103, err))
+		return wraperror.Errorf(err, "Export")
 	}
 
 	// Using SzConfigManager: Persist configuration string to database.
@@ -157,14 +145,10 @@ func demonstrateConfigFunctions(ctx context.Context, szAbstractFactory senzing.S
 
 	_, err = szConfigManager.SetDefaultConfig(ctx, configDefinition, configComment)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateConfigFunctions.SetDefaultConfig error: %w",
-			logger.NewError(5104, err),
-		)
+		return wraperror.Errorf(err, "SetDefaultConfig: %s", configComment)
 	}
 
-	return wraperror.Errorf(err, "demonstrateConfigFunctions error: %w", err)
+	return wraperror.Errorf(err, wraperror.NoMessage)
 }
 
 func demonstrateAdditionalFunctions(
@@ -177,29 +161,17 @@ func demonstrateAdditionalFunctions(
 
 	szDiagnostic, err := szAbstractFactory.CreateDiagnostic(ctx)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateAdditionalFunctions.CreateDiagnostic error: %w",
-			logger.NewError(5300, err),
-		)
+		return wraperror.Errorf(err, "CreateDiagnostic")
 	}
 
 	szEngine, err := szAbstractFactory.CreateEngine(ctx)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateAdditionalFunctions.CreateEngine error: %w",
-			logger.NewError(5301, err),
-		)
+		return wraperror.Errorf(err, "CreateEngine")
 	}
 
 	szProduct, err := szAbstractFactory.CreateProduct(ctx)
 	if err != nil {
-		return wraperror.Errorf(
-			err,
-			"demonstrateAdditionalFunctions.CreateProduct error: %w",
-			logger.NewError(5302, err),
-		)
+		return wraperror.Errorf(err, "CreateProduct")
 	}
 
 	// Using SzDiagnostic: Purge repository.
@@ -224,7 +196,7 @@ func demonstrateAdditionalFunctions(
 	err = szDiagnostic.PurgeRepository(ctx)
 	failOnError(5306, err)
 
-	return wraperror.Errorf(err, "demonstrateAdditionalFunctions error: %w", err)
+	return wraperror.Errorf(err, wraperror.NoMessage)
 }
 
 func failOnError(msgID int, err error) {
@@ -275,7 +247,7 @@ func testCases(ctx context.Context, testcaseList []int) {
 			)
 			failOnError(9999, err)
 		default:
-			failOnError(5003, wraperror.Errorf(errMain, "unknown testcase number"))
+			failOnError(5003, wraperror.Errorf(errForMain, "unknown testcase number: %d", runNumber))
 		}
 
 		defer func() { panicOnError(szAbstractFactory.Destroy(ctx)) }()
@@ -315,5 +287,5 @@ func getLogger(ctx context.Context) (logging.Logging, error) {
 
 	result, err := logging.NewSenzingLogger(9999, IDMessages, loggerOptions...)
 
-	return result, wraperror.Errorf(err, "main.getLogger error: %w", err)
+	return result, wraperror.Errorf(err, wraperror.NoMessage)
 }