12.0.2.0-r2 update (#172)

Author: IBMRob

README-MQ.md

@@ -10,8 +10,6 @@ You can build an image containing one of the following combinations:
 - IBM App Connect Enterprise for Developers
 - IBM App Connect Enterprise for Developers with IBM MQ Client
 
-For information of building images with IBM MQ Advanced please refer to [IBM App Connect Enterprise for Developers with IBM MQ Advanced for Developers](README-MQ.md)
-
 The IBM App Connect operator now supports a single image which includes both the ACE server runtime as well as an MQ client. This readme will describe how you can build an equivalent image.
 
 Pre-built developer and production edition image can be found on IBM Container Registry - [Obtaining the IBM App Connect Enterprise server image from the IBM Cloud Container Registry](https://www.ibm.com/support/knowledgecenter/en/SSTTDS_11.0.0/com.ibm.ace.icp.doc/certc_install_obtaininstallationimageser.html)

README.md

@@ -9,10 +9,10 @@ mqImage=$4
 if [ -z "$aceInstall" ]
 then
       echo "Building temporary container with default ACE install parameters"
-      docker build --build-arg  -t ace/builder:11.0.0.4 . -f ./rhel/Dockerfile.build
+      docker build --no-cache --build-arg  -t ace/builder:11.0.0.4 . -f ./rhel/Dockerfile.build
 else
       echo "Building temporary container with ACE install $buildType"
-      docker build --build-arg ACE_INSTALL=$aceInstall -t ace/builder:11.0.0.4 . -f ./rhel/Dockerfile.build
+      docker build --no-cache --build-arg ACE_INSTALL=$aceInstall -t ace/builder:11.0.0.4 . -f ./rhel/Dockerfile.build
 fi
 
 docker create --name builder ace/builder:11.0.0.4
@@ -30,19 +30,19 @@ sed -i "s%^FROM .*%FROM $mqImage%" ./rhel/Dockerfile.acemqrhel
 case $buildType in
 "ace-dev-only")
    echo "Building ACE only for development"
-   docker build -t $buildTag -f ./rhel/Dockerfile.acerhel .
+   docker build --no-cache -t $buildTag -f ./rhel/Dockerfile.acerhel .
    ;;
 "ace-only")
    echo "Building ACE only for production"
-   docker build -t $buildTag -f ./rhel/Dockerfile.acerhel .
+   docker build --no-cache -t $buildTag -f ./rhel/Dockerfile.acerhel .
    ;;
 "ace-mq")
    echo "Building ACE with MQ for production"
-   docker build -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
+   docker build --no-cache -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
    ;;
 "ace-dev-mq-dev")
    echo "Building ACE with MQ for production"
-   docker build -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
+   docker build --no-cache -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
   ;;
 *) echo "Invalid option"
    ;;

build-rhel.sh

@@ -15,17 +15,13 @@ limitations under the License.
 */
 
 // chkacelively checks that ACE is still runing, by checking if the admin REST endpoint port is available.
-// Additionally, if MQ is enabled, it also runs the MQ liveness probe chkmqhealthy.
 package main
 
 import (
 	"fmt"
 	"net"
 	"os"
 	"time"
-
-	"github.com/ot4i/ace-docker/internal/command"
-	"github.com/ot4i/ace-docker/internal/qmgr"
 )
 
 const restartIsTimeoutInSeconds = 60
@@ -62,13 +58,4 @@ func main() {
 	}
 	conn.Close()
 
-	// Run MQ's liveness check chkmqhealthy, if enabled
-	if qmgr.UseQueueManager() {
-		out, rc, err := command.RunAsUser("mqm", "chkmqhealthy")
-		if rc != 0 || err != nil {
-			fmt.Println(out)
-			fmt.Println(err)
-			os.Exit(1)
-		}
-	}
 }

cmd/chkacehealthy/main.go

@@ -15,16 +15,12 @@ limitations under the License.
 */
 
 // chkaceready checks that ACE is ready for work, by checking if the admin REST endpoint port is available.
-// Additionally, if MQ is enabled, it also runs the MQ readiness probe chkmqready.
 package main
 
 import (
 	"fmt"
 	"net"
 	"os"
-
-	"github.com/ot4i/ace-docker/internal/command"
-	"github.com/ot4i/ace-docker/internal/qmgr"
 )
 
 func main() {
@@ -36,13 +32,4 @@ func main() {
 	}
 	conn.Close()
 
-	// Run MQ's readiness check chkmqready, if enabled
-	if qmgr.UseQueueManager() {
-		out, rc, err := command.RunAsUser("mqm", "chkmqready")
-		if rc != 0 || err != nil {
-			fmt.Println(out)
-			fmt.Println(err)
-			os.Exit(1)
-		}
-	}
 }

cmd/chkaceready/chkaceready_rbc

