@@ -19,6 +19,8 @@ import (
1919 "github.com/senzing-garage/sz-sdk-go/senzing"
2020)
2121
22+ const filePermissions = 0o750
23+
2224// ----------------------------------------------------------------------------
2325// Variables
2426// ----------------------------------------------------------------------------
@@ -50,7 +52,7 @@ func main() {
5052 err = os .RemoveAll (filepath .Clean (testDirectoryPath )) // Cleanup any previous test run.
5153 failOnError (5001 , err )
5254
53- err = os .MkdirAll (filepath .Clean (testDirectoryPath ), 0o750 ) // Recreate the test target directory.
55+ err = os .MkdirAll (filepath .Clean (testDirectoryPath ), filePermissions ) // Recreate the test target directory.
5456 failOnError (5002 , err )
5557
5658 // Setup dependencies.
@@ -112,7 +114,7 @@ func demonstrateAddRecord(ctx context.Context, szEngine senzing.SzEngine) (strin
112114
113115 result , err = szEngine .AddRecord (ctx , dataSourceCode , recordID , jsonData , flags )
114116
115- return result , wraperror .Errorf (err , "demonstrateAddRecord error: %w" , err )
117+ return result , wraperror .Errorf (err , wraperror . NoMessage )
116118}
117119
118120func demonstrateConfigFunctions (ctx context.Context , szAbstractFactory senzing.SzAbstractFactory ) {
@@ -189,25 +191,32 @@ func copyDatabase() (string, error) {
189191
190192 testDirectoryPath := getTestDirectoryPath ()
191193
192- dbTargetPath , err := filepath .Abs (filepath .Join (testDirectoryPath , "G2C.db" ))
194+ rawDbTargetPath := filepath .Join (testDirectoryPath , "G2C.db" )
195+
196+ dbTargetPath , err := filepath .Abs (rawDbTargetPath )
193197 if err != nil {
194- return result , fmt .Errorf ("failed to make target database path (%s) absolute. Error: %w " , dbTargetPath , err )
198+ return result , wraperror .Errorf (err , "failed to make target database path (%s) absolute" , rawDbTargetPath )
195199 }
196200
197201 result = "sqlite3://na:na@nowhere/" + dbTargetPath
198202
199203 // Copy template file to test directory.
200204
201- databaseTemplatePath , err := filepath .Abs (getDatabaseTemplatePath ())
205+ rawDatabaseTemplatePath := getDatabaseTemplatePath ()
206+
207+ databaseTemplatePath , err := filepath .Abs (rawDatabaseTemplatePath )
202208 if err != nil {
203- return result , fmt .Errorf ("failed to obtain absolute path to database file (%s): %w" ,
204- databaseTemplatePath , err )
209+ return result , wraperror .Errorf (
210+ err ,
211+ "failed to obtain absolute path to database file (%s)" ,
212+ rawDatabaseTemplatePath ,
213+ )
205214 }
206215
207216 _ , _ , err = fileutil .CopyFile (databaseTemplatePath , testDirectoryPath , true ) // Copy the SQLite database file.
208217 if err != nil {
209- return result , fmt .Errorf ("setup failed to copy template database (%v ) to target path (%v): %w " ,
210- databaseTemplatePath , testDirectoryPath , err )
218+ return result , wraperror .Errorf (err , "setup failed to copy template database (%s ) to target path (%s) " ,
219+ databaseTemplatePath , testDirectoryPath )
211220 }
212221
213222 return result , nil
@@ -228,14 +237,14 @@ func getLogger(ctx context.Context) (logging.Logging, error) {
228237 _ = ctx
229238 result , err := logging .NewSenzingLogger (9999 , Messages )
230239
231- return result , wraperror .Errorf (err , "getLogger error: %w" , err )
240+ return result , wraperror .Errorf (err , wraperror . NoMessage )
232241}
233242
234243func getSettings (databaseURL string ) (string , error ) {
235244 configAttrMap := map [string ]string {"databaseUrl" : databaseURL }
236245 result , err := settings .BuildSimpleSettingsUsingMap (configAttrMap )
237246
238- return result , wraperror .Errorf (err , "getSettings error: %w" , err )
247+ return result , wraperror .Errorf (err , wraperror . NoMessage )
239248}
240249
241250func getTestDirectoryPath () string {
0 commit comments