From 2e99fff2f45154091f1e4e5be051963c7e86df43 Mon Sep 17 00:00:00 2001
From: Sanjay Vasandani <sanjayvas@google.com>
Date: Wed, 20 Sep 2023 15:08:09 -0700
Subject: [PATCH] Fix Reporting workflow to include measurement spec config.
 (#1236)

---
 .github/workflows/configure-reporting.yml                 | 5 +++++
 src/main/k8s/local/BUILD.bazel                            | 8 ++++----
 src/main/k8s/testing/secretfiles/BUILD.bazel              | 5 +++++
 .../secretfiles}/measurement_spec_config.textproto        | 0
 .../secretfiles}/metric_spec_config.textproto             | 0
 5 files changed, 14 insertions(+), 4 deletions(-)
 rename src/main/k8s/{local => testing/secretfiles}/measurement_spec_config.textproto (100%)
 rename src/main/k8s/{local => testing/secretfiles}/metric_spec_config.textproto (100%)

diff --git a/.github/workflows/configure-reporting.yml b/.github/workflows/configure-reporting.yml
index e6b1d25633a..defc9a82927 100644
--- 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
index 3177349ed5b..de40ae60ba0 100644
--- 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
index 905face6444..00f493e5399 100644
--- 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/src/main/k8s/local/measurement_spec_config.textproto b/src/main/k8s/testing/secretfiles/measurement_spec_config.textproto
similarity index 100%
rename from src/main/k8s/local/measurement_spec_config.textproto
rename to src/main/k8s/testing/secretfiles/measurement_spec_config.textproto
diff --git a/src/main/k8s/local/metric_spec_config.textproto b/src/main/k8s/testing/secretfiles/metric_spec_config.textproto
similarity index 100%
rename from src/main/k8s/local/metric_spec_config.textproto
rename to src/main/k8s/testing/secretfiles/metric_spec_config.textproto