Skip to content

Commit

Permalink
#270 Savepoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@docktermj
docktermj committed Jan 27, 2025
1 parent c2ad81d commit d08985b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/senzing-garage/go-logging v1.5.1
github.com/senzing-garage/go-messaging v1.5.2
github.com/senzing-garage/go-observing v0.3.3
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250124201031-bc41f0fdb800
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250127185239-d1ad3a9db86e
github.com/stretchr/testify v1.10.0
)

Expand All @@ -22,7 +22,7 @@ require (
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ github.com/senzing-garage/go-messaging v1.5.2 h1:lU9W2HV3zKQsDU9Vs7lwe/C/LbHVCMn
github.com/senzing-garage/go-messaging v1.5.2/go.mod h1:iEWGVuDGWjolIkwLqnn9oJS7ifF3aoZjTtI44tf1gWQ=
github.com/senzing-garage/go-observing v0.3.3 h1:AhQYgOG012sDZtWXYcXVAaS5qEoDjlWmPYJDVCUZ/g0=
github.com/senzing-garage/go-observing v0.3.3/go.mod h1:qFUi5Dwb6vmd7izTZGjGbWKUGRHzWzsgbsX3oNSD198=
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250124201031-bc41f0fdb800 h1:QVd5Vj7+9q8hB8byCTy0GpSplc8HI28/SijvBQvz5DU=
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250124201031-bc41f0fdb800/go.mod h1:wwLyt+FAF2xA3hWHjWkNOYvKZvjHxfHDvspTHA/Dtno=
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250127185239-d1ad3a9db86e h1:k6L+IImM5138EZiOB1I0LrhxG7TGSw9nj0G8G3AhjS8=
github.com/senzing-garage/sz-sdk-go v0.14.5-0.20250127185239-d1ad3a9db86e/go.mod h1:wwLyt+FAF2xA3hWHjWkNOYvKZvjHxfHDvspTHA/Dtno=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
Expand All @@ -51,8 +51,8 @@ golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
Expand Down
8 changes: 4 additions & 4 deletions szconfigmanager/szconfigmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (client *Szconfigmanager) AddConfig(ctx context.Context, configDefinition s
}

/*
Method CreateNewConfigAddDataSources creates a new Senzing configuration given an existing Senzing configuration and Data Source Codes.
Method CreateNewConfig creates a new Senzing configuration given an existing Senzing configuration and Data Source Codes.
Input
- ctx: A context to control lifecycle.
Expand All @@ -106,7 +106,7 @@ Input
Output
- configID: A Senzing configuration identifier of the new configuration.
*/
func (client *Szconfigmanager) CreateNewConfigAddDataSources(ctx context.Context, configID int64, configComment string, dataSourceCodes ...string) (int64, error) {
func (client *Szconfigmanager) CreateNewConfig(ctx context.Context, configID int64, configComment string, dataSourceCodes ...string) (int64, error) {
var err error
var result int64
if client.isTrace {
Expand All @@ -116,7 +116,7 @@ func (client *Szconfigmanager) CreateNewConfigAddDataSources(ctx context.Context
client.traceExit(999, configID, configComment, strings.Join(dataSourceCodes, ","), result, err, time.Since(entryTime))
}()
}
result, err = client.createNewConfigAddDataSources(ctx, configID, configComment, dataSourceCodes...)
result, err = client.createNewConfig(ctx, configID, configComment, dataSourceCodes...)
if client.observers != nil {
go func() {
details := map[string]string{
Expand Down Expand Up @@ -534,7 +534,7 @@ func (client *Szconfigmanager) addConfig(ctx context.Context, configDefinition s
return resultConfigID, err
}

func (client *Szconfigmanager) createNewConfigAddDataSources(ctx context.Context, configID int64, configComment string, dataSourceCodes ...string) (int64, error) {
func (client *Szconfigmanager) createNewConfig(ctx context.Context, configID int64, configComment string, dataSourceCodes ...string) (int64, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
var err error
Expand Down
4 changes: 2 additions & 2 deletions szconfigmanager/szconfigmanager_examples_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func ExampleSzconfigmanager_AddConfig() {
// Output: true
}

func ExampleSzconfigmanager_CreateNewConfigAddDataSources() {
func ExampleSzconfigmanager_CreateNewConfig() {
// For more information, visit https://github.com/senzing-garage/sz-sdk-go-core/blob/main/szconfigmanager/szconfigmanager_examples_test.go
ctx := context.TODO()
szAbstractFactory := getSzAbstractFactory(ctx)
Expand All @@ -75,7 +75,7 @@ func ExampleSzconfigmanager_CreateNewConfigAddDataSources() {
handleError(err)
}
configComment := "Example configuration"
configID, err := szConfigManager.CreateNewConfigAddDataSources(ctx, 0, configComment, "TEST_DATASOURCE", "ANOTHER_DATASOURCE")
configID, err := szConfigManager.CreateNewConfig(ctx, 0, configComment, "TEST_DATASOURCE", "ANOTHER_DATASOURCE")
if err != nil {
handleError(err)
}
Expand Down
24 changes: 12 additions & 12 deletions szconfigmanager/szconfigmanager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,28 +119,28 @@ func TestSzconfigmanager_AddConfig_nilConfigComment(test *testing.T) {
printActual(test, actual)
}

func TestSzconfigmanager_CreateNewConfigAddDataSources(test *testing.T) {
func TestSzconfigmanager_CreateNewConfig(test *testing.T) {
ctx := context.TODO()
szConfigManager := getTestObject(ctx, test)
timestamp := time.Now().UTC().Format(time.RFC3339)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfigAddDataSources: %s", timestamp)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfig: %s", timestamp)
dataSource1 := "TEST_1"
dataSource2 := "TEST_2"
dataSource3 := "TEST_3"
actual, err := szConfigManager.CreateNewConfigAddDataSources(ctx, 0, configComment, dataSource1, dataSource2, dataSource3)
actual, err := szConfigManager.CreateNewConfig(ctx, 0, configComment, dataSource1, dataSource2, dataSource3)
require.NoError(test, err)
printActual(test, actual)
}

func TestSzconfigmanager_CreateNewConfigAddDataSources_Again(test *testing.T) {
func TestSzconfigmanager_CreateNewConfig_Again(test *testing.T) {
ctx := context.TODO()
szConfigManager := getTestObject(ctx, test)
timestamp := time.Now().UTC().Format(time.RFC3339)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfigAddDataSources_Again: %s", timestamp)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfig_Again: %s", timestamp)
dataSource1 := "TEST_1"
dataSource2 := "TEST_2"
dataSource3 := "TEST_3"
actual, err := szConfigManager.CreateNewConfigAddDataSources(ctx, 0, configComment, dataSource1, dataSource2, dataSource3)
actual, err := szConfigManager.CreateNewConfig(ctx, 0, configComment, dataSource1, dataSource2, dataSource3)
require.NoError(test, err)
printActual(test, actual)
datasources, err := szConfigManager.GetDataSources(ctx, actual)
Expand All @@ -151,13 +151,13 @@ func TestSzconfigmanager_CreateNewConfigAddDataSources_Again(test *testing.T) {
printActual(test, configs)
}

func TestSzconfigmanager_CreateNewConfigAddDataSources_Multi(test *testing.T) {
func TestSzconfigmanager_CreateNewConfig_Multi(test *testing.T) {
ctx := context.TODO()
szConfigManager := getTestObject(ctx, test)
now := time.Now().UTC()
timestamp := now.Format(time.RFC3339)
datasourceSuffix := strconv.FormatInt(now.Unix(), baseTen)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfigAddDataSources_Multi: %s", timestamp)
configComment := fmt.Sprintf("TestSzconfigmanager_CreateNewConfig_Multi: %s", timestamp)

datasources, err := szConfigManager.GetDataSources(ctx, 0)
require.NoError(test, err)
Expand All @@ -171,28 +171,28 @@ func TestSzconfigmanager_CreateNewConfigAddDataSources_Multi(test *testing.T) {
require.NoError(test, err)
printActual(test, datasources)

newConfig1, err := szConfigManager.CreateNewConfigAddDataSources(ctx, 0, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
newConfig1, err := szConfigManager.CreateNewConfig(ctx, 0, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
require.NoError(test, err)
printActual(test, newConfig1)
datasources, err = szConfigManager.GetDataSources(ctx, newConfig1)
require.NoError(test, err)
printActual(test, datasources)

newConfig2, err := szConfigManager.CreateNewConfigAddDataSources(ctx, newConfig1, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
newConfig2, err := szConfigManager.CreateNewConfig(ctx, newConfig1, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
require.NoError(test, err)
printActual(test, newConfig2)
datasources, err = szConfigManager.GetDataSources(ctx, newConfig2)
require.NoError(test, err)
printActual(test, datasources)

newConfig3, err := szConfigManager.CreateNewConfigAddDataSources(ctx, newConfig2, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
newConfig3, err := szConfigManager.CreateNewConfig(ctx, newConfig2, configComment, "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
require.NoError(test, err)
printActual(test, newConfig3)
datasources, err = szConfigManager.GetDataSources(ctx, newConfig3)
require.NoError(test, err)
printActual(test, datasources)

newConfig4, err := szConfigManager.CreateNewConfigAddDataSources(ctx, newConfig2, "Alternate comment", "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
newConfig4, err := szConfigManager.CreateNewConfig(ctx, newConfig2, "Alternate comment", "THIS"+datasourceSuffix, "WAS"+datasourceSuffix, "HERE")
require.NoError(test, err)
printActual(test, newConfig4)
datasources, err = szConfigManager.GetDataSources(ctx, newConfig4)
Expand Down

0 comments on commit d08985b

Please sign in to comment.