qualify module

README.md

@@ -36,7 +36,7 @@ func main() {
 		panic(err)
 	}
 
-	backupErrors := make(chan error, 5)
+	backupHandlers := make()
 
     // start 5 backup jobs
 	for i := 0; i < 5; i++ {
@@ -47,19 +47,22 @@ func main() {
 		}
 		defer file.Close()
 
-		backupOpts := backuplib.NewDefaultBackupToWriterOptions()
-		backupOpts.Parallel = 4
-        backupOpts.Namespace = "test"
+		backupCfg := backuplib.NewBackupToWriterConfig()
+		backupCfg.Parallel = 4
+        backupCfg.Namespace = "test"
 
 		writers := []io.Writer{file}
 
-		handler, errChan := backupClient.BackupToWriter(writers, backupOpts)
+		handler, err := backupClient.BackupToWriter(writers, backupCfg)
+		if err != nil {
+			panic(err)
+		}
         // optionally check the status of the backup job
 		stats := handler.GetStatus()
-		// error channel closes when the backup is done
-		err = <-errChan
+		// use handler.Wait() to wait for the job to finish or fail
+		err = handler.Wait()
 		if err != nil {
-			backupErrors <- err
+			panic(err)
 		}
 	}
 
@@ -68,7 +71,10 @@ func main() {
 		panic(err)
 	}
 
-	// TODO Restore is similar
+	restoreErrors := make(chan error, 5)
+
+	// start 5 restore jobs from the files we backed up
+
 ```
 ### Prerequisites
 

backup_handlers.go

@@ -15,10 +15,11 @@
 package backuplib
 
 import (
-	datahandlers "backuplib/data_handlers"
-	"backuplib/encoder"
 	"io"
 
+	datahandlers "github.com/aerospike/aerospike-tools-backup-lib/data_handlers"
+	"github.com/aerospike/aerospike-tools-backup-lib/encoder"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

config.go

@@ -15,10 +15,11 @@
 package backuplib
 
 import (
-	"backuplib/models"
 	"fmt"
 	"io"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

data_handlers/pipline_test.go

@@ -15,12 +15,13 @@
 package datahandlers
 
 import (
-	"backuplib/data_handlers/mocks"
 	"context"
 	"errors"
 	"io"
 	"testing"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/data_handlers/mocks"
+
 	"github.com/stretchr/testify/suite"
 )
 

data_handlers/readers.go

@@ -15,9 +15,10 @@
 package datahandlers
 
 import (
-	"backuplib/models"
 	"io"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

data_handlers/readers_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 	"unsafe"
 
-	"backuplib/data_handlers/mocks"
-	"backuplib/models"
+	"github.com/aerospike/aerospike-tools-backup-lib/data_handlers/mocks"
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
 
 	a "github.com/aerospike/aerospike-client-go/v7"
 	"github.com/stretchr/testify/suite"

data_handlers/writers.go

@@ -15,12 +15,13 @@
 package datahandlers
 
 import (
-	"backuplib/models"
 	"bytes"
 	"errors"
 	"fmt"
 	"io"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

data_handlers/writers_test.go

@@ -19,8 +19,8 @@ import (
 	"errors"
 	"testing"
 
-	"backuplib/data_handlers/mocks"
-	"backuplib/models"
+	"github.com/aerospike/aerospike-tools-backup-lib/data_handlers/mocks"
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
 
 	a "github.com/aerospike/aerospike-client-go/v7"
 	"github.com/stretchr/testify/suite"

decoder/asb.go

@@ -15,7 +15,6 @@
 package decoder
 
 import (
-	"backuplib/models"
 	"bufio"
 	"bytes"
 	"encoding/base64"
@@ -25,6 +24,8 @@ import (
 	"math"
 	"strconv"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

decoder/asb_test.go

@@ -15,7 +15,6 @@
 package decoder
 
 import (
-	"backuplib/models"
 	"bufio"
 	"encoding/base64"
 	"fmt"
@@ -25,6 +24,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 	"github.com/google/go-cmp/cmp"
 )

decoders.go

@@ -15,8 +15,9 @@
 package backuplib
 
 import (
-	"backuplib/decoder"
 	"io"
+
+	"github.com/aerospike/aerospike-tools-backup-lib/decoder"
 )
 
 // ASBDecoderBuilder satisfies the DecoderBuilder interface

encoder/asb.go

@@ -15,14 +15,15 @@
 package encoder
 
 import (
-	"backuplib/models"
 	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
 	"math"
 	"time"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 )
 

encoder/asb_test.go

@@ -15,7 +15,6 @@
 package encoder
 
 import (
-	"backuplib/models"
 	"fmt"
 	"math"
 	"reflect"
@@ -24,6 +23,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/aerospike/aerospike-tools-backup-lib/models"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 	"github.com/stretchr/testify/suite"
 )

encoders.go

@@ -15,8 +15,9 @@
 package backuplib
 
 import (
-	"backuplib/encoder"
 	"io"
+
+	"github.com/aerospike/aerospike-tools-backup-lib/encoder"
 )
 
 // ASBEncoderBuilder satisfies the EncoderBuilder interface

go.mod

@@ -1,4 +1,4 @@
-module backuplib
+module github.com/aerospike/aerospike-tools-backup-lib
 
 go 1.21
 

integration_test.go

@@ -15,13 +15,15 @@
 package backuplib_test
 
 import (
-	"backuplib"
-	testresources "backuplib/test"
 	"bytes"
 	"fmt"
 	"io"
 	"testing"
 
+	testresources "github.com/aerospike/aerospike-tools-backup-lib/test"
+
+	backuplib "github.com/aerospike/aerospike-tools-backup-lib"
+
 	a "github.com/aerospike/aerospike-client-go/v7"
 	"github.com/aerospike/tools-common-go/testutils"
 	"github.com/stretchr/testify/suite"

restore_handlers.go

@@ -15,8 +15,9 @@
 package backuplib
 
 import (
-	datahandlers "backuplib/data_handlers"
 	"io"
+
+	datahandlers "github.com/aerospike/aerospike-tools-backup-lib/data_handlers"
 )
 
 // **** Generic Restore Handler ****

work_handler.go

@@ -14,7 +14,7 @@
 
 package backuplib
 
-import datahandlers "backuplib/data_handlers"
+import datahandlers "github.com/aerospike/aerospike-tools-backup-lib/data_handlers"
 
 // workHandler is a generic worker for running a data pipeline (job)
 type workHandler struct{}