Use postgresql flexible server

.github/actions/createPostgresqlFlexibleServer/action.yml

@@ -0,0 +1,62 @@
+name: Create PostgreSQL Flexible Server
+description: Create  PostgreSQL Flexible Server that allows access from Azure services.
+inputs:
+  dbAdminUser:
+    description: "Database Admin User"
+    required: true
+  dbName:
+    description: "Database Name"
+    required: true
+  dbPassword:
+    description: "Database Password"
+    required: true
+  dbServerName:
+    description: "Database Server Name"
+    required: true
+  location:
+    description: "Location"
+    required: true
+  resourceGroupName:
+    description: "Resource Group Name"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v2.3.4
+    - name: Set azCliVersion
+      uses: ./.github/actions/setvars
+      with:
+        varFilePath: ./.github/variables/vm-dependencies.env
+    - name: Set Up Azure Postgresql that allows access from Azure services
+      id: setup-postgresql
+      uses: azure/CLI@v1
+      with:
+        azcliversion: ${{ env.azCliVersion }}
+        inlineScript: |
+          echo "Deploy DB with name " ${{ inputs.dbName }}
+          az postgres flexible-server create \
+            --resource-group ${{ inputs.resourceGroupName }} \
+            --name ${{ inputs.dbName }} \
+            --location ${{ inputs.location }} \
+            --admin-user ${{ inputs.dbAdminUser }} \
+            --admin-password ${{ inputs.dbPassword }} \
+            --version 16 \
+            --public-access 0.0.0.0 \
+            --tier Burstable \
+            --sku-name Standard_B1ms \
+            --yes
+
+          az postgres flexible-server db create \
+            --resource-group ${{ inputs.resourceGroupName }} \
+            --server-name ${{ inputs.dbName }} \
+            --database-name ${{ inputs.dbServerName }}
+
+          sleep 1m
+          echo "Allow Access To Azure Services"
+          az postgres flexible-server firewall-rule create \
+            -g ${{ inputs.resourceGroupName }} \
+            -n ${{ inputs.dbName }} \
+            -r "AllowAllWindowsAzureIps" \
+            --start-ip-address "0.0.0.0" \
+            --end-ip-address "0.0.0.0"

.github/actions/setvars/action.yml

@@ -9,5 +9,5 @@ runs:
   using: "composite"
   steps:
     - run: |
-        sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV
+        sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV       
       shell: bash

.github/variables/vm-dependencies.env

@@ -1 +1,2 @@
 refArmttk=6b75cb7a3f65234995a2019fcae20a9b2c2d8635
+azCliVersion=2.60.0

.github/workflows/setupWlsAksDependency.yml

@@ -13,34 +13,22 @@ env:
     dbAdminUser: weblogic
     dbPassword: ${{ secrets.DB_PASSWORD }}
     dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
+    dbServerName: weblogicdb
     resourceGroupForDB: wlsd-db-${{ github.run_id }}-${{ github.run_number }}
     resourceGroupForStorageAccount: wlsd-sa-${{ github.run_id }}-${{ github.run_number }}
     storageAccountName: wlsdsa${{ github.run_id }}${{ github.run_number }}
     storageContainerName: wlsdcon${{ github.run_id }}${{ github.run_number }}
 
 jobs:
-    preflight:
-        outputs: 
-          azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
-        runs-on: ubuntu-latest
-        steps:
-            - name: Get versions of external dependencies
-              id: get-external-dependencies-version
-              run: |
-                curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
-                source external-deps-versions.properties
-                echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
-            - name: Set up JDK 1.8
-              uses: actions/setup-java@v1
-              with:
-                java-version: 1.8
     deploy-db:
-        needs: preflight
         runs-on: ubuntu-latest
         steps:
-            - name: Get AZ CLI Version
-              run: |
-                echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
+            - uses: actions/checkout@v2.3.4
+            - name: Set AZ CLI Version
+              id: set-az-cli-version
+              uses: ./.github/actions/setvars
+              with:
+                varFilePath: ./.github/variables/vm-dependencies.env
             - uses: azure/login@v1
               id: azure-login
               with:
@@ -52,36 +40,26 @@ jobs:
                 inlineScript: |
                     echo "create resource group" ${{ env.resourceGroupForDB }}
                     az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }}
-            - name: Set Up Azure Postgresql to Test dbTemplate
-              id: setup-postgresql
-              uses: azure/CLI@v1
+
+            - uses: actions/checkout@v2.3.4
+            - name: Set up PostgreSQL Flexible Server that allows access from Azure services
+              uses: ./.github/actions/createPostgresqlFlexibleServer
               with:
