From fd7f0002e7eb1d084013ec5e0eeec75c2fa3ae7f Mon Sep 17 00:00:00 2001
From: Ed Burns <edburns@microsoft.com>
Date: Wed, 31 May 2023 20:48:26 -0400
Subject: [PATCH 1/3] On branch
 edburns-msft-ibm-315-update-ihsAndbaseImageVersions modified:   pom.xml
 modified:   src/main/bicep/config.json

Signed-off-by: Ed Burns <edburns@microsoft.com>
---
 pom.xml                    | 2 +-
 src/main/bicep/config.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e824901..45e0f6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>com.ibm.websphere.azure</groupId>
     <artifactId>azure.websphere-traditional.cluster</artifactId>
-    <version>1.3.49</version>
+    <version>1.3.50</version>
 
     <!-- mvn -Pbicep -Passembly clean install -Ptemplate-validation-tests -->
     <parent>
diff --git a/src/main/bicep/config.json b/src/main/bicep/config.json
index 1a7e11b..cf10883 100644
--- a/src/main/bicep/config.json
+++ b/src/main/bicep/config.json
@@ -14,13 +14,13 @@
     "twasNdImageSkuDescription": "This is the twas-nd 'Plan ID' of the plan within the 'Azure Virtual Machine' offer",
     "twasNdImageSku": "2023-03-27-twas-cluster-base-image",
     "twasNdImageVersionDescription": "This is the twas-nd 'Disk version' of the VM image of the plan within the 'Azure Virtual Machine' offer",
-    "twasNdImageVersion": "9.0.20230504",
+    "twasNdImageVersion": "9.0.20230517",
     "ihsImageOfferDescription": "This is the ihs 'Offer ID' of the 'Azure Virtual Machine' offer type",
     "ihsImageOffer": "2023-03-27-ihs-base-image",
     "ihsImageSkuDescription": "This is the ihs 'Plan ID' of the plan within the 'Azure Virtual Machine' offer",
     "ihsImageSku": "2023-03-27-ihs-base-image",
     "ihsImageVersionDescription": "This is the ihs 'Disk version' of the VM image of the plan within the 'Azure Virtual Machine' offer",
-    "ihsImageVersion": "9.0.20230501",
+    "ihsImageVersion": "9.0.20230519",
     "shareCompanyNamePid": "f246c770-92c5-5a97-b5d6-83feac7623d3",
     "dbConnectionStart": "60786fb4-17a7-5e2e-b2bd-13271b71ba2a",
     "dbConnectionEnd": "6c61bea8-afa4-5ee8-8a2d-866928685625",

From 3bdbe15de844c9579c813b7c4ff9caa691b24532 Mon Sep 17 00:00:00 2001
From: Jianguo Ma <jiangma@microsoft.com>
Date: Thu, 1 Jun 2023 12:11:33 +0800
Subject: [PATCH 2/3] identity nsg for twas cluster

Signed-off-by: Jianguo Ma <jiangma@microsoft.com>
---
 .github/workflows/integration-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 8ca968d..5b4a56d 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -294,7 +294,7 @@ jobs:
           fi
       - name: Install and verify websphere-cafe
         run: |
-          nsgName=$(az network nsg list -g ${testResourceGroup} --query [0].name -o tsv)
+          nsgName=$(az network nsg list -g ${testResourceGroup} --query "[?contains(name, '-nsg')].name" -o tsv)
           publicIp=$(az vm list -g ${testResourceGroup} -d --query "[?contains(name, 'dmgr')].publicIps" -o tsv)
           vmName=$(az vm list -g ${testResourceGroup} --query "[?contains(name, 'dmgr')].name" -o tsv)
           # Open port 22 in the nsg

From 3f3239bfc9e8632682a47cdab7db0b537e3cfdb0 Mon Sep 17 00:00:00 2001
From: Jianguo Ma <jiangma@microsoft.com>
Date: Thu, 1 Jun 2023 12:12:08 +0800
Subject: [PATCH 3/3] only explicitely disable line wrapping for non MacOS

Signed-off-by: Jianguo Ma <jiangma@microsoft.com>
---
 .github/workflows/setup-credentials.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/setup-credentials.sh b/.github/workflows/setup-credentials.sh
index 51204be..37af7d2 100755
--- a/.github/workflows/setup-credentials.sh
+++ b/.github/workflows/setup-credentials.sh
@@ -166,7 +166,12 @@ USE_GITHUB_CLI=false
 # Create service principal with Contributor role in the subscription
 msg "${GREEN}(3/4) Create service principal ${SERVICE_PRINCIPAL_NAME}"
 SUBSCRIPTION_ID=$(az account show --query id --output tsv --only-show-errors)
-SERVICE_PRINCIPAL=$(az ad sp create-for-rbac --name ${SERVICE_PRINCIPAL_NAME} --role="Contributor" --scopes="/subscriptions/${SUBSCRIPTION_ID}" --sdk-auth --only-show-errors | base64 -w0)
+# Explicitely disable line wrapping for non MacOS 
+w0=-w0
+if [[ $OSTYPE == 'darwin'* ]]; then
+  w0=
+fi
+SERVICE_PRINCIPAL=$(az ad sp create-for-rbac --name ${SERVICE_PRINCIPAL_NAME} --role="Contributor" --scopes="/subscriptions/${SUBSCRIPTION_ID}" --sdk-auth --only-show-errors | base64 $w0)
 msg "${YELLOW}\"DISAMBIG_PREFIX\""
 msg "${GREEN}${DISAMBIG_PREFIX}"