Skip to content

Commit

Permalink
Merge branch 'main' into userassignedidentity
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderSehr authored Nov 26, 2023
2 parents 156081b + eca3fd2 commit 6ff9c60
Show file tree
Hide file tree
Showing 18 changed files with 3,972 additions and 25 deletions.
81 changes: 81 additions & 0 deletions .github/workflows/avm.res.event-grid.topic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: "avm.res.event-grid.topic"

on:
schedule:
- cron: "0 12 1/15 * *" # Bi-Weekly Test (on 1st & 15th of month)
workflow_dispatch:
inputs:
staticValidation:
type: boolean
description: "Execute static validation"
required: false
default: true
deploymentValidation:
type: boolean
description: "Execute deployment validation"
required: false
default: true
removeDeployment:
type: boolean
description: "Remove deployed module"
required: false
default: true

push:
branches:
- main
paths:
- ".github/actions/templates/avm-**"
- ".github/workflows/avm.template.module.yml"
- ".github/workflows/avm.res.event-grid.topic.yml"
- "avm/res/event-grid/topic/**"
- "avm/utilities/pipelines/**"
- "!*/**/README.md"

env:
modulePath: "avm/res/event-grid/topic"
workflowPath: ".github/workflows/avm.res.event-grid.topic.yml"

concurrency:
group: ${{ github.workflow }}

jobs:
###########################
# Initialize pipeline #
###########################
job_initialize_pipeline:
runs-on: ubuntu-20.04
name: "Initialize pipeline"
steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Set input parameters to output variables"
id: get-workflow-param
uses: ./.github/actions/templates/avm-getWorkflowInput
with:
workflowPath: "${{ env.workflowPath}}"
- name: "Get parameter file paths"
id: get-module-test-file-paths
uses: ./.github/actions/templates/avm-getModuleTestFiles
with:
modulePath: "${{ env.modulePath }}"
outputs:
workflowInput: ${{ steps.get-workflow-param.outputs.workflowInput }}
moduleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }}
modulePath: "${{ env.modulePath }}"