-                azcliversion: ${{ env.azCliVersion }}
-                inlineScript: |
-                    echo "Deploy DB with name " ${{ env.dbName }}
-                    az postgres server create \
-                    --resource-group ${{ env.resourceGroupForDB }} \
-                    --name ${{ env.dbName }}  \
-                    --location ${{ env.location }} \
-                    --admin-user ${{ env.dbAdminUser }} \
-                    --ssl-enforcement Enabled \
-                    --public-network-access Enabled \
-                    --admin-password ${{ env.dbPassword }} \
-                    --sku-name B_Gen5_1
-                    echo "Allow Access To Azure Services"
-                    az postgres server firewall-rule create \
-                    -g ${{ env.resourceGroupForDB }} \
-                    -s ${{ env.dbName }} \
-                    -n "AllowAllWindowsAzureIps" \
-                    --start-ip-address "0.0.0.0" \
-                    --end-ip-address "0.0.0.0"
+                dbAdminUser: ${{ env.dbAdminUser }}
+                dbName: ${{ env.dbName }}
+                dbPassword: ${{ env.dbPassword }}
+                dbServerName: ${{ env.dbServerName }}
+                location: ${{ env.location }}
+                resourceGroupName: ${{ env.resourceGroupForDB }}
     deploy-storage-account:
-        needs: preflight
         runs-on: ubuntu-latest
         steps:
-            - name: Get AZ CLI Version
-              run: |
-                echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
+            - uses: actions/checkout@v2.3.4
+            - name: Set AZ CLI Version
+              id: set-az-cli-version
+              uses: ./.github/actions/setvars
+              with:
+                varFilePath: ./.github/variables/vm-dependencies.env
             - uses: azure/login@v1
               id: azure-login
               with:

.github/workflows/testWlsAksWithDependencyCreation.yml

@@ -27,6 +27,7 @@ env:
     dbAdminUser: weblogic
     dbPassword: ${{ secrets.DB_PASSWORD }}
     dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
+    dbServerName: weblogicdb
     ocrSSOPSW: ${{ secrets.ORC_SSOPSW }}
     ocrSSOUser: ${{ secrets.ORC_SSOUSER }}
     wdtRuntimePassword: ${{ secrets.WDT_RUNTIMEPSW}}
@@ -44,18 +45,25 @@ jobs:
           isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }}
           gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }}
           testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }}
-          azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
+          azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}}
         runs-on: ubuntu-latest
         steps:
+            - uses: actions/checkout@v2.3.4
+            - name: Set AZ CLI Version and save in variable azCliVersion              
+              uses: ./.github/actions/setvars
+              with:
+                varFilePath: ./.github/variables/vm-dependencies.env
+            - name: Output Az CLi version
+              id: set-az-cli-version
+              run: |
+                echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT
             - name: Get versions of external dependencies
               id: get-external-dependencies-version
               run: |
                 curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
                 source external-deps-versions.properties
-                echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV
                 echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV
                 echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV
-                echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
             - name: Setup environment variables
               id: setup-env-variables-based-on-dispatch-event
               run: |
@@ -131,30 +139,18 @@ jobs:
                 inlineScript: |
                     echo "create resource group" ${{ env.resourceGroupForDB }}
                     az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }}
-            - name: Set Up Azure Postgresql to Test dbTemplate
-              id: setup-postgresql
-              uses: azure/CLI@v1
+
+            - uses: actions/checkout@v2.3.4
+            - name: Set up PostgreSQL Flexible Server that allows access from Azure services
+              uses: ./.github/actions/createPostgresqlFlexibleServer
               with:
-                azcliversion: ${{ env.azCliVersion }}
-                inlineScript: |
-                    echo "Deploy DB with name " ${{ env.dbName }}
-                    az postgres server create \
-                    --resource-group ${{ env.resourceGroupForDB }} \
-                    --name ${{ env.dbName }}  \
-                    --location ${{ env.location }} \
-                    --admin-user ${{ env.dbAdminUser }} \
-                    --ssl-enforcement Enabled \
-                    --public-network-access Enabled \
-                    --admin-password ${{ env.dbPassword }} \
-                    --sku-name B_Gen5_1
-                    sleep 2m
-                    echo "Allow Access To Azure Services"
-                    az postgres server firewall-rule create \
-                    -g ${{ env.resourceGroupForDB }} \
-                    -s ${{ env.dbName }} \
-                    -n "AllowAllWindowsAzureIps" \
-                    --start-ip-address "0.0.0.0" \
-                    --end-ip-address "0.0.0.0"
+                dbAdminUser: ${{ env.dbAdminUser }}
+                dbName: ${{ env.dbName }}
+                dbPassword: ${{ env.dbPassword }}
+                dbServerName: ${{ env.dbServerName }}
+                location: ${{ env.location }}
+                resourceGroupName: ${{ env.resourceGroupForDB }}     
+
     deploy-storage-account:
         needs: preflight
         runs-on: ubuntu-latest
