116.dockter.1

.project

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>go-common</name>
+	<name>go-helpers</name>
 </projectDescription>

CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0] - 2024-04-05
+
+### Changed in 0.5.0
+
+- Move from "G2" to "Sz" prefix
+
 ## [0.4.0] - 2024-01-02
 
 ### Changed in 0.4.0
@@ -29,11 +35,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed in 0.3.0
 
-- In `g2engineconfigurationjson`, Windows paths
+- In `engineconfigurationjson`, Windows paths
 
 ### Removed in 0.3.0
 
-- `g2engineconfigurationjson.BuildSimpleSystemConfigurationJson()`
+- `engineconfigurationjson.BuildSimpleSystemConfigurationJson()`
 
 ## [0.2.14] - 2023-08-24
 
@@ -120,7 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added in 0.2.2
 
-- `g2engineconfigurationjson.VerifySenzingEngineConfigurationJson()`
+- `engineconfigurationjson.VerifySenzingEngineConfigurationJson()`
 
 ## [0.2.1] - 2023-07-13
 

README.md

@@ -37,7 +37,7 @@ The following helpers have been created:
 
 ### Helper functions
 
-- `g2engineconfigurationjson`:  A package for creating the `SENZING_ENGINE_CONFIGURATION_JSON` Document.
+- `engineconfigurationjson`:  A package for creating the `SENZING_ENGINE_CONFIGURATION_JSON` Document.
 
 ### Test data
 

engineconfigurationjson/doc.go

@@ -0,0 +1,4 @@
+/*
+The engineconfigurationjson package is used to create the JSON needed for initializing the Senzing runtime objects.
+*/
+package engineconfigurationjson

g2engineconfigurationjson/g2engineconfigurationjson.go → engineconfigurationjson/engineconfigurationjson.go

@@ -1,7 +1,7 @@
 /*
-Package g2engineconfigurationjson is used to generate the JSON document used to configure a Senzing client.
+Package engineconfigurationjson is used to generate the JSON document used to configure a Senzing client.
 */
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/senzing-garage/go-common/engineconfigurationjsonparser"
+	"github.com/senzing-garage/go-helpers/engineconfigurationjsonparser"
 )
 
 // ----------------------------------------------------------------------------

g2engineconfigurationjson/g2engineconfigurationjson_darwin.go → engineconfigurationjson/engineconfigurationjson_darwin.go

@@ -1,6 +1,6 @@
 //go:build darwin
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import (
 	"context"
@@ -19,8 +19,8 @@ func mapWithDefault(aMap map[string]string, key string, defaultValue string) str
 	return defaultValue
 }
 
