Support re-deployment in the same resource group and remove external key vault integration for admin offer (#340)

* update API version of Microsoft.Storage/storageAccounts.

* remove external key vault integration.

* remove external key vault support.

* Unreferenced variable: const_currentSubscription.

* fix json syntax

* parameterize location in integration test.

* rename the postgresql firewall rule.

* debug pipeline.

* add global unique suffix to resource name.

* remove aad and elk related scripts.

* remove elk from admin integration pipeline.

* output admin vm name.

* query admin vm name after deployment in the admin integration pipeline.

* Unreferenced parameter: _globalResourceNameSuffix Line: 18, Column: 10

* remove aad parameter from the test scripts.

* parameterize file share name.

* define nsg name in the main template.

* generate unique vnet default name.

* query nsg name dynamically.

* output admin vm name as env variables.

* use `az vm run-command create` to execute test script.

* no need to verify WLS installation, this is done while buiding base image.

* use `az vm run-command invoke` to run test script.

* verify-wls-path.sh has been removed.

* fix pipeline error "Error: Process completed with exit code 1."

* upgrade db driver version.

* fix db connection string joiner.

* update the script for new azure-identity-extension.

* add step to query public IP of AdminServer VM in workflow.

* bump version of arm-oraclelinux-wls-admin to 1.0.56

* add network security group configuration step to workflow

* update connection string joiner to use variables instead of parameters

* deploy db in the main deployment.

* remove post deployment - db.

* use unique vnet default name.

* revert debug settings.

* add array_paramJoiner for database connection string formatting.

---------

Co-authored-by: Ed Burns <[email protected]>

Author: galiacheng

.github/actions/createPostgresqlFlexibleServer/action.yml

@@ -57,6 +57,6 @@ runs:
           az postgres flexible-server firewall-rule create \
             -g ${{ inputs.resourceGroupName }} \
             -n ${{ inputs.dbName }} \
-            -r "AllowAllWindowsAzureIps" \
+            -r "AllowAllAzureServices" \
             --start-ip-address "0.0.0.0" \
             --end-ip-address "0.0.0.0"

.github/workflows/testWlsVmAdmin.yml

@@ -43,7 +43,7 @@
         <version.wls-on-aks-azure-marketplace>1.0.87</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
         <version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
-        <version.arm-oraclelinux-wls-admin>1.0.55</version.arm-oraclelinux-wls-admin>
+        <version.arm-oraclelinux-wls-admin>1.0.56</version.arm-oraclelinux-wls-admin>
         <version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
         <version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
         <!--  node versions  -->

pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity-extensions</artifactId>
-            <version>1.0.0</version>
+            <version>1.2.0</version>
         </dependency>
     </dependencies>
 </project>

weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- mvn dependency:copy-dependencies -f azure-identity-provider-jdbc-mysql.xml -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.oracle.weblogic.azure</groupId>
     <artifactId>mysql-driver</artifactId>
@@ -12,11 +13,12 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.31</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>9.2.0</version>
         </dependency>
+
     </dependencies>
 </project>

weblogic-azure-aks/src/main/resources/mysql-connector-java.xml

@@ -2,15 +2,6 @@
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-     "aadsPortNumber": {
-        "value": "GEN-UNIQUE"
-     },
-     "aadsPublicIP": {
-        "value": "GEN-UNIQUE"
-     },
-     "aadsServerHost": {
-        "value": "GEN-UNIQUE"
-     },
      "adminPasswordOrKey": {
         "value": "GEN-SSH-PUB-KEY"
      },
@@ -38,9 +29,6 @@
      "dsUser": {
         "value": "GEN-UNIQUE"
      },
-     "enableAAD": {
-        "value": "GEN-UNIQUE"
-     },
      "enableDB": {
         "value": "GEN-UNIQUE"
      },
@@ -53,24 +41,6 @@
      "wlsDomainName": {
         "value": "GEN-UNIQUE"
      },
-     "wlsLDAPProviderName": {
-        "value": "GEN-UNIQUE"
-     },
-     "wlsLDAPPrincipal": {
-        "value": "GEN-UNIQUE"
-     },
-     "wlsLDAPPrincipalPassword": {
-        "value": "GEN-UNIQUE"
-     },
-     "wlsLDAPUserBaseDN": {
-        "value": "GEN-UNIQUE"
-     },
-     "wlsLDAPGroupBaseDN": {
-        "value": "GEN-UNIQUE"
-     },
-     "wlsLDAPSSLCertificate": {
-        "value": "GEN-UNIQUE"
-     },
      "wlsPassword": {
         "value": "GEN-PASSWORD"
      },