Skip to content

Commit d7d5943

Browse files
committed
move flag parsing to where the flags are actually used
1 parent 3743490 commit d7d5943

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

cmd/gcp/main.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ func main() {
7575
klog.InitFlags(nil)
7676
flag.Parse()
7777
ctx := context.Background()
78-
if err := validateFlags(); err != nil {
79-
klog.Exitf("Invalid flags: %v", err)
80-
}
8178

8279
signer, err := NewSecretManagerSigner(ctx, *signerPublicKeySecretName, *signerPrivateKeySecretName)
8380
if err != nil {
@@ -204,10 +201,19 @@ func awaitSignal(doneFn func()) {
204201
}
205202

206203
func newGCPStorage(ctx context.Context, signer note.Signer) (*sctfe.CTStorage, error) {
204+
if len(*bucket) == 0 {
205+
return nil, errors.New("missing bucket")
206+
}
207+
208+
if len(*spannerDB) == 0 {
209+
return nil, errors.New("missing spannerDB")
210+
}
211+
207212
gcpCfg := gcpTessera.Config{
208213
Bucket: *bucket,
209214
Spanner: *spannerDB,
210215
}
216+
211217
tesseraStorage, err := gcpTessera.New(ctx, gcpCfg, tessera.WithCheckpointSigner(signer), tessera.WithCTLayout())
212218
if err != nil {
213219
return nil, fmt.Errorf("Failed to initialize GCP Tessera storage: %v", err)
@@ -248,18 +254,3 @@ func (t *timestampFlag) Set(w string) error {
248254
t.t = &tt
249255
return nil
250256
}
251-
252-
func validateFlags() error {
253-
if len(*projectID) == 0 {
254-
return errors.New("missing projectID")
255-
}
256-
257-
if len(*bucket) == 0 {
258-
return errors.New("missing bucket")
259-
}
260-
261-
if len(*spannerDB) == 0 {
262-
return errors.New("missing spannerDB")
263-
}
264-
return nil
265-
}

0 commit comments

Comments
 (0)