From 763bbbdfc002217b2f097977d33ed7ee9e43fadf Mon Sep 17 00:00:00 2001 From: Louis Heath Date: Fri, 21 Jun 2024 14:49:39 +0100 Subject: [PATCH 1/2] Specify Backstage Token in CMD --- cmd/catalog-importer/cmd/backstage.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cmd/catalog-importer/cmd/backstage.go b/cmd/catalog-importer/cmd/backstage.go index b20b42f..1873397 100644 --- a/cmd/catalog-importer/cmd/backstage.go +++ b/cmd/catalog-importer/cmd/backstage.go @@ -16,6 +16,8 @@ type BackstageOptions struct { APIEndpoint string APIKey string BackstageEndpoint string + BackstageToken string + BackstageSignJWT bool } func (opt *BackstageOptions) Bind(cmd *kingpin.CmdClause) *BackstageOptions { @@ -30,6 +32,14 @@ func (opt *BackstageOptions) Bind(cmd *kingpin.CmdClause) *BackstageOptions { Default("http://localhost:7007/api/catalog/entities"). Envar("BACKSTAGE_ENDPOINT"). StringVar(&opt.BackstageEndpoint) + cmd.Flag("backstage-token", "Token of the Backstage entries API"). + Default(""). + Envar("BACKSTAGE_TOKEN"). + StringVar(&opt.BackstageToken) + cmd.Flag("backstage-sign-jwt", "Sign JWT for Backstage"). + Default("true"). + Envar("BACKSTAGE_SIGN_JWT"). + BoolVar(&opt.BackstageSignJWT) return opt } @@ -52,6 +62,8 @@ func (opt *BackstageOptions) Run(ctx context.Context, logger kitlog.Logger) erro { Backstage: &source.SourceBackstage{ Endpoint: opt.BackstageEndpoint, + Token: source.Credential(opt.BackstageToken), + SignJWT: &opt.BackstageSignJWT, }, }, } From 59dbc0c2253ae6ccb7107ac2d45ab3b490ed25aa Mon Sep 17 00:00:00 2001 From: Louis Heath Date: Fri, 21 Jun 2024 14:51:37 +0100 Subject: [PATCH 2/2] improve docstrings --- cmd/catalog-importer/cmd/backstage.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/catalog-importer/cmd/backstage.go b/cmd/catalog-importer/cmd/backstage.go index 1873397..f8e4cae 100644 --- a/cmd/catalog-importer/cmd/backstage.go +++ b/cmd/catalog-importer/cmd/backstage.go @@ -32,11 +32,11 @@ func (opt *BackstageOptions) Bind(cmd *kingpin.CmdClause) *BackstageOptions { Default("http://localhost:7007/api/catalog/entities"). Envar("BACKSTAGE_ENDPOINT"). StringVar(&opt.BackstageEndpoint) - cmd.Flag("backstage-token", "Token of the Backstage entries API"). + cmd.Flag("backstage-token", "Token of the Backstage entries API. Optional"). Default(""). Envar("BACKSTAGE_TOKEN"). StringVar(&opt.BackstageToken) - cmd.Flag("backstage-sign-jwt", "Sign JWT for Backstage"). + cmd.Flag("backstage-sign-jwt", "Whether to sign the provided Backstage token into a JWT. Defaults to true"). Default("true"). Envar("BACKSTAGE_SIGN_JWT"). BoolVar(&opt.BackstageSignJWT)