@@ -41,7 +41,6 @@ import (
 	"github.com/ot4i/ace-docker/internal/command"
 	"github.com/ot4i/ace-docker/internal/configuration"
 	"github.com/ot4i/ace-docker/internal/name"
-	"github.com/ot4i/ace-docker/internal/qmgr"
 	"github.com/ot4i/ace-docker/internal/webadmin"
 	"gopkg.in/yaml.v2"
 
@@ -66,24 +65,6 @@ var yamlMarshal = yaml.Marshal
 var writeServerConfFile = writeServerConfFileLocal
 var getConfigurationFromContentServer = getConfigurationFromContentServerLocal
 
-// createSystemQueues creates the default MQ service queues used by the Integration Server
-func createSystemQueues() error {
-	log.Println("Creating system queues")
-	name, err := name.GetQueueManagerName()
-	if err != nil {
-		log.Errorf("Error getting queue manager name: %v", err)
-		return err
-	}
-
-	out, _, err := command.Run("bash", "/opt/ibm/ace-12/server/sample/wmq/iib_createqueues.sh", name, "mqbrkrs")
-	if err != nil {
-		log.Errorf("Error creating system queues: %v", string(out))
-		return err
-	}
-	log.Println("Created system queues")
-	return nil
-}
-
 // initialIntegrationServerConfig walks through the /home/aceuser/initial-config directory
 // looking for directories (each containing some config data), then runs a shell script
 // called ace_config_{directory-name}.sh to process that data.
@@ -127,41 +108,32 @@ func initialIntegrationServerConfig() error {
 	for _, file := range fileList {
 		if file.IsDir() && file.Name() != "mqsc" && file.Name() != "workdir_overrides" {
 			log.Printf("Processing configuration in folder %v", file.Name())
-			if qmgr.UseQueueManager() {
-				out, _, err := command.RunAsUser("mqm", "ace_config_"+file.Name()+".sh")
+			if file.Name() == "webusers" {
+				log.Println("Configuring server.conf.yaml overrides - Webadmin")
+				updateServerConf := createSHAServerConfYaml()
+				if updateServerConf != nil {
+					log.Errorf("Error setting webadmin SHA server.conf.yaml: %v", updateServerConf)
+					return updateServerConf
+				}
+				log.Println("Configuring WebAdmin Users")
+				err := ConfigureWebAdminUsers(log)
+				if err != nil {
+					log.Errorf("Error configuring the WebAdmin users : %v", err)
+					return err
+				}
+			}
+			if file.Name() != "webusers" {
+				cmd := exec.Command("ace_config_" + file.Name() + ".sh")
+				out, _, err := command.RunCmd(cmd)
 				if err != nil {
 					log.LogDirect(out)
 					log.Errorf("Error processing configuration in folder %v: %v", file.Name(), err)
 					return err
 				}
 				log.LogDirect(out)
-			} else {
-				if file.Name() == "webusers" {
-					log.Println("Configuring server.conf.yaml overrides - Webadmin")
-					updateServerConf := createSHAServerConfYaml()
-					if updateServerConf != nil {
-						log.Errorf("Error setting webadmin SHA server.conf.yaml: %v", updateServerConf)
-						return updateServerConf
-					}
-					log.Println("Configuring WebAdmin Users")
-					err := ConfigureWebAdminUsers(log)
-					if err != nil {
-						log.Errorf("Error configuring the WebAdmin users : %v", err)
-						return err
-					}
-				}
-				if file.Name() != "webusers" {
-					cmd := exec.Command("ace_config_" + file.Name() + ".sh")
-					out, _, err := command.RunCmd(cmd)
-					if err != nil {
-						log.LogDirect(out)
-						log.Errorf("Error processing configuration in folder %v: %v", file.Name(), err)
-						return err
-					}
-					log.LogDirect(out)
-				}
 			}
 		}
+
 	}
 
 	enableMetrics := os.Getenv("ACE_ENABLE_METRICS")
@@ -465,13 +437,13 @@ func addOpenTracingToServerConf(serverconfContent []byte) ([]byte, error) {
 	}
 
 	if serverconfMap["UserExits"] != nil {
-		userExits := serverconfMap["UserExits"].(map[string]string)
+		userExits := serverconfMap["UserExits"].(map[interface{}]interface{})
 
 		userExits["activeUserExitList"] = "ACEOpenTracingUserExit"
 		userExits["userExitPath"] = "/opt/ACEOpenTracing"
 
 	} else {
-		serverconfMap["UserExits"] = map[string]string{
+		serverconfMap["UserExits"] = map[interface{}]interface{} {
 			"activeUserExitList": "ACEOpenTracingUserExit",
 			"userExitPath":       "/opt/ACEOpenTracing",
 		}
@@ -723,18 +695,6 @@ func startIntegrationServer() command.BackgroundCmd {
 		defaultAppName = serverName
 	}
 
-	if qmgr.UseQueueManager() {
-		qmgrName, err := name.GetQueueManagerName()
-		if err != nil {
-			log.Printf("Error getting queue manager name: %v", err)
-			returnErr := command.BackgroundCmd{}
-			returnErr.ReturnCode = -1
-			returnErr.ReturnError = err
-			return returnErr
-		}
-		return command.RunAsUserBackground("mqm", "ace_integration_server.sh", log, "-w", "/home/aceuser/ace-server", "--name", serverName, "--mq-queue-manager-name", qmgrName, "--log-output-format", logOutputFormat, "--console-log", "--default-application-name", defaultAppName)
-	}
-
 	thisUser, err := user.Current()
 	if err != nil {
 		log.Errorf("Error finding this user: %v", err)
@@ -749,26 +709,15 @@ func startIntegrationServer() command.BackgroundCmd {
 
 func waitForIntegrationServer() error {
 	for {
-		if qmgr.UseQueueManager() {
-			_, rc, err := command.RunAsUser("mqm", "chkaceready")
-			if rc != 0 || err != nil {
-				log.Printf("Integration server not ready yet")
-			}
-			if rc == 0 {
-				break
-			}
-			time.Sleep(5 * time.Second)
-		} else {
-			cmd := exec.Command("chkaceready")
-			_, rc, err := command.RunCmd(cmd)
-			if rc != 0 || err != nil {
-				log.Printf("Integration server not ready yet")
-			}
-			if rc == 0 {
-				break
-			}
-			time.Sleep(5 * time.Second)
+		cmd := exec.Command("chkaceready")
+		_, rc, err := command.RunCmd(cmd)
+		if rc != 0 || err != nil {
+			log.Printf("Integration server not ready yet")
+		}
+		if rc == 0 {
+			break
 		}
+		time.Sleep(5 * time.Second)
 	}
 	return nil
 }
@@ -781,33 +730,14 @@ func stopIntegrationServer(integrationServerProcess command.BackgroundCmd) {
 }
 
 func createWorkDir() error {
-	log.Printf("Checking if work dir is already initialized")
-	f, err := os.Open("/home/aceuser/ace-server")
+	log.Printf("Attempting to initialise /home/aceuser/ace-server")
+	cmd := exec.Command("/opt/ibm/ace-12/server/bin/mqsicreateworkdir", "/home/aceuser/ace-server")
+	_, _, err := command.RunCmd(cmd)
 	if err != nil {
-		log.Printf("Error reading /home/aceuser/ace-server")
+		log.Printf("Error initializing work dir")
 		return err
 	}
-
-	log.Printf("Checking for contents in the work dir")
-	_, err = f.Readdirnames(1)
-	if err != nil {
-		log.Printf("Work dir is not yet initialized - initializing now in /home/aceuser/ace-server")
-
-		if qmgr.UseQueueManager() {
-			_, _, err := command.RunAsUser("mqm", "/opt/ibm/ace-12/server/bin/mqsicreateworkdir", "/home/aceuser/ace-server")
-			if err != nil {
-				log.Printf("Error reading initializing work dir")
-				return err
-			}
-		} else {
-			cmd := exec.Command("/opt/ibm/ace-12/server/bin/mqsicreateworkdir", "/home/aceuser/ace-server")
-			_, _, err := command.RunCmd(cmd)
-			if err != nil {
-				log.Printf("Error reading initializing work dir")
-				return err
-			}
-		}
-	}
+	
 	log.Printf("Work dir initialization complete")
 	return nil
 }

cmd/chkaceready/main.go

@@ -1102,4 +1102,46 @@ iipaBg==
   os.Remove(certificateLocation)
   os.Remove(keystoreLocation)
 
+}
+
+
+
+var yamlOpenTracingTests = []struct {
+	in  string
+	out string
+}{
+	{ // User's blank yaml
+``,
+`UserExits:
+  activeUserExitList: ACEOpenTracingUserExit
+  userExitPath: /opt/ACEOpenTracing
+`},
+	{ // Do not alter as values provided
+`UserExits:
+  activeUserExitList: ACEOpenTracingUserExit
+  userExitPath: /opt/ACEOpenTracing`,
+`UserExits:
+  activeUserExitList: ACEOpenTracingUserExit
+  userExitPath: /opt/ACEOpenTracing
+`},
+  { // Check all values 
+`UserExits:
+  userExitPath: /opt/ACEOpenTracing`,
+`UserExits:
+  activeUserExitList: ACEOpenTracingUserExit
+  userExitPath: /opt/ACEOpenTracing
+`},
+}
+
+func TestAddOpenTracingToServerConf(t *testing.T) {
+	for _, table := range yamlOpenTracingTests {
+		out, err := addOpenTracingToServerConf([]byte(table.in))
+		if err != nil {
+			t.Error(err)
+		}
+		stringOut := string(out)
+		if stringOut != table.out {
+			t.Errorf("addOpenTracingToServerConf expected \n%v, got \n%v", table.out, stringOut)
+		}
+	}
 }