Skip to content

Support passwordless Azure SQL in VM offers #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 9, 2023
Merged

Support passwordless Azure SQL in VM offers #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5014416
support passwordless mssql connection in admin offer
galiacheng Feb 6, 2023
ff0d860
support passwordless mssql in cluster offer
galiacheng Feb 7, 2023
488ab0d
support passwordless mssql in dynamic cluster
galiacheng Feb 7, 2023
afc0912
enhance UI
galiacheng Feb 7, 2023
0d03c3a
fix sqlserver connections string (#1)
galiacheng Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.oracle.weblogic.azure</groupId>
<artifactId>arm-oraclelinux-wls-admin</artifactId>
<version>1.0.39</version>
<version>1.0.40</version>

<parent>
<groupId>com.microsoft.azure.iaas</groupId>
Expand Down
33 changes: 26 additions & 7 deletions weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
"value": "oracle"
},
{
"label": "Azure SQL",
"label": "Azure SQL (with support for passwordless connection)",
"value": "sqlserver"
},
{
Expand Down Expand Up @@ -1023,8 +1023,12 @@
"defaultValue": "",
"constraints": {
"required": true,
"regex": "^[a-z0-9A-Z/]{1,30}$",
"validationMessage": "The value must be 1-30 characters long and must only contain letters, numbers, and slashes (/)."
"validations": [
{
"regex": "^[a-z0-9A-Z/]{1,30}$",
"message": "The value must be 1-30 characters long and must only contain letters, numbers, and slashes (/)."
}
]
},
"visible": true
},
Expand Down Expand Up @@ -1052,6 +1056,14 @@
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), equals(steps('section_database').databaseConnectionInfo.databaseType, 'postgresql')), and(not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'authenticationPluginClassName')),not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'azure.clientId'))), 'true')]",
"message": "The offer will append authenticationPluginClassName with Azure provided plugins, and append azure.clientId with your managed identity client ID automatically, please do not specify them in your connection string."
},
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver')), and(not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'authentication=ActiveDirectoryMSI')),not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'msiClientId'))), 'true')]",
"message": "The offer will append authentication with ActiveDirectoryMSI, and append msiClientId with your managed identity client ID automatically, please do not specify them in your connection string."
},
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection0),equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver')), greater(length(steps('section_database').databaseConnectionInfo.dbIdentity.userAssignedIdentities),0), bool('true'))]",
"message": "You must select at least one managed identity that has access to your database."
}
]
},
Expand Down Expand Up @@ -1096,6 +1108,13 @@
},
"visible": true
},
{
"name": "enablePswlessConnection0",
"type": "Microsoft.Common.CheckBox",
"label": "Use passwordless datasource connection",
"toolTip": "Use passwordless datasource connection.",
"visible": "[and(bool(steps('section_database').enableDB),equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver'))]"
},
{
"name": "dbUser",
"type": "Microsoft.Common.TextBox",
Expand All @@ -1115,7 +1134,7 @@
}
]
},
"visible": true
"visible": "[and(bool(steps('section_database').enableDB), not(and(steps('section_database').databaseConnectionInfo.enablePswlessConnection0, equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver'))))]"
},
{
"name": "enablePswlessConnection",
Expand All @@ -1140,7 +1159,7 @@
"options": {
"hideConfirmation": false
},
"visible": "[and(bool(steps('section_database').enableDB), not(steps('section_database').databaseConnectionInfo.enablePswlessConnection))]"
"visible": "[and(bool(steps('section_database').enableDB), not(or(steps('section_database').databaseConnectionInfo.enablePswlessConnection, steps('section_database').databaseConnectionInfo.enablePswlessConnection0)))]"
},
{
"name": "dbIdentity",
Expand All @@ -1156,7 +1175,7 @@
"hideSystemAssignedIdentity": true,
"hideUserAssignedIdentity": false
},
"visible": "[and(bool(steps('section_database').enableDB), steps('section_database').databaseConnectionInfo.enablePswlessConnection)]"
"visible": "[and(bool(steps('section_database').enableDB), or(steps('section_database').databaseConnectionInfo.enablePswlessConnection, steps('section_database').databaseConnectionInfo.enablePswlessConnection0))]"
}
],
"visible": "[bool(steps('section_database').enableDB)]"
Expand Down Expand Up @@ -1511,7 +1530,7 @@
"enableDB": "[bool(steps('section_database').enableDB)]",
"enableCustomDNS": "[bool(steps('section_networkingConfiguration').enableCustomDNS)]",
"enableELK": "[bool(steps('section_elk').enableELK)]",
"enablePswlessConnection": "[bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection)]",
"enablePswlessConnection": "[or(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection0))]",
"hasDNSZones": "[bool(if(bool(steps('section_networkingConfiguration').enableCustomDNS), steps('section_networkingConfiguration').customDNSSettings.bringDNSZone, 'false'))]",
"jdbcDataSourceName": "[steps('section_database').databaseConnectionInfo.jdbcDataSourceName]",
"logsToIntegrate": "[steps('section_elk').elkInfo.logsToIntegrate]",
Expand Down
24 changes: 19 additions & 5 deletions ...c-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"wlsDomainName": {
"type": "string",
"defaultValue": "wlsd",
"defaultValue": "adminDomain",
"metadata": {
"description": "Provide Weblogic domain name"
}
Expand All @@ -91,15 +91,28 @@
}
},
"variables": {
"const_connectionString": "[if(and(equals(parameters('databaseType'),'sqlserver'), equals(last(parameters('dsConnectionURL')),';')), take(parameters('dsConnectionURL'), add(length(parameters('dsConnectionURL')),-1)),parameters('dsConnectionURL'))]",
"const_identityAPIVersion": "${azure.apiVersionForIndentity}",
"const_msiDefaultUser": "msiUser",
"name_appendIdentityTemplate": "_appendUserManagedIdentity.json",
"name_installJdbcLibsTemplate": "_installJdbcLibsTemplate.json",
"name_dbTemplate": "_dbTemplate.json",
"array_msiClientId": {
"mysql": "azure.clientId",
"postgresql": "azure.clientId",
"sqlserver": "msiClientId"
},
"array_azureJdbcPlugins": {
"mysql": "defaultAuthenticationPlugin=com.azure.identity.extensions.jdbc.mysql.AzureMysqlAuthenticationPlugin&authenticationPlugins=com.azure.identity.extensions.jdbc.mysql.AzureMysqlAuthenticationPlugin",
"postgresql": "authenticationPluginClassName=com.azure.identity.extensions.jdbc.postgresql.AzurePostgresqlAuthenticationPlugin"
"postgresql": "authenticationPluginClassName=com.azure.identity.extensions.jdbc.postgresql.AzurePostgresqlAuthenticationPlugin",
"sqlserver": "authentication=ActiveDirectoryMSI"
},
"array_urlJoiner": {
"mysql": "&",
"postgresql": "&",
"sqlserver": ";"
},
"obj_dbIdentity": {
"obj_dbIdentity": {
"[items(parameters('dbIdentity').userAssignedIdentities)[0].key]": {}
},
"obj_empty": {}
Expand Down Expand Up @@ -148,6 +161,7 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersion}",
"name": "installJdbcLibsTemplate",
"condition": "[or(equals(parameters('databaseType'),'mysql'), equals(parameters('databaseType'),'postgresql'))]",
"dependsOn": [
"assignDbIdentityToAdminVM"
],
Expand Down Expand Up @@ -218,10 +232,10 @@
"value": "[parameters('dbGlobalTranPro')]"
},
"dsConnectionURL": {
"value": "[uri(format('{0}&{1}&azure.clientId={2}', parameters('dsConnectionURL'), variables('array_azureJdbcPlugins')[parameters('databaseType')], reference(items(parameters('dbIdentity').userAssignedIdentities)[0].key,variables('const_identityAPIVersion'), 'full').properties.clientId), '')]"
"value": "[uri(format('{0}{4}{1}{4}{2}={3}', variables('const_connectionString'), variables('array_azureJdbcPlugins')[parameters('databaseType')], variables('array_msiClientId')[parameters('databaseType')], reference(items(parameters('dbIdentity').userAssignedIdentities)[0].key,variables('const_identityAPIVersion'), 'full').properties.clientId, variables('array_urlJoiner')[parameters('databaseType')]), '')]"
},
"dbUser": {
"value": "[parameters('dbUser')]"
"value": "[if(equals(parameters('databaseType'), 'sqlserver'), variables('const_msiDefaultUser'), parameters('dbUser'))]"
},
"enablePswlessConnection": {
"value": true
Expand Down
3 changes: 2 additions & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ function validateInput()
exit 1
fi

# reset password
# reset password and user
if [[ "${enablePswlessConnection,,}" == "true" ]]; then
dsPassword=""
dsUser=""
fi
}

Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/installJdbcDrivers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ read oracleHome domainPath wlsServerName wlsAdminHost wlsAdminPort wlsUserName w
export curlMaxTime=120 # seconds
export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
export mvnVersion="3.8.6"
export mvnVersion="3.9.0"
export mvnInstaller="apache-maven-${mvnVersion}-bin.tar.gz"
export retryMaxAttempt=5 # retry attempt for curl command
export url4MavenInstaller="https://dlcdn.apache.org/maven/maven-3/${mvnVersion}/binaries/${mvnInstaller}"
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.oracle.weblogic.azure</groupId>
<artifactId>arm-oraclelinux-wls-cluster</artifactId>
<version>1.0.51000</version>
<version>1.0.52000</version>

