Skip to content

Commit 49c8793

Browse files
rjeberhardrjeberhard
authored
Merge pull request #312 from galiacheng/use-postgresql-flexible-server
Use postgresql flexible server
2 parents 26a71ac + 3933623 commit 49c8793

File tree

13 files changed

+170
-155
lines changed

13 files changed

+170
-155
lines changed

‎.github/actions/createPostgresqlFlexibleServer/action.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Create PostgreSQL Flexible Server
2+
description: Create PostgreSQL Flexible Server that allows access from Azure services.
3+
inputs:
4+
dbAdminUser:
5+
description: "Database Admin User"
6+
required: true
7+
dbName:
8+
description: "Database Name"
9+
required: true
10+
dbPassword:
11+
description: "Database Password"
12+
required: true
13+
dbServerName:
14+
description: "Database Server Name"
15+
required: true
16+
location:
17+
description: "Location"
18+
required: true
19+
resourceGroupName:
20+
description: "Resource Group Name"
21+
required: true
22+
23+
runs:
24+
using: "composite"
25+
steps:
26+
- uses: actions/[email protected]
27+
- name: Set azCliVersion
28+
uses: ./.github/actions/setvars
29+
with:
30+
varFilePath: ./.github/variables/vm-dependencies.env
31+
- name: Set Up Azure Postgresql that allows access from Azure services
32+
id: setup-postgresql
33+
uses: azure/CLI@v1
34+
with:
35+
azcliversion: ${{ env.azCliVersion }}
36+
inlineScript: |
37+
echo "Deploy DB with name " ${{ inputs.dbName }}
38+
az postgres flexible-server create \
39+
--resource-group ${{ inputs.resourceGroupName }} \
40+
--name ${{ inputs.dbName }} \
41+
--location ${{ inputs.location }} \
42+
--admin-user ${{ inputs.dbAdminUser }} \
43+
--admin-password ${{ inputs.dbPassword }} \
44+
--version 16 \
45+
--public-access 0.0.0.0 \
46+
--tier Burstable \
47+
--sku-name Standard_B1ms \
48+
--yes
49+
50+
az postgres flexible-server db create \
51+
--resource-group ${{ inputs.resourceGroupName }} \
52+
--server-name ${{ inputs.dbName }} \
53+
--database-name ${{ inputs.dbServerName }}
54+
55+
sleep 1m
56+
echo "Allow Access To Azure Services"
57+
az postgres flexible-server firewall-rule create \
58+
-g ${{ inputs.resourceGroupName }} \
59+
-n ${{ inputs.dbName }} \
60+
-r "AllowAllWindowsAzureIps" \
61+
--start-ip-address "0.0.0.0" \
62+
--end-ip-address "0.0.0.0"

‎.github/actions/setvars/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ runs:
99
using: "composite"
1010
steps:
1111
- run: |
12-
sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV
12+
sed "" ${{ inputs.varFilePath }} >> $GITHUB_ENV
1313
shell: bash

‎.github/variables/vm-dependencies.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
refArmttk=6b75cb7a3f65234995a2019fcae20a9b2c2d8635
2+
azCliVersion=2.60.0

‎.github/workflows/setupWlsAksDependency.yml‎

Lines changed: 23 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,22 @@ env:
1313
dbAdminUser: weblogic
1414
dbPassword: ${{ secrets.DB_PASSWORD }}
1515
dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
16+
dbServerName: weblogicdb
1617
resourceGroupForDB: wlsd-db-${{ github.run_id }}-${{ github.run_number }}
1718
resourceGroupForStorageAccount: wlsd-sa-${{ github.run_id }}-${{ github.run_number }}
1819
storageAccountName: wlsdsa${{ github.run_id }}${{ github.run_number }}
1920
storageContainerName: wlsdcon${{ github.run_id }}${{ github.run_number }}
2021