-func buildStruct(attributeMap map[string]string) G2Configuration {
-	var result G2Configuration
+func buildStruct(attributeMap map[string]string) SzConfiguration {
+	var result SzConfiguration
 
 	databaseUrl, ok := attributeMap["databaseUrl"]
 	if !ok {
@@ -41,13 +41,13 @@ func buildStruct(attributeMap map[string]string) G2Configuration {
 
 	// Apply attributeMap.
 
-	result = G2Configuration{
-		Pipeline: G2ConfigurationPipeline{
+	result = SzConfiguration{
+		Pipeline: SzConfigurationPipeline{
 			ConfigPath:   mapWithDefault(attributeMap, "configPath", configPath),
 			ResourcePath: mapWithDefault(attributeMap, "resourcePath", resourcePath),
 			SupportPath:  mapWithDefault(attributeMap, "supportPath", supportPath),
 		},
-		Sql: G2ConfigurationSql{
+		Sql: SzConfigurationSql{
 			Connection: databaseUrl,
 		},
 	}
@@ -60,7 +60,9 @@ func buildStruct(attributeMap map[string]string) G2Configuration {
 	return result
 }
 
-func verifySenzingEngineConfigurationJson(ctx context.Context, senzingEngineConfigurationJson string) error {
+func verifySenzingEngineConfigurationJson(ctx context.Context, engineConfigurationJson string) error {
+	_ = ctx
+	_ = engineConfigurationJson
 	var err error = nil
 	return err
 }

g2engineconfigurationjson/g2engineconfigurationjson_darwin_test.go → engineconfigurationjson/engineconfigurationjson_darwin_test.go

@@ -1,6 +1,6 @@
 //go:build darwin
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 var testCasesForOsArch = []testCaseMetadata{
 	{

g2engineconfigurationjson/g2engineconfigurationjson_examples_test.go → engineconfigurationjson/engineconfigurationjson_examples_test.go

@@ -1,6 +1,6 @@
 //go:build linux
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import (
 	"fmt"

g2engineconfigurationjson/g2engineconfigurationjson_linux.go → engineconfigurationjson/engineconfigurationjson_linux.go

@@ -1,28 +1,28 @@
 //go:build linux
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import "context"
 
 // ----------------------------------------------------------------------------
 // Internal methods
 // ----------------------------------------------------------------------------
 
-func buildStruct(attributeMap map[string]string) G2Configuration {
-	var result G2Configuration
+func buildStruct(attributeMap map[string]string) SzConfiguration {
+	var result SzConfiguration
 
 	databaseUrl, ok := attributeMap["databaseUrl"]
 	if !ok {
 		return result
 	}
 
-	result = G2Configuration{
-		Pipeline: G2ConfigurationPipeline{
+	result = SzConfiguration{
+		Pipeline: SzConfigurationPipeline{
 			ConfigPath:   "/etc/opt/senzing",
 			ResourcePath: "/opt/senzing/g2/resources",
 			SupportPath:  "/opt/senzing/data",
 		},
-		Sql: G2ConfigurationSql{
+		Sql: SzConfigurationSql{
 			Connection: databaseUrl,
 		},
 	}
@@ -35,7 +35,9 @@ func buildStruct(attributeMap map[string]string) G2Configuration {
 	return result
 }
 
-func verifySenzingEngineConfigurationJson(ctx context.Context, senzingEngineConfigurationJson string) error {
+func verifySenzingEngineConfigurationJson(ctx context.Context, engineConfigurationJson string) error {
+	_ = engineConfigurationJson
+	_ = ctx
 	var err error = nil
 	return err
 }

g2engineconfigurationjson/g2engineconfigurationjson_linux_test.go → engineconfigurationjson/engineconfigurationjson_linux_test.go

@@ -1,6 +1,6 @@
 //go:build linux
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 var testCasesForOsArch = []testCaseMetadata{
 	{

g2engineconfigurationjson/g2engineconfigurationjson_test.go → engineconfigurationjson/engineconfigurationjson_test.go

@@ -1,11 +1,11 @@
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import (
 	"context"
 	"net/url"
 	"testing"
 
-	"github.com/senzing-garage/go-common/engineconfigurationjsonparser"
+	"github.com/senzing-garage/go-helpers/engineconfigurationjsonparser"
 	"github.com/stretchr/testify/assert"
 )
 

g2engineconfigurationjson/g2engineconfigurationjson_windows.go → engineconfigurationjson/engineconfigurationjson_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 import (
 	"context"
@@ -20,8 +20,8 @@ func mapWithDefault(aMap map[string]string, key string, defaultValue string) str
 	return defaultValue
 }
 
-func buildStruct(attributeMap map[string]string) G2Configuration {
-	var result G2Configuration
+func buildStruct(attributeMap map[string]string) SzConfiguration {
+	var result SzConfiguration
 
 	databaseUrl, ok := attributeMap["databaseUrl"]
 	if !ok {
@@ -40,13 +40,13 @@ func buildStruct(attributeMap map[string]string) G2Configuration {
 
 	// Apply attributeMap.
 
-	result = G2Configuration{
-		Pipeline: G2ConfigurationPipeline{
+	result = SzConfiguration{
+		Pipeline: SzConfigurationPipeline{
 			ConfigPath:   mapWithDefault(attributeMap, "configPath", configPath),
 			ResourcePath: mapWithDefault(attributeMap, "resourcePath", resourcePath),
 			SupportPath:  mapWithDefault(attributeMap, "supportPath", supportPath),
 		},
-		Sql: G2ConfigurationSql{
+		Sql: SzConfigurationSql{
 			Connection: databaseUrl,
 		},
 	}
@@ -59,7 +59,9 @@ func buildStruct(attributeMap map[string]string) G2Configuration {
 	return result
 }
 
-func verifySenzingEngineConfigurationJson(ctx context.Context, senzingEngineConfigurationJson string) error {
+func verifySenzingEngineConfigurationJson(ctx context.Context, engineConfigurationJson string) error {
+	_ = ctx
+	_ = engineConfigurationJson
 	var err error = nil
 	return err
 }

g2engineconfigurationjson/g2engineconfigurationjson_windows_test.go → engineconfigurationjson/engineconfigurationjson_windows_test.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package g2engineconfigurationjson
+package engineconfigurationjson
 
 var testCasesForOsArch = []testCaseMetadata{
 	{

g2engineconfigurationjson/main.go → engineconfigurationjson/main.go

@@ -1,24 +1,24 @@
-// The g2engineconfigurationjson package helps configure SENZING_ENGINE_CONFIGURATION_JSON.
-package g2engineconfigurationjson
+// The engineconfigurationjson package helps configure SENZING_ENGINE_CONFIGURATION_JSON.
+package engineconfigurationjson
 
 // ----------------------------------------------------------------------------
 // Types
 // ----------------------------------------------------------------------------
 
-type G2ConfigurationPipeline struct {
+type SzConfigurationPipeline struct {
 	ConfigPath          string `json:"CONFIGPATH"`
 	LicenseStringBase64 string `json:"LICENSESTRINGBASE64,omitempty"`
 	ResourcePath        string `json:"RESOURCEPATH"`
 	SupportPath         string `json:"SUPPORTPATH"`
 }
 
-type G2ConfigurationSql struct {
+type SzConfigurationSql struct {
 	Connection string `json:"CONNECTION"`
 }
 
-type G2Configuration struct {
-	Pipeline G2ConfigurationPipeline `json:"PIPELINE"`
-	Sql      G2ConfigurationSql      `json:"SQL"`
+type SzConfiguration struct {
+	Pipeline SzConfigurationPipeline `json:"PIPELINE"`
+	Sql      SzConfigurationSql      `json:"SQL"`
 }
 
 // ----------------------------------------------------------------------------