From fe30f619e456b5c0a1c53989a21722999d0cd3c3 Mon Sep 17 00:00:00 2001 From: Weimin Yu Date: Tue, 23 Mar 2021 10:08:15 -0400 Subject: [PATCH] * Add release info to Nomulus config files Add the actual release tag and beam staging project id to the config file. This allows the Nomulus server to find the right version of the BEAM pipelines to launch. --- .../main/java/google/registry/config/RegistryConfig.java | 7 +++++++ .../google/registry/config/RegistryConfigSettings.java | 1 + .../java/google/registry/config/files/default-config.yaml | 1 + 3 files changed, 9 insertions(+) diff --git a/core/src/main/java/google/registry/config/RegistryConfig.java b/core/src/main/java/google/registry/config/RegistryConfig.java index b1f7ac7f6..16da4536a 100644 --- a/core/src/main/java/google/registry/config/RegistryConfig.java +++ b/core/src/main/java/google/registry/config/RegistryConfig.java @@ -652,6 +652,13 @@ public final class RegistryConfig { return config.beam.defaultJobZone; } + /** Returns the GCS bucket URL with all staged BEAM flex templates. */ + @Provides + @Config("beamStagingBucketUrl") + public static String provideBeamStagingBucketUrl(RegistryConfigSettings config) { + return config.beam.stagingBucketUrl; + } + /** * Returns the URL of the GCS location we store jar dependencies for beam pipelines. * diff --git a/core/src/main/java/google/registry/config/RegistryConfigSettings.java b/core/src/main/java/google/registry/config/RegistryConfigSettings.java index 68afb830e..3c9784ad2 100644 --- a/core/src/main/java/google/registry/config/RegistryConfigSettings.java +++ b/core/src/main/java/google/registry/config/RegistryConfigSettings.java @@ -133,6 +133,7 @@ public class RegistryConfigSettings { public static class Beam { public String defaultJobRegion; public String defaultJobZone; + public String stagingBucketUrl; } /** Configuration for Cloud DNS. */ diff --git a/core/src/main/java/google/registry/config/files/default-config.yaml b/core/src/main/java/google/registry/config/files/default-config.yaml index 77acc0273..52608142b 100644 --- a/core/src/main/java/google/registry/config/files/default-config.yaml +++ b/core/src/main/java/google/registry/config/files/default-config.yaml @@ -425,6 +425,7 @@ beam: # The default zone to run Apache Beam (Cloud Dataflow) jobs in. # TODO(weiminyu): consider dropping zone config. No obvious needs for this. defaultJobZone: us-east1-c + stagingBucketUrl: gcs-bucket-with-staged-templates keyring: # The name of the active keyring, either "KMS" or "Dummy".