Merge pull request #85 from ot4i/11.0.0.5.1

Updates for 11.0.0.5.1 release

Author: IBMRob

.travis.yml

@@ -0,0 +1,14 @@
+sudo: required
+dist: xenial
+language: generic
+services:
+  - docker
+# Make some fake binaries to spoof an ACE install for the Dockerbuild files to use.
+before_install:
+  - mkdir -p deps/ace-install/server/bin/
+  - echo -e "#!/bin/bash\nexport PATH=/opt/ibm/ace-11/server/bin/" > deps/ace-install/server/bin/mqsiprofile && chmod ugo+x deps/ace-install/server/bin/mqsiprofile
+  - echo -e "#!/bin/bash\nexit 0" > deps/ace-install/server/bin/mqsicreateworkdir && chmod ugo+x deps/ace-install/server/bin/mqsicreateworkdir
+  - echo -e "#!/bin/bash\ngroupadd mqbrkrs\ngroupadd mqm\nexit 0" > deps/ace-install/ace && chmod u+x deps/ace-install/ace
+  - cd deps && tar czf ace-install.tar.gz ace-install && cd ..
+install:
+  - docker build --build-arg ACE_INSTALL=ace-install.tar.gz --file ubi/Dockerfile.aceonly .

README.md

@@ -30,7 +30,7 @@ You may have been provided with a fix for App Connect Enterprise by IBM Support,
    `tar -cvf ace-11.0.0.5_with_IT12345.tar ace-11.0.0.5`
    `gzip ace-11.0.0.5_with_IT12345.tar`
  - Place the resulting `ace-11.0.0.5_with_IT12345.tar.gz` file in the `deps` folder and when building using the `build-arg` to specify the name of the file: `--build-arg ACE_INSTALL=ace-11.0.0.5_with_IT12345.tar.gz`