2122
jobs:
22-
preflight:
23-
outputs:
24-
azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
25-
runs-on: ubuntu-latest
26-
steps:
27-
- name: Get versions of external dependencies
28-
id: get-external-dependencies-version
29-
run: |
30-
curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
31-
source external-deps-versions.properties
32-
echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
33-
- name: Set up JDK 1.8
34-
uses: actions/setup-java@v1
35-
with:
36-
java-version: 1.8
3723
deploy-db:
38-
needs: preflight
3924
runs-on: ubuntu-latest
4025
steps:
41-
- name: Get AZ CLI Version
42-
run: |
43-
echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
26+
- uses: actions/[email protected]
27+
- name: Set AZ CLI Version
28+
id: set-az-cli-version
29+
uses: ./.github/actions/setvars
30+
with:
31+
varFilePath: ./.github/variables/vm-dependencies.env
4432
- uses: azure/login@v1
4533
id: azure-login
4634
with:
@@ -52,36 +40,26 @@ jobs:
5240
inlineScript: |
5341
echo "create resource group" ${{ env.resourceGroupForDB }}
5442
az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }}
55-
- name: Set Up Azure Postgresql to Test dbTemplate
56-
id: setup-postgresql
57-
uses: azure/CLI@v1
43+
44+
- uses: actions/[email protected]
45+
- name: Set up PostgreSQL Flexible Server that allows access from Azure services
46+
uses: ./.github/actions/createPostgresqlFlexibleServer
5847
with:
59-
azcliversion: ${{ env.azCliVersion }}
60-
inlineScript: |
61-
echo "Deploy DB with name " ${{ env.dbName }}
62-
az postgres server create \
63-
--resource-group ${{ env.resourceGroupForDB }} \
64-
--name ${{ env.dbName }} \
65-
--location ${{ env.location }} \
66-
--admin-user ${{ env.dbAdminUser }} \
67-
--ssl-enforcement Enabled \
68-
--public-network-access Enabled \
69-
--admin-password ${{ env.dbPassword }} \
70-
--sku-name B_Gen5_1
71-
echo "Allow Access To Azure Services"
72-
az postgres server firewall-rule create \
73-
-g ${{ env.resourceGroupForDB }} \
74-
-s ${{ env.dbName }} \
75-
-n "AllowAllWindowsAzureIps" \
76-
--start-ip-address "0.0.0.0" \
77-
--end-ip-address "0.0.0.0"
48+
dbAdminUser: ${{ env.dbAdminUser }}
49+
dbName: ${{ env.dbName }}
50+
dbPassword: ${{ env.dbPassword }}
51+
dbServerName: ${{ env.dbServerName }}
52+
location: ${{ env.location }}
53+
resourceGroupName: ${{ env.resourceGroupForDB }}
7854
deploy-storage-account:
79-
needs: preflight
8055
runs-on: ubuntu-latest
8156
steps:
82-
- name: Get AZ CLI Version
83-
run: |
84-
echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
57+
- uses: actions/[email protected]
58+
- name: Set AZ CLI Version
59+
id: set-az-cli-version
60+
uses: ./.github/actions/setvars
61+
with:
62+
varFilePath: ./.github/variables/vm-dependencies.env
8563
- uses: azure/login@v1
8664
id: azure-login
8765
with:

