From c5300949e01a1f6b81d9b11e2ed3f329bf8a9bf5 Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Fri, 12 Mar 2021 15:26:32 -0800 Subject: [PATCH] xds: change system property for reading bootstrap config (backport v1.36.x) (#7961) (#7968) Changes from "io.grpc.xds.bootstrapValue" to "io.grpc.xds.bootstrapConfig". --- xds/src/main/java/io/grpc/xds/BootstrapperImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java b/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java index 5b5710e1c3f..2818c566152 100644 --- a/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java +++ b/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java @@ -54,9 +54,9 @@ public class BootstrapperImpl implements Bootstrapper { private static final String BOOTSTRAP_CONFIG_SYS_ENV_VAR = "GRPC_XDS_BOOTSTRAP_CONFIG"; @VisibleForTesting static String bootstrapConfigFromEnvVar = System.getenv(BOOTSTRAP_CONFIG_SYS_ENV_VAR); - private static final String BOOTSTRAP_CONFIG_SYS_PROPERTY_VAR = "io.grpc.xds.bootstrapValue"; + private static final String BOOTSTRAP_CONFIG_SYS_PROPERTY = "io.grpc.xds.bootstrapConfig"; @VisibleForTesting - static String bootstrapConfigFromSysProp = System.getProperty(BOOTSTRAP_CONFIG_SYS_PROPERTY_VAR); + static String bootstrapConfigFromSysProp = System.getProperty(BOOTSTRAP_CONFIG_SYS_PROPERTY); private static final String XDS_V3_SERVER_FEATURE = "xds_v3"; @VisibleForTesting static final String CLIENT_FEATURE_DISABLE_OVERPROVISIONING = @@ -106,7 +106,7 @@ public BootstrapInfo bootstrap() throws XdsInitializationException { + "- " + BOOTSTRAP_CONFIG_SYS_ENV_VAR + "\n\n" + "Java System Properties searched:\n" + "- " + BOOTSTRAP_PATH_SYS_PROPERTY + "\n" - + "- " + BOOTSTRAP_CONFIG_SYS_PROPERTY_VAR + "\n\n"); + + "- " + BOOTSTRAP_CONFIG_SYS_PROPERTY + "\n\n"); } @VisibleForTesting