Users/alsehr/2091 on behalf (Azure#3597)

## Description Follow up to Azure#2091 Changes from that PR - Updated allowedSet Additional changes - Regenerated all files - Updated AVM type implementation to `utl/types/avm-common-types` module (cc: @arnoldna) - Updated module default's pass-thru ## Pipeline Reference  | Pipeline | | -------- | [![avm.res.db-for-postgre-sql.flexible-server](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.db-for-postgre-sql.flexible-server.yml/badge.svg?branch=users%2Falsehr%2F2091_onBehalf&event=workflow_dispatch)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.db-for-postgre-sql.flexible-server.yml) ## Type of Change  - [ ] Update to CI Environment or utilities (Non-module affecting changes) - [x] Azure Verified Module updates: - [ ] Bugfix containing backwards-compatible bug fixes, and I have NOT bumped the MAJOR or MINOR version in `version.json`: - [ ] Someone has opened a bug report issue, and I have included "Closes #{bug_report_issue_number}" in the PR description. - [ ] The bug was found by the module author, and no one has opened an issue to report it yet. - [ ] Feature update backwards compatible feature updates, and I have bumped the MINOR version in `version.json`. - [ ] Breaking changes and I have bumped the MAJOR version in `version.json`. - [ ] Update to documentation --------- Co-authored-by: VZhuck <[email protected]> Co-authored-by: Erika Gressi <[email protected]>
AlexanderSehr · Oct 21, 2024 · ccfb9c4 · ccfb9c4
1 parent 8aad7c1
commit ccfb9c4
Show file tree

Hide file tree

Showing 18 changed files with 999 additions and 904 deletions.
diff --git a/avm/res/db-for-postgre-sql/flexible-server/README.md b/avm/res/db-for-postgre-sql/flexible-server/README.md
diff --git a/avm/res/db-for-postgre-sql/flexible-server/administrator/main.json b/avm/res/db-for-postgre-sql/flexible-server/administrator/main.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "9786947819042824705"
+      "version": "0.30.23.60470",
+      "templateHash": "17167767529180811297"
     },
     "name": "DBforPostgreSQL Flexible Server Administrators",
     "description": "This module deploys a DBforPostgreSQL Flexible Server Administrator.",

diff --git a/avm/res/db-for-postgre-sql/flexible-server/configuration/README.md b/avm/res/db-for-postgre-sql/flexible-server/configuration/README.md
@@ -55,15 +55,13 @@ Source of the configuration.
 
 - Required: No
 - Type: string
-- Default: `''`
 
 ### Parameter: `value`
 
 Value of the configuration.
 
 - Required: No
 - Type: string
-- Default: `''`
 
 ## Outputs
 

diff --git a/avm/res/db-for-postgre-sql/flexible-server/configuration/main.bicep b/avm/res/db-for-postgre-sql/flexible-server/configuration/main.bicep
@@ -9,10 +9,10 @@ param name string
 param flexibleServerName string
 
 @description('Optional. Source of the configuration.')
-param source string = ''
+param source string?
 
 @description('Optional. Value of the configuration.')
-param value string = ''
+param value string?
 
 resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' existing = {
   name: flexibleServerName

diff --git a/avm/res/db-for-postgre-sql/flexible-server/configuration/main.json b/avm/res/db-for-postgre-sql/flexible-server/configuration/main.json
@@ -1,11 +1,12 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "languageVersion": "2.0",
   "contentVersion": "1.0.0.0",
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "3802666632340288344"
+      "version": "0.30.23.60470",
+      "templateHash": "11184980891224869481"
     },
     "name": "DBforPostgreSQL Flexible Server Configurations",
     "description": "This module deploys a DBforPostgreSQL Flexible Server Configuration.",
@@ -26,30 +27,39 @@
     },
     "source": {
       "type": "string",
-      "defaultValue": "",
+      "nullable": true,
       "metadata": {
         "description": "Optional. Source of the configuration."
       }
     },
     "value": {
       "type": "string",
-      "defaultValue": "",
+      "nullable": true,
       "metadata": {
         "description": "Optional. Value of the configuration."
       }
     }
   },
