Fix Reporting workflow to include measurement spec config. (#1236)

world-federation-of-advertisers · Sep 20, 2023 · 2e99fff · 2e99fff
1 parent 2cceea4
commit 2e99fff
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/configure-reporting.yml b/.github/workflows/configure-reporting.yml
@@ -126,6 +126,11 @@ jobs:
         echo "$ENCRYPTION_KEY_PAIR_CONFIG" | sed $'s/\r$//'  >
         "$KUSTOMIZATION_PATH/src/main/k8s/dev/reporting_config_files/encryption_key_pair_config.textproto"
 
+    - name: Copy measurement spec config
+      run: >
+        cp src/main/k8s/testing/secretfiles/measurement_spec_config.textproto
+        "$KUSTOMIZATION_PATH/src/main/k8s/dev/reporting_config_files/"
+
     - name: Write measurement consumer config
       env:
         MEASUREMENT_CONSUMER_CONFIG: ${{ vars.MEASUREMENT_CONSUMER_CONFIG }}

diff --git a/src/main/k8s/local/BUILD.bazel b/src/main/k8s/local/BUILD.bazel
@@ -253,9 +253,9 @@ kustomization_dir(
         "config_files_kustomization.yaml",
         "empty_akid_mapping_config.textproto",
         "empty_encryption_key_pair_config.textproto",
-        "measurement_spec_config.textproto",
-        "metric_spec_config.textproto",
         "//src/main/k8s/testing/data:synthetic_generation_specs",
+        "//src/main/k8s/testing/secretfiles:measurement_spec_config.textproto",
+        "//src/main/k8s/testing/secretfiles:metric_spec_config.textproto",
     ],
     renames = {
         "config_files_kustomization.yaml": "kustomization.yaml",
@@ -268,10 +268,10 @@ kustomization_dir(
     name = "config_files",
     srcs = [
         "config_files_kustomization.yaml",
-        "measurement_spec_config.textproto",
-        "metric_spec_config.textproto",
         ":encryption_key_pair_config.textproto",
         "//src/main/k8s/testing/data:synthetic_generation_specs",
+        "//src/main/k8s/testing/secretfiles:measurement_spec_config.textproto",
+        "//src/main/k8s/testing/secretfiles:metric_spec_config.textproto",
     ],
     renames = {
         "config_files_kustomization.yaml": "kustomization.yaml",

diff --git a/src/main/k8s/testing/secretfiles/BUILD.bazel b/src/main/k8s/testing/secretfiles/BUILD.bazel
@@ -14,6 +14,11 @@ package(
     ],
 )
 
+exports_files([
+    "measurement_spec_config.textproto",
+    "metric_spec_config.textproto",
+])
+
 filegroup(
     name = "all_der_files",
     srcs = glob(["*.der"]),

diff --git a/...s/local/measurement_spec_config.textproto → ...etfiles/measurement_spec_config.textproto b/...s/local/measurement_spec_config.textproto → ...etfiles/measurement_spec_config.textproto
diff --git a/...in/k8s/local/metric_spec_config.textproto → .../secretfiles/metric_spec_config.textproto b/...in/k8s/local/metric_spec_config.textproto → .../secretfiles/metric_spec_config.textproto