Merge branch 'master' into scala-steward-dependencies

nationalarchives · Nov 26, 2024 · 6c5ac2e · 6c5ac2e
2 parents 05afc90 + 7fca3be
commit 6c5ac2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala b/export/src/main/scala/uk/gov/nationalarchives/export/S3Utils.scala
@@ -6,7 +6,7 @@ import io.circe.syntax._
 import io.circe.{Json, JsonObject, Printer}
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.S3Client
-import software.amazon.awssdk.services.s3.model.{CopyObjectRequest, ListObjectsV2Request, PutObjectRequest, S3Object}
+import software.amazon.awssdk.services.s3.model.{CopyObjectRequest, ListObjectsV2Request, PutObjectRequest, S3Object, Tagging, TaggingDirective}
 import uk.gov.nationalarchives.`export`.Main.Config
 import uk.gov.nationalarchives.`export`.MetadataUtils.{ConsignmentType, Judgment, Metadata, Standard}
 import uk.gov.nationalarchives.`export`.S3Utils.FileOutput
@@ -52,6 +52,8 @@ class S3Utils(config: Config, s3Client: S3Client) {
           .sourceBucket(config.s3.cleanBucket)
           .destinationKey(destinationKey)
           .destinationBucket(destinationBucket)
+          .taggingDirective(TaggingDirective.REPLACE)
+          .tagging(Tagging.builder().build())
           .build()
         s3Client.copyObject(copyRequest)
         val series = consignmentMetadata.find(_.propertyName == "Series").map(_.value)

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.0.450-SNAPSHOT"
+ThisBuild / version := "0.0.452-SNAPSHOT"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ThisBuild / version := "0.0.450-SNAPSHOT"
		ThisBuild / version := "0.0.452-SNAPSHOT"