From 5891f170c8894b55c4d8a5e3d144bdca0a58f347 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Wed, 8 Jan 2020 10:29:09 +0530 Subject: [PATCH 1/6] removing MQ_WEB_ADMIN_USER vairable --- cmd/runmqserver/webserver.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index 593bdd1..a20d35d 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -86,7 +86,6 @@ func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error { func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) { // Ensure all required environment variables are set for SSO requiredEnvVars := []string{ - "MQ_WEB_ADMIN_USERS", "MQ_OIDC_CLIENT_ID", "MQ_OIDC_CLIENT_SECRET", "MQ_OIDC_UNIQUE_USER_IDENTIFIER", @@ -111,13 +110,6 @@ func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) { return "", err } - // Process SSO template for generating file mqwebuser.xml - adminUsers := strings.Split(os.Getenv("MQ_WEB_ADMIN_USERS"), "\n") - err = mqtemplate.ProcessTemplateFile(mqwebDir+"/mqwebuser.xml.tpl", mqwebDir+"/mqwebuser.xml", map[string][]string{"AdminUser": adminUsers}, log) - if err != nil { - return "", err - } - // Configure SSO TLS return tls.ConfigureWebKeystore(p12TrustStore) } From 3d5317f3da82cc894b24a02c49ee346410fc6a5a Mon Sep 17 00:00:00 2001 From: mamgainp Date: Wed, 8 Jan 2020 11:06:31 +0530 Subject: [PATCH 2/6] removing MQ_WEB_ADMIN_USER vairable --- cmd/runmqserver/webserver.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index a20d35d..743ebd2 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -26,8 +26,6 @@ import ( "syscall" "github.com/ibm-messaging/mq-container/internal/command" - "github.com/ibm-messaging/mq-container/internal/copy" - "github.com/ibm-messaging/mq-container/internal/mqtemplate" "github.com/ibm-messaging/mq-container/internal/tls" ) From b4a3d7d7329fbf3ccd04faf089b9ec9ccd228bf5 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Wed, 8 Jan 2020 12:23:31 +0530 Subject: [PATCH 3/6] removing MQ_WEB_ADMIN_USER vairable --- cmd/runmqserver/webserver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index 743ebd2..63eb359 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -22,10 +22,10 @@ import ( "os/user" "path/filepath" "strconv" - "strings" "syscall" "github.com/ibm-messaging/mq-container/internal/command" + "github.com/ibm-messaging/mq-container/internal/copy" "github.com/ibm-messaging/mq-container/internal/tls" ) From 3ba37b2b2b9d5f2be641d4cea2d8e9cd790ffc61 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Thu, 9 Jan 2020 11:44:02 +0530 Subject: [PATCH 4/6] undo some changes mqwebauth --- cmd/runmqserver/webserver.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index 63eb359..e34ea9f 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -22,10 +22,12 @@ import ( "os/user" "path/filepath" "strconv" + "strings" "syscall" "github.com/ibm-messaging/mq-container/internal/command" "github.com/ibm-messaging/mq-container/internal/copy" + "github.com/ibm-messaging/mq-container/internal/mqtemplate" "github.com/ibm-messaging/mq-container/internal/tls" ) @@ -108,6 +110,15 @@ func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) { return "", err } + // Process SSO template for generating file mqwebuser.xml + /* The variable adminUsers is expected to have a empty string as we are no longer + passing any value in the charts */ + adminUsers := strings.Split(os.Getenv("MQ_WEB_ADMIN_USERS"), "\n") + err = mqtemplate.ProcessTemplateFile(mqwebDir+"/mqwebuser.xml.tpl", mqwebDir+"/mqwebuser.xml", map[string][]string{"AdminUser": adminUsers}, log) + if err != nil { + return "", err + } + // Configure SSO TLS return tls.ConfigureWebKeystore(p12TrustStore) } From 98ddca52ca1f80f650825e6e72dc65d9e85195e6 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Thu, 9 Jan 2020 15:58:20 +0530 Subject: [PATCH 5/6] removing invalid comment --- cmd/runmqserver/webserver.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index e34ea9f..2b249fa 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -111,8 +111,6 @@ func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) { } // Process SSO template for generating file mqwebuser.xml - /* The variable adminUsers is expected to have a empty string as we are no longer - passing any value in the charts */ adminUsers := strings.Split(os.Getenv("MQ_WEB_ADMIN_USERS"), "\n") err = mqtemplate.ProcessTemplateFile(mqwebDir+"/mqwebuser.xml.tpl", mqwebDir+"/mqwebuser.xml", map[string][]string{"AdminUser": adminUsers}, log) if err != nil { From 84ea13eef20a40dcdeab997afa24ffced92b3db4 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Mon, 13 Jan 2020 09:00:45 +0530 Subject: [PATCH 6/6] removing dist from travis yaml file --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5bec009..ce84ed8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -dist: xenial +# Temporarily removing dist tag as not supported by power build +#dist: xenial sudo: required language: go