From f16e551ba931bdafcf3bdd7000284359e6104d8e Mon Sep 17 00:00:00 2001 From: Patrick Sanders Date: Thu, 8 Apr 2021 16:11:38 -0700 Subject: [PATCH] Allow URL override for open links (#63) --- creds/consoleme.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/creds/consoleme.go b/creds/consoleme.go index 4d8d2e7..ddbebe4 100644 --- a/creds/consoleme.go +++ b/creds/consoleme.go @@ -207,7 +207,16 @@ func (c *Client) GetResourceURL(arn string) (string, error) { if err := json.Unmarshal(document, &responseParsed); err != nil { return "", errors.Wrap(err, "failed to unmarshal JSON") } - return viper.GetString("consoleme_url") + responseParsed.Data["url"], nil + return baseWebURL() + responseParsed.Data["url"], nil +} + +// baseWebURL allows the ConsoleMe URL to be overridden for cases where the API +// and UI are accessed via different URLs +func baseWebURL() string { + if override := viper.GetString("consoleme_open_url_override"); override != "" { + return override + } + return viper.GetString("consoleme_url") } func parseWebError(rawErrorResponse []byte) error {