Migrate duchy postgres package to deploy/common (#1103)

This migrates duchy postgres package from duchy/deploy/ to duchy/deploy/common/.
world-federation-of-advertisers · Jul 19, 2023 · e34c15b · e34c15b
1 parent a63b26e
commit e34c15b
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 34 deletions.
diff --git a/...urement/duchy/deploy/postgres/BUILD.bazel → .../duchy/deploy/common/postgres/BUILD.bazel b/...urement/duchy/deploy/postgres/BUILD.bazel → .../duchy/deploy/common/postgres/BUILD.bazel
@@ -4,12 +4,12 @@ kt_jvm_library(
     name = "services",
     srcs = glob(["*Service.kt"]),
     visibility = [
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__pkg__",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/common/deploy/postgres:__pkg__",
         "//src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__pkg__",
     ],
     deps = [
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/readers",
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/writers",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/readers",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/writers",
         "//src/main/kotlin/org/wfanet/measurement/system/v1alpha:resource_key",
         "//src/main/proto/wfa/measurement/internal/duchy:continuation_tokens_service_kt_jvm_grpc_proto",
         "//src/main/proto/wfa/measurement/system/v1alpha:computation_log_entries_service_kt_jvm_grpc_proto",

diff --git a/...stgres/PostgresComputationStatsService.kt → ...stgres/PostgresComputationStatsService.kt b/...stgres/PostgresComputationStatsService.kt → ...stgres/PostgresComputationStatsService.kt
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres
+package org.wfanet.measurement.duchy.deploy.common.postgres
 
 import org.wfanet.measurement.common.db.r2dbc.DatabaseClient
 import org.wfanet.measurement.common.grpc.grpcRequire
 import org.wfanet.measurement.common.identity.IdGenerator
-import org.wfanet.measurement.duchy.deploy.postgres.writers.InsertComputationStat
+import org.wfanet.measurement.duchy.deploy.common.postgres.writers.InsertComputationStat
 import org.wfanet.measurement.internal.duchy.ComputationStatsGrpcKt.ComputationStatsCoroutineImplBase
 import org.wfanet.measurement.internal.duchy.CreateComputationStatRequest
 import org.wfanet.measurement.internal.duchy.CreateComputationStatResponse

diff --git a/...y/postgres/PostgresComputationsService.kt → ...n/postgres/PostgresComputationsService.kt b/...y/postgres/PostgresComputationsService.kt → ...n/postgres/PostgresComputationsService.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres
+package org.wfanet.measurement.duchy.deploy.common.postgres
 
 import io.grpc.Status
 import java.time.Clock
@@ -28,9 +28,9 @@ import org.wfanet.measurement.common.toDuration
 import org.wfanet.measurement.duchy.db.computation.ComputationProtocolStageDetailsHelper
 import org.wfanet.measurement.duchy.db.computation.ComputationProtocolStagesEnumHelper
 import org.wfanet.measurement.duchy.db.computation.ComputationTypeEnumHelper
-import org.wfanet.measurement.duchy.deploy.postgres.readers.ComputationReader
-import org.wfanet.measurement.duchy.deploy.postgres.writers.ClaimWork
-import org.wfanet.measurement.duchy.deploy.postgres.writers.CreateComputation
+import org.wfanet.measurement.duchy.deploy.common.postgres.readers.ComputationReader
+import org.wfanet.measurement.duchy.deploy.common.postgres.writers.ClaimWork
+import org.wfanet.measurement.duchy.deploy.common.postgres.writers.CreateComputation
 import org.wfanet.measurement.duchy.name
 import org.wfanet.measurement.duchy.number
 import org.wfanet.measurement.duchy.service.internal.ComputationDetailsNotFoundException

diff --git a/...gres/PostgresContinuationTokensService.kt → ...gres/PostgresContinuationTokensService.kt b/...gres/PostgresContinuationTokensService.kt → ...gres/PostgresContinuationTokensService.kt
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres
+package org.wfanet.measurement.duchy.deploy.common.postgres
 
 import io.grpc.Status
 import org.wfanet.measurement.common.db.r2dbc.DatabaseClient
 import org.wfanet.measurement.common.identity.IdGenerator
-import org.wfanet.measurement.duchy.deploy.postgres.readers.ContinuationTokenReader
-import org.wfanet.measurement.duchy.deploy.postgres.writers.SetContinuationToken
+import org.wfanet.measurement.duchy.deploy.common.postgres.readers.ContinuationTokenReader
+import org.wfanet.measurement.duchy.deploy.common.postgres.writers.SetContinuationToken
 import org.wfanet.measurement.duchy.service.internal.ContinuationTokenInvalidException
 import org.wfanet.measurement.duchy.service.internal.ContinuationTokenMalformedException
 import org.wfanet.measurement.internal.duchy.ContinuationTokensGrpcKt.ContinuationTokensCoroutineImplBase

diff --git a/...duchy/deploy/postgres/readers/BUILD.bazel → ...eploy/common/postgres/readers/BUILD.bazel b/...duchy/deploy/postgres/readers/BUILD.bazel → ...eploy/common/postgres/readers/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 package(default_visibility = [
-    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__subpackages__",
+    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres:__subpackages__",
 ])
 
 kt_jvm_library(

diff --git a/...loy/postgres/readers/ComputationReader.kt → ...mon/postgres/readers/ComputationReader.kt b/...loy/postgres/readers/ComputationReader.kt → ...mon/postgres/readers/ComputationReader.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.readers
+package org.wfanet.measurement.duchy.deploy.common.postgres.readers
 
 import com.google.protobuf.Timestamp
 import java.time.Instant
@@ -196,7 +196,7 @@ class ComputationReader(
       ) {
         bind("$1", globalComputationId)
       }
-    return readContext.executeQuery(statement).consume(::Computation).firstOrNull()
+    return readContext.executeQuery(statement).consume(ComputationReader::Computation).firstOrNull()
   }
 
   private suspend fun readComputation(
@@ -229,7 +229,7 @@ class ComputationReader(
         bind("$1", externalRequisitionKey.externalRequisitionId)
         bind("$2", externalRequisitionKey.requisitionFingerprint)
       }
-    return readContext.executeQuery(statement).consume(::Computation).firstOrNull()
+    return readContext.executeQuery(statement).consume(ComputationReader::Computation).firstOrNull()
   }
 
   /**

diff --git a/...stgres/readers/ContinuationTokenReader.kt → ...stgres/readers/ContinuationTokenReader.kt b/...stgres/readers/ContinuationTokenReader.kt → ...stgres/readers/ContinuationTokenReader.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.readers
+package org.wfanet.measurement.duchy.deploy.common.postgres.readers
 
 import kotlinx.coroutines.flow.firstOrNull
 import org.wfanet.measurement.common.db.r2dbc.ReadContext

diff --git a/...duchy/deploy/postgres/testing/BUILD.bazel → ...eploy/common/postgres/testing/BUILD.bazel b/...duchy/deploy/postgres/testing/BUILD.bazel → ...eploy/common/postgres/testing/BUILD.bazel
diff --git a/...duchy/deploy/postgres/testing/Schemata.kt → ...eploy/common/postgres/testing/Schemata.kt b/...duchy/deploy/postgres/testing/Schemata.kt → ...eploy/common/postgres/testing/Schemata.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.testing
+package org.wfanet.measurement.duchy.deploy.common.postgres.testing
 
 import java.nio.file.Path
 import org.wfanet.measurement.common.getJarResourcePath

diff --git a/...duchy/deploy/postgres/writers/BUILD.bazel → ...eploy/common/postgres/writers/BUILD.bazel b/...duchy/deploy/postgres/writers/BUILD.bazel → ...eploy/common/postgres/writers/BUILD.bazel
@@ -1,15 +1,15 @@
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 package(default_visibility = [
-    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__subpackages__",
+    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres:__subpackages__",
 ])
 
 kt_jvm_library(
     name = "writers",
     srcs = glob(["*.kt"]),
     deps = [
         "//src/main/kotlin/org/wfanet/measurement/duchy/db/computation",
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/readers",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/readers",
         "//src/main/kotlin/org/wfanet/measurement/duchy/service/internal:internal_exception",
         "//src/main/proto/wfa/measurement/internal/duchy:computation_details_kt_jvm_proto",
         "//src/main/proto/wfa/measurement/internal/duchy:computation_stats_service_kt_jvm_grpc_proto",

diff --git a/...uchy/deploy/postgres/writers/ClaimWork.kt → ...ploy/common/postgres/writers/ClaimWork.kt b/...uchy/deploy/postgres/writers/ClaimWork.kt → ...ploy/common/postgres/writers/ClaimWork.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.writers
+package org.wfanet.measurement.duchy.deploy.common.postgres.writers
 
 import com.google.protobuf.Message
 import java.time.Duration

diff --git a/...loy/postgres/writers/CreateComputation.kt → ...mon/postgres/writers/CreateComputation.kt b/...loy/postgres/writers/CreateComputation.kt → ...mon/postgres/writers/CreateComputation.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.writers
+package org.wfanet.measurement.duchy.deploy.common.postgres.writers
 
 import com.google.protobuf.ByteString
 import com.google.protobuf.Message

diff --git a/...postgres/writers/InsertComputationStat.kt → ...postgres/writers/InsertComputationStat.kt b/...postgres/writers/InsertComputationStat.kt → ...postgres/writers/InsertComputationStat.kt
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.writers
+package org.wfanet.measurement.duchy.deploy.common.postgres.writers
 
 import java.time.Instant
 import org.wfanet.measurement.common.db.r2dbc.boundStatement

diff --git a/...postgres/writers/SetContinutationToken.kt → ...postgres/writers/SetContinutationToken.kt b/...postgres/writers/SetContinutationToken.kt → ...postgres/writers/SetContinutationToken.kt
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.wfanet.measurement.duchy.deploy.postgres.writers
+package org.wfanet.measurement.duchy.deploy.common.postgres.writers
 
 import com.google.protobuf.InvalidProtocolBufferException
 import com.google.protobuf.util.Timestamps
 import java.time.Instant
 import org.wfanet.measurement.common.base64UrlDecode
 import org.wfanet.measurement.common.db.r2dbc.boundStatement
 import org.wfanet.measurement.common.db.r2dbc.postgres.PostgresWriter
-import org.wfanet.measurement.duchy.deploy.postgres.readers.ContinuationTokenReader
+import org.wfanet.measurement.duchy.deploy.common.postgres.readers.ContinuationTokenReader
 import org.wfanet.measurement.duchy.service.internal.ContinuationTokenInvalidException
 import org.wfanet.measurement.duchy.service.internal.ContinuationTokenMalformedException
 import org.wfanet.measurement.duchy.service.internal.DuchyInternalException

diff --git a/src/main/resources/duchy/postgres/BUILD.bazel b/src/main/resources/duchy/postgres/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = [
+    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres:__subpackages__",
     "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/gcloud/postgres:__subpackages__",
-    "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__subpackages__",
     "//src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres:__subpackages__",
 ])
 

diff --git a/src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres/BUILD.bazel b/src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres/BUILD.bazel
@@ -5,7 +5,7 @@ kt_jvm_test(
     srcs = ["DuchySchemaTest.kt"],
     test_class = "org.wfanet.measurement.duchy.deploy.postgres.DuchySchemaTest",
     deps = [
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/testing",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/testing",
         "@wfa_common_jvm//imports/java/com/google/common/truth",
         "@wfa_common_jvm//imports/java/com/opentable/db/postgres:pg_embedded",
         "@wfa_common_jvm//imports/java/org/junit",
@@ -18,8 +18,8 @@ kt_jvm_test(
     srcs = ["PostgresContinuationTokensServiceTest.kt"],
     test_class = "org.wfanet.measurement.duchy.deploy.postgres.PostgresContinuationTokensServiceTest",
     deps = [
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:services",
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/testing",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres:services",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/testing",
         "//src/main/kotlin/org/wfanet/measurement/duchy/service/internal/testing",
         "@wfa_common_jvm//imports/java/com/google/common/truth",
         "@wfa_common_jvm//imports/java/com/opentable/db/postgres:pg_embedded",
@@ -34,8 +34,8 @@ kt_jvm_test(
     test_class = "org.wfanet.measurement.duchy.deploy.postgres.PostgresComputationStatsServiceTest",
     deps = [
         "//src/main/kotlin/org/wfanet/measurement/duchy/db/computation/testing",
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres:services",
-        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/postgres/testing",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres:services",
+        "//src/main/kotlin/org/wfanet/measurement/duchy/deploy/common/postgres/testing",
         "//src/main/kotlin/org/wfanet/measurement/duchy/service/internal/computations",
         "//src/main/kotlin/org/wfanet/measurement/duchy/service/internal/testing",
         "@wfa_common_jvm//imports/java/com/google/common/truth",

diff --git a/src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres/DuchySchemaTest.kt b/src/test/kotlin/org/wfanet/measurement/duchy/deploy/postgres/DuchySchemaTest.kt
@@ -23,7 +23,7 @@ import org.junit.runners.JUnit4
 import org.wfanet.measurement.common.db.r2dbc.ResultRow
 import org.wfanet.measurement.common.db.r2dbc.boundStatement
 import org.wfanet.measurement.common.db.r2dbc.postgres.testing.EmbeddedPostgresDatabaseProvider
-import org.wfanet.measurement.duchy.deploy.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
+import org.wfanet.measurement.duchy.deploy.common.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
 
 @RunWith(JUnit4::class)
 class DuchySchemaTest {

diff --git a/...otlin/org/wfanet/measurement/duchy/deploy/postgres/PostgresComputationStatsServiceTest.kt b/...otlin/org/wfanet/measurement/duchy/deploy/postgres/PostgresComputationStatsServiceTest.kt
@@ -26,7 +26,9 @@ import org.wfanet.measurement.common.identity.RandomIdGenerator
 import org.wfanet.measurement.duchy.db.computation.ComputationProtocolStageDetails
 import org.wfanet.measurement.duchy.db.computation.ComputationProtocolStages
 import org.wfanet.measurement.duchy.db.computation.ComputationTypes
-import org.wfanet.measurement.duchy.deploy.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
+import org.wfanet.measurement.duchy.deploy.common.postgres.PostgresComputationStatsService
+import org.wfanet.measurement.duchy.deploy.common.postgres.PostgresComputationsService
+import org.wfanet.measurement.duchy.deploy.common.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
 import org.wfanet.measurement.duchy.service.internal.testing.ComputationStatsServiceTest
 import org.wfanet.measurement.duchy.storage.ComputationStore
 import org.wfanet.measurement.duchy.storage.RequisitionStore

diff --git a/...lin/org/wfanet/measurement/duchy/deploy/postgres/PostgresContinuationTokensServiceTest.kt b/...lin/org/wfanet/measurement/duchy/deploy/postgres/PostgresContinuationTokensServiceTest.kt
@@ -20,7 +20,8 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.wfanet.measurement.common.db.r2dbc.postgres.testing.EmbeddedPostgresDatabaseProvider
 import org.wfanet.measurement.common.identity.RandomIdGenerator
-import org.wfanet.measurement.duchy.deploy.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
+import org.wfanet.measurement.duchy.deploy.common.postgres.PostgresContinuationTokensService
+import org.wfanet.measurement.duchy.deploy.common.postgres.testing.Schemata.DUCHY_CHANGELOG_PATH
 import org.wfanet.measurement.duchy.service.internal.testing.ContinuationTokensServiceTest
 
 @RunWith(JUnit4::class)