‎.github/workflows/testWlsAksWithDependencyCreation.yml‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
dbAdminUser: weblogic
2828
dbPassword: ${{ secrets.DB_PASSWORD }}
2929
dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
30+
dbServerName: weblogicdb
3031
ocrSSOPSW: ${{ secrets.ORC_SSOPSW }}
3132
ocrSSOUser: ${{ secrets.ORC_SSOUSER }}
3233
wdtRuntimePassword: ${{ secrets.WDT_RUNTIMEPSW}}
@@ -44,18 +45,25 @@ jobs:
4445
isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }}
4546
gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }}
4647
testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }}
47-
azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
48+
azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}}
4849
runs-on: ubuntu-latest
4950
steps:
51+
- uses: actions/[email protected]
52+
- name: Set AZ CLI Version and save in variable azCliVersion
53+
uses: ./.github/actions/setvars
54+
with:
55+
varFilePath: ./.github/variables/vm-dependencies.env
56+
- name: Output Az CLi version
57+
id: set-az-cli-version
58+
run: |
59+
echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT
5060
- name: Get versions of external dependencies
5161
id: get-external-dependencies-version
5262
run: |
5363
curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
5464
source external-deps-versions.properties
55-
echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV
5665
echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV
5766
echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV
58-
echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
5967
- name: Setup environment variables
6068
id: setup-env-variables-based-on-dispatch-event
6169
run: |
@@ -131,30 +139,18 @@ jobs:
131139
inlineScript: |
132140
echo "create resource group" ${{ env.resourceGroupForDB }}
133141
az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }}
134-
- name: Set Up Azure Postgresql to Test dbTemplate
135-
id: setup-postgresql
136-
uses: azure/CLI@v1
142+
143+
- uses: actions/[email protected]
144+
- name: Set up PostgreSQL Flexible Server that allows access from Azure services
145+
uses: ./.github/actions/createPostgresqlFlexibleServer
137146
with:
138-
azcliversion: ${{ env.azCliVersion }}
139-
inlineScript: |
140-
echo "Deploy DB with name " ${{ env.dbName }}
141-
az postgres server create \
142-
--resource-group ${{ env.resourceGroupForDB }} \
143-
--name ${{ env.dbName }} \
144-
--location ${{ env.location }} \
145-
--admin-user ${{ env.dbAdminUser }} \
146-
--ssl-enforcement Enabled \
147-
--public-network-access Enabled \
148-
--admin-password ${{ env.dbPassword }} \
149-
--sku-name B_Gen5_1
150-
sleep 2m
151-
echo "Allow Access To Azure Services"
152-
az postgres server firewall-rule create \
153-
-g ${{ env.resourceGroupForDB }} \
154-
-s ${{ env.dbName }} \
155-
-n "AllowAllWindowsAzureIps" \
156-
--start-ip-address "0.0.0.0" \
157-
--end-ip-address "0.0.0.0"
147+
dbAdminUser: ${{ env.dbAdminUser }}
148+
dbName: ${{ env.dbName }}
149+
dbPassword: ${{ env.dbPassword }}
150+
dbServerName: ${{ env.dbServerName }}
151+
location: ${{ env.location }}
152+
resourceGroupName: ${{ env.resourceGroupForDB }}
153+
158154
deploy-storage-account:
159155
needs: preflight
160156
runs-on: ubuntu-latest
@@ -269,8 +265,8 @@ jobs:
269265
${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \
270266
"${cargoTrackerBlobUrl}" \
271267
${dbPassword} \
272-
${dbAdminUser}@${dbName} \
273-
jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/postgres \
268+
${dbAdminUser} \
269+
jdbc:postgresql:\/\/${dbName}.postgres.database.azure.com:5432\/${{ env.dbServerName }} \
274270
${location} \
275271
${ocrSSOPSW} \
276272
${ocrSSOUser} \

‎.github/workflows/testWlsAksWithoutDependencyCreation.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,24 @@ jobs:
5858
isForDemo: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.isForDemo }}
5959
gitUserNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.gitUserNameForArtifactsLocation }}
6060
testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }}
61-
azCliVersion: ${{steps.get-external-dependencies-version.outputs.azCliVersion}}
61+
azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}}
6262
steps:
63+
- uses: actions/[email protected]
64+
- name: Set AZ CLI Version
65+
uses: ./.github/actions/setvars
66+
with:
67+
varFilePath: ./.github/variables/vm-dependencies.env
68+
- name: Output Az CLi version
69+
id: set-az-cli-version
70+
run: |
71+
echo "azCliVersion=${azCliVersion}" >> $GITHUB_OUTPUT
6372
- name: Get versions of external dependencies
6473
id: get-external-dependencies-version
6574
run: |
6675
curl -Lo external-deps-versions.properties https://raw.githubusercontent.com/Azure/azure-javaee-iaas/main/external-deps-versions.properties
6776
source external-deps-versions.properties
68-
echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_ENV
6977
echo "bicepVersion=${BICEP_VERSION}" >> $GITHUB_ENV
7078
echo "refArmttk=${ARM_TTK_REFERENCE}" >> $GITHUB_ENV
71-
echo "azCliVersion=${AZ_CLI_VERSION}" >> $GITHUB_OUTPUT
7279
- name: Setup environment variables
7380
id: setup-env-variables-based-on-dispatch-event
7481
run: |
@@ -225,7 +232,7 @@ jobs:
225232
${{ needs.preflight.outputs.testBranchNameForArtifactsLocation }} \
226233
"${cargoTrackerBlobUrl}" \
227234
${dbPassword} \
228-
${dbAdminUser}@${{ needs.preflight.outputs.dbName }} \
235+
${dbAdminUser} \
229236
jdbc:postgresql:\/\/${{ needs.preflight.outputs.dbName }}.postgres.database.azure.com:5432\/postgres \
230237
${location} \
231238
${ocrSSOPSW} \

