mirror of
https://github.com/google/nomulus.git
synced 2025-06-24 05:11:10 +02:00
Fix some SQL credential issues identified when deploying Beam pipelines (#706)
* Fix some SQL credential issues identified when deploying Beam pipelines There are two issues fixed here. 1. Without calling `FileSystems.setDefaultPipelineOptions(PipelineOptionsFactory.create()), the Nomulus tool doesn't know how to handle gs:// scheme files. Thus, if you try to deploy (for instance) the Spec11 pipeline using a GCS credential file, it fails. 2. There was a misunderstanding before about what the credential file actually refers to -- there is a credential file in JSON format that is used for gcloud authorization, and there is a space-delimited SQL access info file that has the instance name, username, and password. These are separate options and should have separate command-line params. * Actually we don't need this for remote deployment
This commit is contained in:
parent
92e3b0b61d
commit
86d4fb6d99
1 changed files with 7 additions and 1 deletions
|
@ -66,6 +66,12 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
|
|||
+ "If not set, credentials saved by running `nomulus login' will be used.")
|
||||
private String credentialJson = null;
|
||||
|
||||
@Parameter(
|
||||
names = {"--sql_access_info"},
|
||||
description = "Name of a file containing space-separated SQL access info used when deploying "
|
||||
+ "Beam pipelines")
|
||||
private String sqlAccessInfoFile = null;
|
||||
|
||||
// Do not make this final - compile-time constant inlining may interfere with JCommander.
|
||||
@ParametersDelegate
|
||||
private LoggingParameters loggingParams = new LoggingParameters();
|
||||
|
@ -161,7 +167,7 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
|
|||
component =
|
||||
DaggerRegistryToolComponent.builder()
|
||||
.credentialFilePath(credentialJson)
|
||||
.beamJpaModule(new BeamJpaModule(credentialJson))
|
||||
.beamJpaModule(new BeamJpaModule(sqlAccessInfoFile))
|
||||
.build();
|
||||
|
||||
// JCommander stores sub-commands as nested JCommander objects containing a list of user objects
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue