Merge pull request #175 from ot4i/12.0.3.0-r1

12.0.3.0-r1 update

Author: domstorey

ApplyIFixes.sh

@@ -1,36 +1,38 @@
 #!/bin/bash
 
-#Check if any iFix's are to be applied.
+# Check if any iFix's are to be applied.
 
 if [ -z $1 ]; then
   echo "No iFix's being used skipping this phase."
-  exit 0 #No iFix specified
-else #Create array of iFix's to loop through by removing commas from input.
+  exit 0 # No iFix specified
+else # Create array of iFix's to loop through by removing commas from input.
   IFIX_LIST_ARRAY=$(echo $1 | tr ',' ' ')
   echo "iFix's being applied: ${IFIX_LIST_ARRAY}"
 fi
 
-for ifixlink in $IFIX_LIST_ARRAY  
+for ifixlink in $IFIX_LIST_ARRAY
 do
-  #Make temporary fix directory
-  mkdir ./fix 
-  cd fix 
-  
-  #Download and unzip iFix tar file.
+  # Make temporary fix directory
+  mkdir ./fix
+  cd fix
+
+  # Download and unzip iFix tar file.
   curl -Ls $ifixlink | tar -xz
-  
-  #Execute install command
+
+  # Execute install command
   ifixname="${ifixlink##*/}"
-  ifixname="${ifixname%.tar*}" 
-  
+  ifixname="${ifixname%.tar*}"
+
   ./mqsifixinst.sh /opt/ibm/ace-12 install $ifixname
-  
-  #Delete directory
+
+  # Delete directory
   cd ..
   rm -rf ./fix
-  
+
   rm -rf /opt/ibm/ace-12/fix-backups.12.0.1.0
   rm /opt/ibm/ace-12/mqsifixinst.log
   rm /opt/ibm/ace-12/mqsifixinst.sh
-  
+
+  # We explicitly screen out /tools and TransformationAdvisor, so let's make sure to clean up after any iFixes that put them back
+  rm -rf /opt/ibm/ace-12/tools /opt/ibm/ace-12/server/bin/TADataCollector.sh /opt/ibm/ace-12/server/transformationAdvisor
 done

CHANGELOG.md

@@ -1,31 +1,39 @@
 # Change log
 
+## 12.0.3.0-r2
+
+**Updates**
+
+* Improved the logging for metrics when authentication is not enabled
+* Includes IT39515
+* Includes IT39573
+
+## 12.0.3.0-r1
+
+**Updates**
+
+* Fix bug with capitlisation on "insecureSsl" for barAuth json
+
 ## 11.0.0.6.1 (2019-11-20)
 
-**Breaking changes**:
-* None
+**Updates**:
 
-**Other changes**:
 * Updated kubectl to version v1.16.0
 * Updated MQ to version 9.1.3.0-r3
 * Added support for hostname and port overrides when routes are defined
 * Created ACE roles for five different access levels: admin, operator, viewer, editor, and audit
 
 ## 11.0.0.6 (2019-10-30)
 
-**Breaking changes**:
-* None
+**Changes**:
 
-**Other changes**:
 * Updated to use the 11.0.0.6 build
 * Support metrics when Integration Server is using TLS
 
 ## 11.0.0.5.1 (2019-09-24)
 
-**Breaking changes**:
-* None
+**Updates**:
 
-**Other changes**:
 * New image that includes an MQ client
 * Supports MQ 9.1.3 images
 * Support for defining custom ports
@@ -36,10 +44,12 @@
 ## 11.0.0.5 (2019-07-05)
 
 **Breaking changes**:
+
 * When using MQ, the UID of the mqm user is now 888.  You need to run the container with an entrypoint of `runmqserver -i` under the root user to update any existing files.
 * MQSC files supplied will be verified before being run. Files containing invalid MQSC will cause the container to fail to start
 
-**Other changes**:
+**Updates**:
+
 * Security fixes
 * Web console added to production image
 * Container built on RedHat host (UBI)
@@ -49,20 +59,16 @@
 
 ## 11.0.0.3 (2019-02-04)
 
-**Breaking changes**:
-NONE
-
 **Other changes**:
+
 * Provides samples for building image with MQ Client
 * Code to generate RHEL based images
 * Fix for overriding the hostname and port for RestAPI in the UI / Swagger Docs.
 
 ## 11.0.0.2 (2018-11-20)
 
-**Breaking changes**:
-NONE
+**Updates**:
 
-**Other changes**:
 * Updated to support 11.0.0.2 runtime
 * Updated to support ICP platform
 

README.md

@@ -100,9 +100,13 @@ Update the Dockerfile such that
 - IFIX_TAR is the name of the iFix download file. This must be located in the same directory as the Dockerfile
 - USER must be updated to match the ID of the ace user
 
-To build the image use a command such as the following `docker build -f Dockerfile  --tag myregistry.com/ace/ace-server-prod:12.0.2.0-ACE-LinuxX64-TFIT38649 .`
+To build the image use a command such as the following:
 
-The resulting image should then be used using the same options as the original base image
+```bash
+docker build -f Dockerfile  --tag myregistry.com/ace/ace-server-prod:12.0.2.0-ACE-LinuxX64-TFIT38649 .
+```
+
+The resulting inage should then be used using the same options as the original base image
 
 ## Usage
 

git.commit

@@ -0,0 +1 @@
+UPDATEME

internal/configuration/configuration.go

