Use temporal-activities/archivezip

[skip-codecov]
artefactual-sdps · Aug 27, 2024 · d54fcc4 · d54fcc4
1 parent c1d9c1e
commit d54fcc4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 203 deletions.
diff --git a/cmd/enduro-am-worker/main.go b/cmd/enduro-am-worker/main.go
@@ -15,6 +15,7 @@ import (
 	"entgo.io/ent/dialect/sql"
 	bagit_gython "github.com/artefactual-labs/bagit-gython"
 	"github.com/artefactual-sdps/temporal-activities/archiveextract"
+	"github.com/artefactual-sdps/temporal-activities/archivezip"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"github.com/artefactual-sdps/temporal-activities/bagvalidate"
 	"github.com/artefactual-sdps/temporal-activities/removepaths"
@@ -251,10 +252,8 @@ func main() {
 			temporalsdk_activity.RegisterOptions{Name: bagcreate.Name},
 		)
 		w.RegisterActivityWithOptions(
-			activities.NewZipActivity(
-				logger,
-			).Execute,
-			temporalsdk_activity.RegisterOptions{Name: activities.ZipActivityName},
+			archivezip.New().Execute,
+			temporalsdk_activity.RegisterOptions{Name: archivezip.Name},
 		)
 		w.RegisterActivityWithOptions(
 			am.NewUploadTransferActivity(logger, sftpClient, cfg.AM.PollInterval).Execute,

diff --git a/internal/workflow/activities/zip.go b/internal/workflow/activities/zip.go
diff --git a/internal/workflow/activities/zip_test.go b/internal/workflow/activities/zip_test.go
diff --git a/internal/workflow/processing.go b/internal/workflow/processing.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/artefactual-sdps/temporal-activities/archiveextract"
+	"github.com/artefactual-sdps/temporal-activities/archivezip"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"github.com/artefactual-sdps/temporal-activities/bagvalidate"
 	"github.com/artefactual-sdps/temporal-activities/removepaths"
@@ -859,11 +860,11 @@ func (w *ProcessingWorkflow) transferAM(ctx temporalsdk_workflow.Context, tinfo
 
 	// Zip PIP.
 	activityOpts := withActivityOptsForLocalAction(ctx)
-	var zipResult activities.ZipActivityResult
+	var zipResult archivezip.Result
 	err = temporalsdk_workflow.ExecuteActivity(
 		activityOpts,
-		activities.ZipActivityName,
-		&activities.ZipActivityParams{SourceDir: tinfo.TempPath},
+		archivezip.Name,
+		&archivezip.Params{SourceDir: tinfo.TempPath},
 	).Get(activityOpts, &zipResult)
 	if err != nil {
 		return err

diff --git a/internal/workflow/processing_test.go b/internal/workflow/processing_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/artefactual-sdps/temporal-activities/archiveextract"
+	"github.com/artefactual-sdps/temporal-activities/archivezip"
 	"github.com/artefactual-sdps/temporal-activities/bagcreate"
 	"github.com/artefactual-sdps/temporal-activities/bagvalidate"
 	"github.com/artefactual-sdps/temporal-activities/removepaths"
@@ -159,8 +160,8 @@ func (s *ProcessingWorkflowTestSuite) setupAMWorkflowTest(
 		temporalsdk_activity.RegisterOptions{Name: bagcreate.Name},
 	)
 	s.env.RegisterActivityWithOptions(
-		activities.NewZipActivity(logger).Execute,
-		temporalsdk_activity.RegisterOptions{Name: activities.ZipActivityName},
+		archivezip.New().Execute,
+		temporalsdk_activity.RegisterOptions{Name: archivezip.Name},
 	)
 	s.env.RegisterActivityWithOptions(
 		am.NewUploadTransferActivity(logger, sftpc, 10*time.Second).Execute,
@@ -614,10 +615,10 @@ func (s *ProcessingWorkflowTestSuite) TestAMWorkflow() {
 		&bagcreate.Result{BagPath: extractPath}, nil,
 	)
 
-	s.env.OnActivity(activities.ZipActivityName, sessionCtx,
-		&activities.ZipActivityParams{SourceDir: extractPath},
+	s.env.OnActivity(archivezip.Name, sessionCtx,
+		&archivezip.Params{SourceDir: extractPath},
 	).Return(
-		&activities.ZipActivityResult{Path: extractPath + "/transfer.zip"}, nil,
+		&archivezip.Result{Path: extractPath + "/transfer.zip"}, nil,
 	)
 
 	s.env.OnActivity(am.UploadTransferActivityName, sessionCtx,