##############################
# Call reusable workflow #
##############################
call-workflow-passing-data:
name: "Module"
needs:
- job_initialize_pipeline
uses: ./.github/workflows/avm.template.module.yml
with:
workflowInput: "${{ needs.job_initialize_pipeline.outputs.workflowInput }}"
moduleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.moduleTestFilePaths }}"
modulePath: "${{ needs.job_initialize_pipeline.outputs.modulePath}}"
secrets: inherit
24 changes: 12 additions & 12 deletions avm/res/db-for-postgre-sql/flexible-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -746,15 +746,15 @@ module flexibleServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:<ver
| :-- | :-- | :-- |
| [`name`](#parameter-name) | string | The name of the PostgreSQL flexible server. |
| [`skuName`](#parameter-skuname) | string | The name of the sku, typically, tier + family + cores, e.g. Standard_D4s_v3. |
| [`tier`](#parameter-tier) | string | The tier of the particular SKU. Tier must align with the "skuName" property. Example, tier cannot be "Burstable" if skuName is "Standard_D4s_v3". |
| [`tier`](#parameter-tier) | string | The tier of the particular SKU. Tier must align with the 'skuName' property. Example, tier cannot be 'Burstable' if skuName is 'Standard_D4s_v3'. |

**Conditional parameters**

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`managedIdentities`](#parameter-managedidentities) | object | The managed identity definition for this resource. Required if 'cMKKeyName' is not empty. |
| [`pointInTimeUTC`](#parameter-pointintimeutc) | string | Required if "createMode" is set to "PointInTimeRestore". |
| [`sourceServerResourceId`](#parameter-sourceserverresourceid) | string | Required if "createMode" is set to "PointInTimeRestore". |
| [`pointInTimeUTC`](#parameter-pointintimeutc) | string | Required if 'createMode' is set to 'PointInTimeRestore'. |
| [`sourceServerResourceId`](#parameter-sourceserverresourceid) | string | Required if 'createMode' is set to 'PointInTimeRestore'. |

**Optional parameters**

Expand All @@ -770,17 +770,17 @@ module flexibleServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:<ver
| [`createMode`](#parameter-createmode) | string | The mode to create a new PostgreSQL server. |
| [`customerManagedKey`](#parameter-customermanagedkey) | object | The customer managed key definition. |
| [`databases`](#parameter-databases) | array | The databases to create in the server. |
| [`delegatedSubnetResourceId`](#parameter-delegatedsubnetresourceid) | string | Delegated subnet arm resource ID. Used when the desired connectivity mode is "Private Access" - virtual network integration. |
| [`delegatedSubnetResourceId`](#parameter-delegatedsubnetresourceid) | string | Delegated subnet arm resource ID. Used when the desired connectivity mode is 'Private Access' - virtual network integration. |
| [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. |
| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. |
| [`firewallRules`](#parameter-firewallrules) | array | The firewall rules to create in the PostgreSQL flexible server. |
| [`geoRedundantBackup`](#parameter-georedundantbackup) | string | A value indicating whether Geo-Redundant backup is enabled on the server. Should be left disabled if 'cMKKeyName' is not empty. |
| [`highAvailability`](#parameter-highavailability) | string | The mode for high availability. |
| [`location`](#parameter-location) | string | Location for all resources. |
| [`lock`](#parameter-lock) | object | The lock settings of the service. |
| [`maintenanceWindow`](#parameter-maintenancewindow) | object | Properties for the maintenence window. If provided, "customWindow" property must exist and set to "Enabled". |
| [`maintenanceWindow`](#parameter-maintenancewindow) | object | Properties for the maintenence window. If provided, 'customWindow' property must exist and set to 'Enabled'. |
| [`passwordAuth`](#parameter-passwordauth) | string | If Enabled, password authentication is enabled. |
| [`privateDnsZoneArmResourceId`](#parameter-privatednszonearmresourceid) | string | Private dns zone arm resource ID. Used when the desired connectivity mode is "Private Access" and required when "delegatedSubnetResourceId" is used. The Private DNS Zone must be lined to the Virtual Network referenced in "delegatedSubnetResourceId". |
| [`privateDnsZoneArmResourceId`](#parameter-privatednszonearmresourceid) | string | Private dns zone arm resource ID. Used when the desired connectivity mode is 'Private Access' and required when 'delegatedSubnetResourceId' is used. The Private DNS Zone must be lined to the Virtual Network referenced in 'delegatedSubnetResourceId'. |
| [`roleAssignments`](#parameter-roleassignments) | array | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. |
| [`storageSizeGB`](#parameter-storagesizegb) | int | Max storage allowed for a server. |
| [`tags`](#parameter-tags) | object | Tags of the resource. |
Expand Down Expand Up @@ -919,7 +919,7 @@ The databases to create in the server.

### Parameter: `delegatedSubnetResourceId`

Delegated subnet arm resource ID. Used when the desired connectivity mode is "Private Access" - virtual network integration.
Delegated subnet arm resource ID. Used when the desired connectivity mode is 'Private Access' - virtual network integration.
- Required: No
- Type: string
- Default: `''`
Expand Down Expand Up @@ -1118,7 +1118,7 @@ Optional. Specify the name of lock.

### Parameter: `maintenanceWindow`

Properties for the maintenence window. If provided, "customWindow" property must exist and set to "Enabled".
Properties for the maintenence window. If provided, 'customWindow' property must exist and set to 'Enabled'.
- Required: No
- Type: object
- Default: `{}`
Expand Down Expand Up @@ -1163,14 +1163,14 @@ If Enabled, password authentication is enabled.

### Parameter: `pointInTimeUTC`

Required if "createMode" is set to "PointInTimeRestore".
Required if 'createMode' is set to 'PointInTimeRestore'.
- Required: No
- Type: string
- Default: `''`

### Parameter: `privateDnsZoneArmResourceId`

Private dns zone arm resource ID. Used when the desired connectivity mode is "Private Access" and required when "delegatedSubnetResourceId" is used. The Private DNS Zone must be lined to the Virtual Network referenced in "delegatedSubnetResourceId".
Private dns zone arm resource ID. Used when the desired connectivity mode is 'Private Access' and required when 'delegatedSubnetResourceId' is used. The Private DNS Zone must be lined to the Virtual Network referenced in 'delegatedSubnetResourceId'.
- Required: No
- Type: string
- Default: `''`
Expand Down Expand Up @@ -1251,7 +1251,7 @@ The name of the sku, typically, tier + family + cores, e.g. Standard_D4s_v3.

### Parameter: `sourceServerResourceId`

Required if "createMode" is set to "PointInTimeRestore".
Required if 'createMode' is set to 'PointInTimeRestore'.
- Required: No
- Type: string
- Default: `''`
Expand Down Expand Up @@ -1293,7 +1293,7 @@ Tenant id of the server.

### Parameter: `tier`

The tier of the particular SKU. Tier must align with the "skuName" property. Example, tier cannot be "Burstable" if skuName is "Standard_D4s_v3".
The tier of the particular SKU. Tier must align with the 'skuName' property. Example, tier cannot be 'Burstable' if skuName is 'Standard_D4s_v3'.
- Required: Yes
- Type: string
- Allowed:
Expand Down
12 changes: 6 additions & 6 deletions avm/res/db-for-postgre-sql/flexible-server/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ param skuName string
'Burstable'
'MemoryOptimized'
])
@description('Required. The tier of the particular SKU. Tier must align with the "skuName" property. Example, tier cannot be "Burstable" if skuName is "Standard_D4s_v3".')
@description('Required. The tier of the particular SKU. Tier must align with the \'skuName\' property. Example, tier cannot be \'Burstable\' if skuName is \'Standard_D4s_v3\'.')
param tier string

@allowed([
Expand Down Expand Up @@ -116,19 +116,19 @@ param managedIdentities managedIdentitiesType
@description('Optional. The customer managed key definition.')
param customerManagedKey customerManagedKeyType

@description('Optional. Properties for the maintenence window. If provided, "customWindow" property must exist and set to "Enabled".')
@description('Optional. Properties for the maintenence window. If provided, \'customWindow\' property must exist and set to \'Enabled\'.')
param maintenanceWindow object = {}

@description('Conditional. Required if "createMode" is set to "PointInTimeRestore".')
@description('Conditional. Required if \'createMode\' is set to \'PointInTimeRestore\'.')
param pointInTimeUTC string = ''

@description('Conditional. Required if "createMode" is set to "PointInTimeRestore".')
@description('Conditional. Required if \'createMode\' is set to \'PointInTimeRestore\'.')
param sourceServerResourceId string = ''

@description('Optional. Delegated subnet arm resource ID. Used when the desired connectivity mode is "Private Access" - virtual network integration.')
@description('Optional. Delegated subnet arm resource ID. Used when the desired connectivity mode is \'Private Access\' - virtual network integration.')
param delegatedSubnetResourceId string = ''

@description('Optional. Private dns zone arm resource ID. Used when the desired connectivity mode is "Private Access" and required when "delegatedSubnetResourceId" is used. The Private DNS Zone must be lined to the Virtual Network referenced in "delegatedSubnetResourceId".')
@description('Optional. Private dns zone arm resource ID. Used when the desired connectivity mode is \'Private Access\' and required when \'delegatedSubnetResourceId\' is used. The Private DNS Zone must be lined to the Virtual Network referenced in \'delegatedSubnetResourceId\'.')
param privateDnsZoneArmResourceId string = ''

@description('Optional. The firewall rules to create in the PostgreSQL flexible server.')
Expand Down
14 changes: 7 additions & 7 deletions avm/res/db-for-postgre-sql/flexible-server/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.23.1.45101",
"templateHash": "9838703870761845500"
"templateHash": "16677412780876531239"
},
"name": "DBforPostgreSQL Flexible Servers",
"description": "This module deploys a DBforPostgreSQL Flexible Server.",
Expand Down Expand Up @@ -335,7 +335,7 @@
"MemoryOptimized"
],
"metadata": {
"description": "Required. The tier of the particular SKU. Tier must align with the \"skuName\" property. Example, tier cannot be \"Burstable\" if skuName is \"Standard_D4s_v3\"."
"description": "Required. The tier of the particular SKU. Tier must align with the 'skuName' property. Example, tier cannot be 'Burstable' if skuName is 'Standard_D4s_v3'."
}
},
"availabilityZone": {
Expand Down Expand Up @@ -445,35 +445,35 @@
"type": "object",
"defaultValue": {},
"metadata": {
"description": "Optional. Properties for the maintenence window. If provided, \"customWindow\" property must exist and set to \"Enabled\"."
"description": "Optional. Properties for the maintenence window. If provided, 'customWindow' property must exist and set to 'Enabled'."
}
},
"pointInTimeUTC": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Conditional. Required if \"createMode\" is set to \"PointInTimeRestore\"."
"description": "Conditional. Required if 'createMode' is set to 'PointInTimeRestore'."
}
},
"sourceServerResourceId": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Conditional. Required if \"createMode\" is set to \"PointInTimeRestore\"."
"description": "Conditional. Required if 'createMode' is set to 'PointInTimeRestore'."
}
},
"delegatedSubnetResourceId": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. Delegated subnet arm resource ID. Used when the desired connectivity mode is \"Private Access\" - virtual network integration."
"description": "Optional. Delegated subnet arm resource ID. Used when the desired connectivity mode is 'Private Access' - virtual network integration."
}
},
"privateDnsZoneArmResourceId": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. Private dns zone arm resource ID. Used when the desired connectivity mode is \"Private Access\" and required when \"delegatedSubnetResourceId\" is used. The Private DNS Zone must be lined to the Virtual Network referenced in \"delegatedSubnetResourceId\"."
"description": "Optional. Private dns zone arm resource ID. Used when the desired connectivity mode is 'Private Access' and required when 'delegatedSubnetResourceId' is used. The Private DNS Zone must be lined to the Virtual Network referenced in 'delegatedSubnetResourceId'."
}
},
"firewallRules": {
Expand Down
Loading

0 comments on commit 6ff9c60

Please sign in to comment.