Skip to content
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

Jump to bottom

fix: PostgreSQL Flexible Server Pipeline repair #3827

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+48 −29
Open

fix: PostgreSQL Flexible Server Pipeline repair #3827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd84d65
Updating Main.json
arnoldna Nov 21, 2024
97ae112
Updated minor version
arnoldna Nov 21, 2024
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
4 changes: 2 additions & 2 deletions avm/res/db-for-postgre-sql/flexible-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ param tags = {

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`administratorLogin`](#parameter-administratorlogin) | string | The administrator login name for the server. Can only be specified when the PostgreSQL server is being created. |
| [`administratorLogin`](#parameter-administratorlogin) | string | The administrator login name to the server. Can only be specified when the PostgreSQL server is being created. |
| [`administratorLoginPassword`](#parameter-administratorloginpassword) | securestring | The administrator login password. |
| [`administrators`](#parameter-administrators) | array | The Azure AD administrators when AAD authentication enabled. |
| [`availabilityZone`](#parameter-availabilityzone) | string | Availability zone information of the server. Default will have no preference set. |
Expand Down Expand Up @@ -1410,7 +1410,7 @@ Required if 'createMode' is set to 'PointInTimeRestore'.

### Parameter: `administratorLogin`

The administrator login name for the server. Can only be specified when the PostgreSQL server is being created.
The administrator login name to the server. Can only be specified when the PostgreSQL server is being created.

- Required: No
- Type: string
Expand Down
4 changes: 2 additions & 2 deletions avm/res/db-for-postgre-sql/flexible-server/administrator/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "16481538210870485841"
"version": "0.31.92.45157",
"templateHash": "787734745917336225"
},
"name": "DBforPostgreSQL Flexible Server Administrators",
"description": "This module deploys a DBforPostgreSQL Flexible Server Administrator.",
Expand Down
9 changes: 6 additions & 3 deletions avm/res/db-for-postgre-sql/flexible-server/configuration/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "4744350024962623928"
"version": "0.31.92.45157",
"templateHash": "17983721131351446823"
},
"name": "DBforPostgreSQL Flexible Server Configurations",
"description": "This module deploys a DBforPostgreSQL Flexible Server Configuration.",
Expand Down Expand Up @@ -54,7 +54,10 @@
"properties": {
"source": "[if(not(empty(parameters('source'))), parameters('source'), null())]",
"value": "[if(not(empty(parameters('value'))), parameters('value'), null())]"
}
},
"dependsOn": [
"flexibleServer"
]
}
},
"outputs": {
Expand Down
9 changes: 6 additions & 3 deletions avm/res/db-for-postgre-sql/flexible-server/database/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "5925943942284222024"
"version": "0.31.92.45157",
"templateHash": "12789563869551162858"
},
"name": "DBforPostgreSQL Flexible Server Databases",
"description": "This module deploys a DBforPostgreSQL Flexible Server Database.",
Expand Down Expand Up @@ -54,7 +54,10 @@
"properties": {
"collation": "[if(not(empty(parameters('collation'))), parameters('collation'), null())]",
"charset": "[if(not(empty(parameters('charset'))), parameters('charset'), null())]"
}
},
"dependsOn": [
"flexibleServer"
]
}
},
"outputs": {
Expand Down
4 changes: 2 additions & 2 deletions avm/res/db-for-postgre-sql/flexible-server/firewall-rule/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "9983440066171652627"
"version": "0.31.92.45157",
"templateHash": "13990914411694160996"
},
"name": "DBforPostgreSQL Flexible Server Firewall Rules",
"description": "This module deploys a DBforPostgreSQL Flexible Server Firewall Rule.",
Expand Down
2 changes: 1 addition & 1 deletion avm/res/db-for-postgre-sql/flexible-server/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata owner = 'Azure/module-maintainers'
@description('Required. The name of the PostgreSQL flexible server.')
param name string

@description('Optional. The administrator login name for the server. Can only be specified when the PostgreSQL server is being created.')
@description('Optional. The administrator login name to the server. Can only be specified when the PostgreSQL server is being created.')
param administratorLogin string?