<parent>
<groupId>com.microsoft.azure.iaas</groupId>
Expand Down
33 changes: 26 additions & 7 deletions ...-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@
"value": "oracle"
},
{
"label": "Azure SQL",
"label": "Azure SQL (with support for passwordless connection)",
"value": "sqlserver"
},
{
Expand Down Expand Up @@ -1352,8 +1352,12 @@
"defaultValue": "",
"constraints": {
"required": true,
"regex": "^[a-z0-9A-Z/]{1,30}$",
"validationMessage": "The value must be 1-30 characters long and must only contain letters, numbers, and slashes (/)."
"validations": [
{
"regex": "^[a-z0-9A-Z/]{1,30}$",
"message": "The value must be 1-30 characters long and must only contain letters, numbers, and slashes (/)."
}
]
},
"visible": true
},
Expand Down Expand Up @@ -1381,6 +1385,14 @@
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), equals(steps('section_database').databaseConnectionInfo.databaseType, 'postgresql')), and(not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'authenticationPluginClassName')),not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'azure.clientId'))), 'true')]",
"message": "The offer will append authenticationPluginClassName with Azure provided plugins, and append azure.clientId with your managed identity client ID automatically, please do not specify them in your connection string."
},
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver')), and(not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'authentication=ActiveDirectoryMSI')),not(contains(steps('section_database').databaseConnectionInfo.dsConnectionURL, 'msiClientId'))), 'true')]",
"message": "The offer will append authentication with ActiveDirectoryMSI, and append msiClientId with your managed identity client ID automatically, please do not specify them in your connection string."
},
{
"isValid": "[if(and(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection0),equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver')), greater(length(steps('section_database').databaseConnectionInfo.dbIdentity.userAssignedIdentities),0), bool('true'))]",
"message": "You must select at least one managed identity that has access to your database."
}
]
},
Expand Down Expand Up @@ -1425,6 +1437,13 @@
},
"visible": true
},
{
"name": "enablePswlessConnection0",
"type": "Microsoft.Common.CheckBox",
"label": "Use passwordless datasource connection",
"toolTip": "Use passwordless datasource connection.",
"visible": "[and(bool(steps('section_database').enableDB),equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver'))]"
},
{
"name": "dbUser",
"type": "Microsoft.Common.TextBox",
Expand All @@ -1444,7 +1463,7 @@
}
]
},
"visible": true
"visible": "[and(bool(steps('section_database').enableDB), not(and(steps('section_database').databaseConnectionInfo.enablePswlessConnection0, equals(steps('section_database').databaseConnectionInfo.databaseType, 'sqlserver'))))]"
},
{
"name": "enablePswlessConnection",
Expand All @@ -1469,7 +1488,7 @@
"options": {
"hideConfirmation": false
},
"visible": "[and(bool(steps('section_database').enableDB), not(steps('section_database').databaseConnectionInfo.enablePswlessConnection))]"
"visible": "[and(bool(steps('section_database').enableDB), not(or(steps('section_database').databaseConnectionInfo.enablePswlessConnection, steps('section_database').databaseConnectionInfo.enablePswlessConnection0)))]"
},
{
"name": "dbIdentity",
Expand All @@ -1485,7 +1504,7 @@
"hideSystemAssignedIdentity": true,
"hideUserAssignedIdentity": false
},
"visible": "[and(bool(steps('section_database').enableDB), steps('section_database').databaseConnectionInfo.enablePswlessConnection)]"
"visible": "[and(bool(steps('section_database').enableDB), or(steps('section_database').databaseConnectionInfo.enablePswlessConnection, steps('section_database').databaseConnectionInfo.enablePswlessConnection0))]"
}
],
"visible": "[bool(steps('section_database').enableDB)]"
Expand Down Expand Up @@ -1958,7 +1977,7 @@
"enableCookieBasedAffinity": "[bool(steps('section_appGateway').enableCookieBasedAffinity)]",
"enableDNSConfiguration": "[bool(steps('section_networkingConfiguration').enableCustomDNS)]",
"enableELK": "[bool(steps('section_elk').enableELK)]",
"enablePswlessConnection": "[bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection)]",
"enablePswlessConnection": "[or(bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection), bool(steps('section_database').databaseConnectionInfo.enablePswlessConnection0))]",
"hasDNSZones": "[bool(if(bool(steps('section_networkingConfiguration').enableCustomDNS), steps('section_networkingConfiguration').customDNSSettings.bringDNSZone, 'false'))]",
"jdbcDataSourceName": "[steps('section_database').databaseConnectionInfo.jdbcDataSourceName]",
"logsToIntegrate": "[steps('section_elk').elkInfo.logsToIntegrate]",
Expand Down
Loading