-    
+
 ### Using App Connect Enterprise for Developers
 
 Get [ACE for Developers edition](https://www.ibm.com/marketing/iwm/iwm/web/pick.do?source=swg-wmbfd). Then place it in the `deps` folder as mentioned above.
@@ -69,7 +69,7 @@ Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in
 
 Follow the instructions above for building an image with App Connect Enterprise Only.
 
-Add the MQ Client libraries to your existing image by running `cd ubi && docker build -t ace-mqclient --build-arg BASE_IMAGE=<AceOnlyImageTag> --file Dockerfile.mqclient .`
+Add the MQ Client libraries to your existing image by running `docker build -t ace-mqclient --build-arg BASE_IMAGE=<AceOnlyImageTag> --file ubi/Dockerfile.mqclient .`
 
 `<AceOnlyImageTag>` is the tag of the image you want to add the client libs to i.e. ace-only. You can supply a customer URL for the MQ binaries by setting the argument MQ_URL
 
@@ -83,6 +83,7 @@ In order to use the image, it is necessary to accept the terms of the IBM App Co
 
 This chart requires a SecurityContextConstraints to be bound to the target namespace prior to installation. To meet this requirement there may be cluster scoped as well as namespace scoped pre and post actions that need to occur.
 
+
 #### Running an ACE Only Integration Server
 
 The predefined SecurityContextConstraints name: [`ibm-anyuid-scc`](https://ibm.biz/cpkspec-scc) has been verified for this chart when creating an ACE & MQ integration server, if your target namespace is bound to this SecurityContextConstraints resource you can proceed to install the chart.
@@ -192,7 +193,7 @@ You can mount the following file structure at `/home/aceuser/initial-config`. Mi
    - The truststore file that will be created for these files needs a password. You must set a truststore password using the environment variable `ACE_TRUSTSTORE_PASSWORD`
    - You can place multiple files, each with a different file name/alias.
 - `/home/aceuser/initial-config/webusers`
-   - A text file called `admin-users.txt`. It contains a list of users to be created as admin users using the command `mqsiwebuseradmin`. These users will have READ, WRITE and EXECUTE access on the Integration Server. The file has the following format:
+   - A text file called either `admin-users.txt` or `operator-users.txt`. It contains a list of users to be created as admin/operator users using the command `mqsiwebuseradmin`. These users will have READ, WRITE and EXECUTE access on the Integration Server. The file has the following format:
      ```
      # Lines starting with a "#" are ignored
      # Each line should specify the <adminUser> <password>, separated by a single space
@@ -202,7 +203,7 @@ You can mount the following file structure at `/home/aceuser/initial-config`. Mi
      admin1 password1
      admin2 password2
      ```
-   - A text file called `viewer-users.txt`. It contains a list of users to be created as viewer users using the command `mqsiwebuseradmin`. These users will have READ access on the Integration Server. The file has the following format:
+   - A text file called `viewer-users.txt`, `editor-users.txt`, `audit-users.txt` . It contains a list of users to be created as viewer/editor/auditor users using the command `mqsiwebuseradmin`. These users will have READ access on the Integration Server. The file has the following format:
      ```
      # Lines starting with a "#" are ignored
      # Each line should specify the <adminUser> <password>, separated by a single space
@@ -221,6 +222,10 @@ You can mount the following file structure at `/home/aceuser/initial-config`. Mi
    - A json file called 'agentp.json' containing configuration information for the agent connectivity, this will be copied into the appropriate iibswitch directory
 - `/home/aceuser/initial-config/extensions`
    - A zip file called `extensions.zip` will be extracted into the directory `/home/aceuser/ace-server/extensions`. This allows you to place extra files into a directory you can then reference in, for example, the server.conf.yaml
+- `/home/aceuser/initial-config/ssl`
+   - A pem file called 'ca.crt' will be extracted into the directory `/home/aceuser/ace-server/ssl`
+   - A pem file called 'tls.key' will be extracted into the directory `/home/aceuser/ace-server/ssl`
+   - A pem file called 'tls.cert' will be extracted into the directory `/home/aceuser/ace-server/ssl`
 
 ## Logging
 

ace_config_ssl.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# © Copyright IBM Corporation 2018.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source ${SCRIPT_DIR}/ace_config_logging.sh
+
+log "Handling SSL files"
+
+mkdir /home/aceuser/ace-server/ssl/
+
+if ls /home/aceuser/initial-config/ssl/* >/dev/null 2>&1; then
+  for sslfile in `ls /home/aceuser/initial-config/ssl/*`; do
+    if [ -s "${sslfile}" ]; then
+      cp "${sslfile}" /home/aceuser/ace-server/ssl/.
+    fi
+  done
+fi
+
+log "SSL configuration complete"

ace_config_webusers.sh

@@ -17,10 +17,13 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 log "Handling webusers configuration"
 
 ADMINUSERSFILE=/home/aceuser/initial-config/webusers/admin-users.txt
+OPERATORUSERSFILE=/home/aceuser/initial-config/webusers/operator-users.txt
 VIEWERUSERSFILE=/home/aceuser/initial-config/webusers/viewer-users.txt
+EDITORUSERSFILE=/home/aceuser/initial-config/webusers/editor-users.txt
+AUDITUSERSFILE=/home/aceuser/initial-config/webusers/audit-users.txt
 DASHBOARDUSERSFILE=/home/aceuser/initial-config/webusers/dashboard-users.txt
 
-if [ -s $ADMINUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $DASHBOARDUSERSFILE ]; then
+if [ -s $ADMINUSERSFILE ] || [ -s $OPERATORUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $EDITORUSERSFILE ]  || [ -s $AUDITUSERSFILE ] || [ -s $DASHBOARDUSERSFILE ]; then
   OUTPUT=$(mqsichangeauthmode -w /home/aceuser/ace-server -s active -m file 2>&1)
   logAndExitIfError $? "${OUTPUT}"
 
@@ -47,6 +50,21 @@ if [ -s $ADMINUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $DASHBOARDUSERSFILE
     done
   fi
 
+  if [ -s $OPERATORUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $OPERATORUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating admin user ${fields[0]}"
+
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r admin 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
+  fi
+
   if [ -s $VIEWERUSERSFILE ]; then
     IFS=$'\n'
     for line in $(cat $VIEWERUSERSFILE | tr -d '\r'); do
@@ -62,6 +80,36 @@ if [ -s $ADMINUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $DASHBOARDUSERSFILE
     done
   fi
 
+  if [ -s $EDITORUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $EDITORUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating viewer user ${fields[0]}"
+
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
+  fi
+
+  if [ -s $AUDITUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $AUDITUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating viewer user ${fields[0]}"
+
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
+  fi
+
   if [ -s $DASHBOARDUSERSFILE ]; then
     IFS=$'\n'
     for line in $(cat $DASHBOARDUSERSFILE | tr -d '\r'); do

cmd/runaceserver/integrationserver.go

@@ -119,6 +119,17 @@ func initialIntegrationServerConfig() error {
 		}
 	}
 
+	enableOpenTracing := os.Getenv("ACE_ENABLE_OPEN_TRACING")
+	if enableOpenTracing == "true" || enableOpenTracing == "1" {
+		enableOpenTracingError := enableOpenTracingInServerConf()
+		if enableOpenTracingError != nil {
+			log.Errorf("Error enabling user exits in server.conf.yaml: %v", enableOpenTracingError)
+			return enableOpenTracingError
+		}
+	}
+
+	
+
 	log.Printf("Initial configuration of integration server complete")
 
 	log.Println("Discovering override ports")
@@ -163,6 +174,36 @@ func enableMetricsInServerConf() error {
 	return nil
 }
 
+// enableOpenTracingInServerConf adds OpenTracing UserExits fields to the server.conf.yaml in overrides
+// If the file does not exist already it gets created.
+func enableOpenTracingInServerConf() error {
+
+	log.Println("Enabling OpenTracing in server.conf.yaml")
+
+	serverconfContent, readError := readServerConfFile()
+	if readError != nil {
+		if !os.IsNotExist(readError) {
+			// Error is different from file not existing (if the file does not exist we will create it ourselves)
+			log.Errorf("Error reading server.conf.yaml: %v", readError)
+			return readError
+		}
+	}
+
+	serverconfYaml, manipulationError := addOpenTracingToServerConf(serverconfContent)
+	if manipulationError != nil {
+		return manipulationError
+	}
+
+	writeError := writeServerConfFile(serverconfYaml)
+	if writeError != nil {
+		return writeError
+	}
+
+	log.Println("OpenTracing enabled in server.conf.yaml")
+
+	return nil
+}
+
 // readServerConfFile returns the content of the server.conf.yaml file in the overrides folder
 func readServerConfFile() ([]byte, error) {
 	content, err := ioutil.ReadFile("/home/aceuser/ace-server/overrides/server.conf.yaml")
@@ -180,7 +221,7 @@ func writeServerConfFile(content []byte) error {
 	return nil
 }
 
-// addMetricsToServerConf gets the content of the server.conf.yaml and adds the metrics fileds to it
+// addMetricsToServerConf gets the content of the server.conf.yaml and adds the metrics fields to it
 // It returns the updated server.conf.yaml content
 func addMetricsToServerConf(serverconfContent []byte) ([]byte, error) {
 	serverconfMap := make(map[interface{}]interface{})
@@ -233,6 +274,38 @@ func addMetricsToServerConf(serverconfContent []byte) ([]byte, error) {
 	return serverconfYaml, nil
 }
 
+// addOpenTracingToServerConf gets the content of the server.conf.yaml and adds the OpenTracing UserExits fields to it
+// It returns the updated server.conf.yaml content
+func addOpenTracingToServerConf(serverconfContent []byte) ([]byte, error) {
+	serverconfMap := make(map[interface{}]interface{})
+	unmarshallError := yaml.Unmarshal([]byte(serverconfContent), &serverconfMap)
+	if unmarshallError != nil {
+		log.Errorf("Error unmarshalling server.conf.yaml: %v", unmarshallError)
+		return nil, unmarshallError
+	}
+
+	if serverconfMap["UserExits"] != nil {
+		userExits := serverconfMap["UserExits"].(map[string]string)
+
+		userExits["activeUserExitList"] = "ACEOpenTracingUserExit"
+		userExits["userExitPath"] = "/opt/ACEOpenTracing"
+
+	} else {
+		serverconfMap["UserExits"] = map[string]string{
+			"activeUserExitList":    "ACEOpenTracingUserExit",
+			"userExitPath":    "/opt/ACEOpenTracing",
+		}
+	}
+
+	serverconfYaml, marshallError := yaml.Marshal(&serverconfMap)
+	if marshallError != nil {
+		log.Errorf("Error marshalling server.conf.yaml: %v", marshallError)
+		return nil, marshallError
+	}
+
+	return serverconfYaml, nil
+}
+
 // getConfigurationFromContentServer checks if ACE_CONTENT_SERVER_URL exists.  If so then it pulls
 // a bar file from that URL
 func getConfigurationFromContentServer() error {

deps/.gitignore

@@ -1,2 +1,6 @@
 *.tar.gz
 *.tgz
+OpenTracing/config/*
+OpenTracing/library/*
+!OpenTracing/config/README
+!OpenTracing/library/README

deps/OpenTracing/config/README

@@ -0,0 +1 @@
+Any configuration files needed for the Loadable Exit Library (LEL) should be placed in this directory

deps/OpenTracing/library/README

@@ -0,0 +1 @@
+The Loadable Exit Library (LEL) file to support tracing should be placed in this directory.

sample/Dockerfile.acemq

@@ -8,4 +8,4 @@ COPY bars_aceonly /home/aceuser/bars
 COPY bars_mq /home/aceuser/bars
 RUN su - mqm -c 'ace_compile_bars.sh'
 
-USER mqm
+USER mqm