‎.github/workflows/testWlsVmAdmin.yml‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ env:
2525
adminConsolePort: 7005
2626
adminVMName: adminServerVM
2727
adminPassword: ${{ secrets.WLS_PSW }}
28+
dbAdminUser: weblogic
2829
dbName: wlsdb${{ github.run_id }}${{ github.run_number }}
30+
dbServerName: weblogicdb
2931
elkURI: ${{ secrets.ELK_URI }}
3032
elkUser: ${{ secrets.ELK_USER_NAME }}
3133
elkPassword: ${{ secrets.ELK_PSW }}
@@ -180,28 +182,16 @@ jobs:
180182
run: |
181183
echo "create resource group" ${{ env.resourceGroupForDependency }}
182184
az group create --verbose --name ${{ env.resourceGroupForDependency }} --location ${location}
183-
184-
- name: Set Up Azure Postgresql to Test dbTemplate
185-
id: setup-postgresql
186-
run: |
187-
echo "Deploy DB with name " ${{ env.dbName }}
188-
az postgres server create \
189-
--resource-group ${{ env.resourceGroupForDependency }} \
190-
--name ${{ env.dbName }} \
191-
--location ${location} \
192-
--admin-user weblogic \
193-
--ssl-enforcement Enabled \
194-
--public-network-access Enabled \
195-
--admin-password ${{ env.wlsPassword }} \
196-
--sku-name B_Gen5_1
197-
198-
echo "Allow Access To Azure Services"
199-
az postgres server firewall-rule create \
200-
-g ${{ env.resourceGroupForDependency }} \
201-
-s ${{ env.dbName }} \
202-
-n "AllowAllWindowsAzureIps" \
203-
--start-ip-address "0.0.0.0" \
204-
--end-ip-address "0.0.0.0"
185+
- uses: actions/[email protected]
186+
- name: Set up PostgreSQL Flexible Server that allows access from Azure services
187+
uses: ./.github/actions/createPostgresqlFlexibleServer
188+
with:
189+
dbAdminUser: ${{ env.dbAdminUser }}
190+
dbName: ${{ env.dbName }}
191+
dbPassword: ${{ env.wlsPassword }}
192+
dbServerName: ${{ env.dbServerName }}
193+
location: ${{ env.location }}
194+
resourceGroupName: ${{ env.resourceGroupForDependency }}
205195

206196
deploy-weblogic-admin:
207197
needs: [deploy-dependencies, preflight]
@@ -424,6 +414,7 @@ jobs:
424414
<<< "${{ env.adminOfferPath }}/test/scripts/ \
425415
${{ env.adminVMName }} \
426416
${{ env.wlsPassword}} \
417+
${{ env.dbAdminUser }} \
427418
${{ env.dbName }} \
428419
${{ env.location }} \
429420
${{ env.wlsUserName }} \

0 commit comments

Comments
 (0)