@description('Optional. The administrator login password.')
Expand Down
43 changes: 28 additions & 15 deletions avm/res/db-for-postgre-sql/flexible-server/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "13236500116916645585"
"version": "0.31.92.45157",
"templateHash": "11631662675638152544"
},
"name": "DBforPostgreSQL Flexible Servers",
"description": "This module deploys a DBforPostgreSQL Flexible Server.",
Expand Down Expand Up @@ -561,7 +561,7 @@
"type": "string",
"nullable": true,
"metadata": {
"description": "Optional. The administrator login name for the server. Can only be specified when the PostgreSQL server is being created."
"description": "Optional. The administrator login name to the server. Can only be specified when the PostgreSQL server is being created."
}
},
"administratorLoginPassword": {
Expand Down Expand Up @@ -856,7 +856,10 @@
"apiVersion": "2023-07-01",
"subscriptionId": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '//'), '/')[2]]",
"resourceGroup": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '////'), '/')[4]]",
"name": "[format('{0}/{1}', last(split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), 'dummyVault'), '/')), coalesce(tryGet(parameters('customerManagedKey'), 'keyName'), 'dummyKey'))]"
"name": "[format('{0}/{1}', last(split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), 'dummyVault'), '/')), coalesce(tryGet(parameters('customerManagedKey'), 'keyName'), 'dummyKey'))]",
"dependsOn": [
"cMKKeyVault"
]
},
"avmTelemetry": {
"condition": "[parameters('enableTelemetry')]",
Expand Down Expand Up @@ -934,7 +937,11 @@
"storageSizeGB": "[parameters('storageSizeGB')]"
},
"version": "[parameters('version')]"
}
},
"dependsOn": [
"cMKKeyVault",
"cMKUserAssignedIdentity"
]
},
"flexibleServer_lock": {
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
Expand Down Expand Up @@ -1047,8 +1054,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "5925943942284222024"
"version": "0.31.92.45157",
"templateHash": "12789563869551162858"
},
"name": "DBforPostgreSQL Flexible Server Databases",
"description": "This module deploys a DBforPostgreSQL Flexible Server Database.",
Expand Down Expand Up @@ -1096,7 +1103,10 @@
"properties": {
"collation": "[if(not(empty(parameters('collation'))), parameters('collation'), null())]",
"charset": "[if(not(empty(parameters('charset'))), parameters('charset'), null())]"
}
},
"dependsOn": [
"flexibleServer"
]
}
},
"outputs": {
Expand Down Expand Up @@ -1161,8 +1171,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "9983440066171652627"
"version": "0.31.92.45157",
"templateHash": "13990914411694160996"
},
"name": "DBforPostgreSQL Flexible Server Firewall Rules",
"description": "This module deploys a DBforPostgreSQL Flexible Server Firewall Rule.",
Expand Down Expand Up @@ -1271,8 +1281,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "4744350024962623928"
"version": "0.31.92.45157",
"templateHash": "17983721131351446823"
},
"name": "DBforPostgreSQL Flexible Server Configurations",
"description": "This module deploys a DBforPostgreSQL Flexible Server Configuration.",
Expand Down Expand Up @@ -1320,7 +1330,10 @@
"properties": {
"source": "[if(not(empty(parameters('source'))), parameters('source'), null())]",
"value": "[if(not(empty(parameters('value'))), parameters('value'), null())]"
}
},
"dependsOn": [
"flexibleServer"
]
}
},
"outputs": {
Expand Down Expand Up @@ -1389,8 +1402,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "16481538210870485841"
"version": "0.31.92.45157",
"templateHash": "787734745917336225"
},
"name": "DBforPostgreSQL Flexible Server Administrators",
"description": "This module deploys a DBforPostgreSQL Flexible Server Administrator.",
Expand Down
2 changes: 1 addition & 1 deletion avm/res/db-for-postgre-sql/flexible-server/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://aka.ms/bicep-registry-module-version-file-schema#",
"version": "0.6",
"version": "0.7",
"pathFilters": [
"./main.json"
]
Expand Down