Revert version, add better pre-processing interface

radekg · Dec 10, 2021 · 7818b57 · 7818b57
1 parent a044cb1
commit 7818b57
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-0.0.1-alpha.9
+0.0.1-alpha.8
diff --git a/client/implementation/cli_client.go b/client/implementation/cli_client.go
@@ -42,7 +42,8 @@ type YBCliClient interface {
 	SnapshotsDeleteSchedule(*configs.OpSnapshotDeleteScheduleConfig) (*ybApi.DeleteSnapshotScheduleResponsePB, error)
 	SnapshotsDelete(*configs.OpSnapshotDeleteConfig) (*ybApi.DeleteSnapshotResponsePB, error)
 	SnapshotsExport(*configs.OpSnapshotExportConfig) (*SnapshotExportData, error)
-	PreProcessSnapshotsImport(*configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaRequestPB, error)
+	PreProcessSnapshotsImportFromBytes(*configs.OpSnapshotImportConfig, []byte) (*ybApi.ImportSnapshotMetaRequestPB, error)
+	PreProcessSnapshotsImportFromFile(*configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaRequestPB, error)
 	SnapshotsImport(*configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaResponsePB, error)
 	SnapshotsListSchedules(*configs.OpSnapshotListSchedulesConfig) (*ybApi.ListSnapshotSchedulesResponsePB, error)
 	SnapshotsListRestorations(*configs.OpSnapshotListRestorationsConfig) (*ybApi.ListSnapshotRestorationsResponsePB, error)

diff --git a/client/implementation/op_snapshots_import.go b/client/implementation/op_snapshots_import.go
@@ -43,8 +43,8 @@ func (tn *ybTableName) hasTable() bool {
 	return tn.TableName != ""
 }
 
-// Pre-process snapshot import metadata file.
-func (c *defaultYBCliClient) PreProcessSnapshotsImport(opConfig *configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaRequestPB, error) {
+// Pre-process snapshot import metadata file from input bytes.
+func (c *defaultYBCliClient) PreProcessSnapshotsImportFromBytes(opConfig *configs.OpSnapshotImportConfig, rawProtoBytes []byte) (*ybApi.ImportSnapshotMetaRequestPB, error) {
 
 	givenKeyspace := ""
 	if opConfig.Keyspace != "" {
@@ -57,19 +57,6 @@ func (c *defaultYBCliClient) PreProcessSnapshotsImport(opConfig *configs.OpSnaps
 		tables = append(tables, newYBTableName(opConfig.Keyspace, tableName))
 	}
 
-	statResult, err := os.Stat(opConfig.FilePath)
-	if err != nil {
-		return nil, err
-	}
-	if statResult.IsDir() {
-		return nil, fmt.Errorf("path %s points at a directory", opConfig.FilePath)
-	}
-
-	rawProtoBytes, err := ioutil.ReadFile(opConfig.FilePath)
-	if err != nil {
-		return nil, err
-	}
-
 	snapshotInfo := &ybApi.SnapshotInfoPB{}
 	if err := utils.DeserializeProto(rawProtoBytes, snapshotInfo); err != nil {
 		return nil, err
@@ -169,10 +156,28 @@ func (c *defaultYBCliClient) PreProcessSnapshotsImport(opConfig *configs.OpSnaps
 
 }
 
+// Pre-process snapshot import metadata file.
+func (c *defaultYBCliClient) PreProcessSnapshotsImportFromFile(opConfig *configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaRequestPB, error) {
+	statResult, err := os.Stat(opConfig.FilePath)
+	if err != nil {
+		return nil, err
+	}
+	if statResult.IsDir() {
+		return nil, fmt.Errorf("path %s points at a directory", opConfig.FilePath)
+	}
+
+	rawProtoBytes, err := ioutil.ReadFile(opConfig.FilePath)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.PreProcessSnapshotsImportFromBytes(opConfig, rawProtoBytes)
+}
+
 // Import snapshot.
 func (c *defaultYBCliClient) SnapshotsImport(opConfig *configs.OpSnapshotImportConfig) (*ybApi.ImportSnapshotMetaResponsePB, error) {
 
-	payload, err := c.PreProcessSnapshotsImport(opConfig)
+	payload, err := c.PreProcessSnapshotsImportFromFile(opConfig)
 	if err != nil {
 		return nil, err
 	}