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
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}"
diff --git a/pom.xml b/pom.xml
index e824901..45e0f6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
com.ibm.websphere.azure
azure.websphere-traditional.cluster
- 1.3.49
+ 1.3.50
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",