@@ -542,8 +542,8 @@ func downloadBASIC_AUTH(log logger.LoggerInterface, basedir string, barAuthParse
 	}
 
 	var tr *http.Transport
-	// Allow insecure if InsecureSsl is set
-	if (barAuthParsed.Path("credentials.InsecureSsl").Data() != nil) && (barAuthParsed.Path("credentials.InsecureSsl").Data().(string) == "true") {
+	// Allow insecure if insecureSsl is set
+	if (barAuthParsed.Path("credentials.insecureSsl").Data() != nil) && (barAuthParsed.Path("credentials.insecureSsl").Data().(string) == "true") {
 		tr = &http.Transport{
 			MaxIdleConns:       10,
 			IdleConnTimeout:    30 * time.Second,
@@ -553,7 +553,7 @@ func downloadBASIC_AUTH(log logger.LoggerInterface, basedir string, barAuthParse
 				RootCAs:            rootCAs,
 			},
 		}
-		log.Println("InsecureSsl set so accepting/ignoring all server SSL certificates ")
+		log.Println("insecureSsl set so accepting/ignoring all server SSL certificates ")
 	} else {
 		tr = &http.Transport{
 			MaxIdleConns:       10,

internal/configuration/techConnectorsConfiguration.go

@@ -227,9 +227,10 @@ var buildJDBCPolicies = func(log logger.LoggerInterface, basedir string, jdbcAcc
 	var supportedDBs = map[string]string{
 		"IBM Db2 Linux, UNIX, or Windows (LUW) - client managed": "db2luw",
 		"IBM Db2 Linux, UNIX, or Windows (LUW) - IBM Cloud":      "db2cloud",
-		"IBM Db2 for i": "db2i",
-		"Oracle":        "oracle",
-		"PostgreSQL":    "postgresql",
+		"IBM Db2 for i":        "db2i",
+		"Oracle":               "oracle",
+		"PostgreSQL":           "postgresql",
+		"Microsoft SQL Server": "sqlserver",
 	}
 
 	policyDirName := basedir + string(os.PathSeparator) + workdirName + string(os.PathSeparator) + "overrides" + string(os.PathSeparator) + "gen.jdbcConnectorPolicies"
@@ -373,27 +374,50 @@ func getJDBCPolicyAttributes(log logger.LoggerInterface, dbType, hostname, port,
 	var err error
 	switch dbType {
 	case "db2luw", "db2cloud":
-		jdbcURL = "jdbc:db2://" + hostname + ":" + port + "/" + dbName + ":user=[user];password=[password];loginTimeout=40"
+		jdbcURL = "jdbc:db2://" + hostname + ":" + port + "/" + dbName + ":user=[user];password=[password]"
 		jdbcClassName = classNames["DB2NativeDriverClassName"]
 		jdbcType4DataSourceName = classNames["DB2NativeDataSourceClassName"]
 		endDemiliter = ";"
 	case "db2i":
-		jdbcURL = "jdbc:ibmappconnect:db2://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password];loginTimeout=40"
+		jdbcURL = "jdbc:ibmappconnect:db2://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password]"
 		jdbcClassName = classNames["DB2DriverClassName"]
 		jdbcType4DataSourceName = classNames["DB2DataSourceClassName"]
 	case "oracle":
-		jdbcURL = "jdbc:ibmappconnect:oracle://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password];loginTimeout=40;FetchDateAsTimestamp=false"
+		jdbcURL = "jdbc:ibmappconnect:oracle://" + hostname + ":" + port + ";user=[user];password=[password]"
+
+		if !strings.Contains(strings.ToLower(additonalParams), "servicename=") && !strings.Contains(strings.ToLower(additonalParams), "sid=") {
+			jdbcURL = jdbcURL + ";DatabaseName=" + dbName
+		}
+
+		if !strings.Contains(strings.ToLower(additonalParams), "fetchdateastimestamp=") {
+			jdbcURL = jdbcURL + ";FetchDateAsTimestamp=false"
+		}
+
 		jdbcClassName = classNames["OracleDriverClassName"]
 		jdbcType4DataSourceName = classNames["OracleDataSourceClassName"]
+	case "sqlserver":
+		jdbcURL = "jdbc:ibmappconnect:sqlserver://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password]"
+
+		if !strings.Contains(strings.ToLower(additonalParams), "authenticationmethod=") {
+			jdbcURL = jdbcURL + ";AuthenticationMethod=userIdPassword"
+		}
+
+		jdbcClassName = classNames["SqlServerDriverClassName"]
+		jdbcType4DataSourceName = classNames["SqlServerDataSourceClassName"]
 	case "postgresql":
-		jdbcURL = "jdbc:ibmappconnect:postgresql://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password];loginTimeout=40"
+		jdbcURL = "jdbc:ibmappconnect:postgresql://" + hostname + ":" + port + ";DatabaseName=" + dbName + ";user=[user];password=[password]"
 		jdbcClassName = classNames["PostgresDriveClassName"]
 		jdbcType4DataSourceName = classNames["PostgresDataSourceClassName"]
 	default:
 		err = errors.New("Unsupported database type: " + dbType)
 		return nil, err
 	}
 
+	// default timeout
+	if !strings.Contains(strings.ToLower(additonalParams), "logintimeout=") {
+		jdbcURL = jdbcURL + ";loginTimeout=40"
+	}
+
 	if additonalParams != "" {
 		jdbcURL = jdbcURL + ";" + additonalParams
 	}