mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-03 03:35:42 +00:00
Code Issues Releases Wiki Activity

Connect to GKE by default from the tool (#2686)

Browse Source
This commit is contained in:
Lai Jiang
2025-02-24 14:01:05 -05:00
committed by GitHub
parent bcf42bd287
commit 397f800614
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/google/registry/tools/RegistryCli.java
View File

@@ -25,7 +25,6 @@ import com.beust.jcommander.Parameters;
import com.beust.jcommander.ParametersDelegate; import com.beust.jcommander.ParametersDelegate;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.persistence.transaction.JpaTransactionManager;
import google.registry.persistence.transaction.TransactionManagerFactory; import google.registry.persistence.transaction.TransactionManagerFactory;
@@ -42,13 +41,6 @@ import org.postgresql.util.PSQLException;
@Parameters(separators = " =", commandDescription = "Command-line interface to the registry") @Parameters(separators = " =", commandDescription = "Command-line interface to the registry")
final class RegistryCli implements CommandRunner { final class RegistryCli implements CommandRunner {
private static final ImmutableSet<RegistryToolEnvironment> DEFAULT_GKE_ENVIRONMENTS =
ImmutableSet.of(
RegistryToolEnvironment.ALPHA,
RegistryToolEnvironment.CRASH,
RegistryToolEnvironment.QA,
RegistryToolEnvironment.SANDBOX);
// The environment parameter is parsed twice: once here, and once with {@link // The environment parameter is parsed twice: once here, and once with {@link
// RegistryToolEnvironment#parseFromArgs} in the {@link RegistryTool#main} function. // RegistryToolEnvironment#parseFromArgs} in the {@link RegistryTool#main} function.
// //
@@ -78,9 +70,6 @@ final class RegistryCli implements CommandRunner {
+ "Beam pipelines") + "Beam pipelines")
private String sqlAccessInfoFile = null; private String sqlAccessInfoFile = null;
@Parameter(names = "--gke", description = "Whether to use GKE runtime, instead of GAE")
private boolean useGke = false;
@Parameter(names = "--gae", description = "Whether to use GAE runtime, instead of GKE") @Parameter(names = "--gae", description = "Whether to use GAE runtime, instead of GKE")
private boolean useGae = false; private boolean useGae = false;
@@ -161,12 +150,6 @@ final class RegistryCli implements CommandRunner {
throw e; throw e;
} }
checkState(!useGke || !useGae, "Cannot specify both --gke and --gae");
// Special logic to set the default based on the environment if neither --gae nor --gke is set.
if (!useGke && !useGae) {
useGke = DEFAULT_GKE_ENVIRONMENTS.contains(environment);
}
String parsedCommand = jcommander.getParsedCommand(); String parsedCommand = jcommander.getParsedCommand();
// Show the list of all commands either if requested or if no subcommand name was specified // Show the list of all commands either if requested or if no subcommand name was specified
// (which does not throw a ParameterException parse error above). // (which does not throw a ParameterException parse error above).
@@ -186,7 +169,7 @@ final class RegistryCli implements CommandRunner {
DaggerRegistryToolComponent.builder() DaggerRegistryToolComponent.builder()
.credentialFilePath(credentialJson) .credentialFilePath(credentialJson)
.sqlAccessInfoFile(sqlAccessInfoFile) .sqlAccessInfoFile(sqlAccessInfoFile)
.useGke(useGke) .useGke(!useGae)
.useCanary(useCanary) .useCanary(useCanary)
.build(); .build();