@@ -269,8 +265,8 @@ jobs:
                   ${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \
                   "${cargoTrackerBlobUrl}" \
                   ${dbPassword} \
-                  ${dbAdminUser}@${dbName} \
-                  jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/postgres \
+                  ${dbAdminUser} \
+                  jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/${{ env.dbServerName }} \
                   ${location} \
                   ${ocrSSOPSW} \
                   ${ocrSSOUser} \

.github/workflows/testWlsAksWithoutDependencyCreation.yml

@@ -58,17 +58,24 @@ jobs:
           isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }}
           gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }}
           testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }}
-          azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
+          azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}}
         steps:
+            - uses: actions/checkout@v2.3.4
+            - name: Set AZ CLI Version
+              uses: ./.github/actions/setvars
+              with:
+                varFilePath: ./.github/variables/vm-dependencies.env
+            - name: Output Az CLi version
+              id: set-az-cli-version
+              run: |
+                echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT
             - name: Get versions of external dependencies
               id: get-external-dependencies-version
               run: |
                 curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
                 source external-deps-versions.properties
-                echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV
                 echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV
                 echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV
-                echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
             - name: Setup environment variables
               id: setup-env-variables-based-on-dispatch-event
               run: |
@@ -225,7 +232,7 @@ jobs:
                   ${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \
                   "${cargoTrackerBlobUrl}" \
                   ${dbPassword} \
-                  ${dbAdminUser}@${{ needs.preflight.outputs.dbName }} \
+                  ${dbAdminUser} \
                   jdbc:postgresql:\/\/${{ needs.preflight.outputs.dbName }}.postgres.database.azure.com:5432\/postgres \
                   ${location} \
                   ${ocrSSOPSW} \

.github/workflows/testWlsVmAdmin.yml

@@ -25,7 +25,9 @@ env:
   adminConsolePort: 7005
   adminVMName: adminServerVM
   adminPassword: ${{ secrets.WLS_PSW }}
+  dbAdminUser: weblogic
   dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
+  dbServerName: weblogicdb
   elkURI: ${{ secrets.ELK_URI }}
   elkUser: ${{ secrets.ELK_USER_NAME }}
   elkPassword: ${{ secrets.ELK_PSW }}
@@ -180,28 +182,16 @@ jobs:
         run: |
             echo "create resource group" ${{ env.resourceGroupForDependency }}
             az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location}
-
-      - name: Set Up Azure Postgresql to Test dbTemplate
-        id: setup-postgresql
-        run: |
-            echo "Deploy DB with name " ${{ env.dbName }}
-            az postgres server create \
-            --resource-group ${{ env.resourceGroupForDependency }} \
-            --name ${{ env.dbName }}  \
-            --location ${location} \
-            --admin-user weblogic \
-            --ssl-enforcement Enabled \
-            --public-network-access Enabled \
-            --admin-password ${{ env.wlsPassword }} \
-            --sku-name B_Gen5_1
-
-            echo "Allow Access To Azure Services"
-            az postgres server firewall-rule create \
-            -g ${{ env.resourceGroupForDependency }} \
-            -s ${{ env.dbName }} \
-            -n "AllowAllWindowsAzureIps" \
-            --start-ip-address "0.0.0.0" \
-            --end-ip-address "0.0.0.0"
+      - uses: actions/checkout@v2.3.4
+      - name: Set up PostgreSQL Flexible Server that allows access from Azure services
+        uses: ./.github/actions/createPostgresqlFlexibleServer
+        with:
+          dbAdminUser: ${{ env.dbAdminUser }}
+          dbName: ${{ env.dbName }}
+          dbPassword: ${{ env.wlsPassword }}
+          dbServerName: ${{ env.dbServerName }}
+          location: ${{ env.location }}
+          resourceGroupName: ${{ env.resourceGroupForDependency }}
 
   deploy-weblogic-admin:
     needs: [deploy-dependencies, preflight]
@@ -424,6 +414,7 @@ jobs:
             <<< "${{ env.adminOfferPath }}/test/scripts/ \
             ${{ env.adminVMName }} \
             ${{ env.wlsPassword}} \
+            ${{ env.dbAdminUser }} \
             ${{ env.dbName }} \
             ${{ env.location }} \
             ${{ env.wlsUserName }} \