-  "resources": [
-    {
+  "resources": {
+    "flexibleServer": {
+      "existing": true,
+      "type": "Microsoft.DBforPostgreSQL/flexibleServers",
+      "apiVersion": "2022-12-01",
+      "name": "[parameters('flexibleServerName')]"
+    },
+    "configuration": {
       "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations",
       "apiVersion": "2022-12-01",
       "name": "[format('{0}/{1}', parameters('flexibleServerName'), parameters('name'))]",
       "properties": {
         "source": "[if(not(empty(parameters('source'))), parameters('source'), null())]",
         "value": "[if(not(empty(parameters('value'))), parameters('value'), null())]"
-      }
+      },
+      "dependsOn": [
+        "flexibleServer"
+      ]
     }
-  ],
+  },
   "outputs": {
     "name": {
       "type": "string",

diff --git a/avm/res/db-for-postgre-sql/flexible-server/database/README.md b/avm/res/db-for-postgre-sql/flexible-server/database/README.md
@@ -55,15 +55,13 @@ The charset of the database.
 
 - Required: No
 - Type: string
-- Default: `''`
 
 ### Parameter: `collation`
 
 The collation of the database.
 
 - Required: No
 - Type: string
-- Default: `''`
 
 ## Outputs
 

diff --git a/avm/res/db-for-postgre-sql/flexible-server/database/main.bicep b/avm/res/db-for-postgre-sql/flexible-server/database/main.bicep
@@ -9,10 +9,10 @@ param name string
 param flexibleServerName string
 
 @description('Optional. The collation of the database.')
-param collation string = ''
+param collation string?
 
 @description('Optional. The charset of the database.')
-param charset string = ''
+param charset string?
 
 resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' existing = {
   name: flexibleServerName

diff --git a/avm/res/db-for-postgre-sql/flexible-server/database/main.json b/avm/res/db-for-postgre-sql/flexible-server/database/main.json
@@ -1,11 +1,12 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "languageVersion": "2.0",
   "contentVersion": "1.0.0.0",
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "17501165975344742322"
+      "version": "0.30.23.60470",
+      "templateHash": "8538777017463575324"
     },
     "name": "DBforPostgreSQL Flexible Server Databases",
     "description": "This module deploys a DBforPostgreSQL Flexible Server Database.",
@@ -26,30 +27,39 @@
     },
     "collation": {
       "type": "string",
-      "defaultValue": "",
+      "nullable": true,
       "metadata": {
         "description": "Optional. The collation of the database."
       }
     },
     "charset": {
       "type": "string",
-      "defaultValue": "",
+      "nullable": true,
       "metadata": {
         "description": "Optional. The charset of the database."
       }
     }
   },
-  "resources": [
-    {
+  "resources": {
+    "flexibleServer": {
+      "existing": true,
+      "type": "Microsoft.DBforPostgreSQL/flexibleServers",
+      "apiVersion": "2022-12-01",
+      "name": "[parameters('flexibleServerName')]"
+    },
+    "database": {
       "type": "Microsoft.DBforPostgreSQL/flexibleServers/databases",
       "apiVersion": "2022-12-01",
       "name": "[format('{0}/{1}', parameters('flexibleServerName'), parameters('name'))]",
       "properties": {
         "collation": "[if(not(empty(parameters('collation'))), parameters('collation'), null())]",
         "charset": "[if(not(empty(parameters('charset'))), parameters('charset'), null())]"
-      }
+      },
+      "dependsOn": [
+        "flexibleServer"
+      ]
     }
-  ],
+  },
   "outputs": {
     "name": {
       "type": "string",

diff --git a/avm/res/db-for-postgre-sql/flexible-server/firewall-rule/main.json b/avm/res/db-for-postgre-sql/flexible-server/firewall-rule/main.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "5110779562094536429"
+      "version": "0.30.23.60470",
+      "templateHash": "3950185975907365475"
     },
     "name": "DBforPostgreSQL Flexible Server Firewall Rules",
     "description": "This module deploys a DBforPostgreSQL Flexible Server Firewall Rule.",