From bac8b31676f374895478610e5dc7a2cb8f3ee767 Mon Sep 17 00:00:00 2001 From: Kyle Thomas Date: Sun, 4 Dec 2022 23:41:39 -0500 Subject: [PATCH] Pass relative servicenow API paths in BPI environment --- prvd/baseline/stack/stack_start.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/prvd/baseline/stack/stack_start.go b/prvd/baseline/stack/stack_start.go index 57b7a42..54dc665 100644 --- a/prvd/baseline/stack/stack_start.go +++ b/prvd/baseline/stack/stack_start.go @@ -922,10 +922,6 @@ func containerEnvironmentFactory(listenPort *int) []string { fmt.Sprintf("VAULT_API_SCHEME=%s", vaultAPIScheme), fmt.Sprintf("VAULT_REFRESH_TOKEN=%s", vaultRefreshToken), fmt.Sprintf("VAULT_SEAL_UNSEAL_KEY=%s", vaultSealUnsealKey), - - "SERVICENOW_LIST_SCHEMAS_API_PATH=api/x_prot9_provide/setup_configuration/ListSchemas", - "SERVICENOW_SCHEMA_DETAILS_API_PATH=api/x_prot9_provide/setup_configuration/GetSchemaDetails", - "SERVICENOW_HEALTHCHECK_API_PATH=api/now/branding", } { env = append(env, envvar) } @@ -934,6 +930,12 @@ func containerEnvironmentFactory(listenPort *int) []string { env = append(env, fmt.Sprintf("PORT=%d", *listenPort)) } + if serviceNowAPIHost != "" { + env = append(env, "SERVICENOW_HEALTHCHECK_API_PATH=api/now/branding") + env = append(env, "SERVICENOW_LIST_SCHEMAS_API_PATH=setup_configuration/ListSchemas") + env = append(env, "SERVICENOW_SCHEMA_DETAILS_API_PATH=setup_configuration/GetSchemaDetails") + } + return env } @@ -1847,7 +1849,7 @@ func initSORFlags() { startBaselineStackCmd.Flags().StringVar(&serviceNowAPIHost, "servicenow-api-host", "", "hostname of the ServiceNow service") startBaselineStackCmd.Flags().StringVar(&serviceNowAPIScheme, "servicenow-api-scheme", "https", "protocol scheme of the ServiceNow service") - startBaselineStackCmd.Flags().StringVar(&serviceNowAPIPath, "servicenow-api-path", "api/now/table", "base path of the ServiceNow API") + // startBaselineStackCmd.Flags().StringVar(&serviceNowAPIPath, "servicenow-api-path", "api/now/table", "base path of the ServiceNow API") startBaselineStackCmd.Flags().StringVar(&serviceNowAPIUsername, "servicenow-api-username", "", "username to use for basic authorization against the ServiceNow API") startBaselineStackCmd.Flags().StringVar(&serviceNowAPIPassword, "servicenow-api-password", "", "password to use for basic authorization against the ServiceNow API") }