Use to AVM to support PostgreSql #9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,6 +61,15 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.4.5 | |
| name: '${abbrs.appManagedEnvironments}${resourceToken}' | ||
| location: location | ||
| zoneRedundant: false | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity) }} | ||
| roleAssignments: [ | ||
| { | ||
| principalId: connectionCreatorIdentity.outputs.principalId | ||
| principalType: 'ServicePrincipal' | ||
| roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c' | ||
|
Author
There was a problem hiding this comment. The Refs: To keep it align with other places in current file, let's keep it in GUID format. We can change all GUID into display name in another PR. There was a problem hiding this comment. Let's hold on this change, since I am not sure whether the name can be changed. |
||
| } | ||
| ] | ||
| {{- end}} | ||
| } | ||
| } | ||
| {{- end}} | ||
|
|
@@ -96,8 +105,8 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.4.0' = { | |
| {{- end}} | ||
|
|
||
| {{- if .DbPostgres}} | ||
| var postgreSqlDatabaseName = '{{ .DbPostgres.DatabaseName }}' | ||
| var postgreSqlDatabaseUser = 'psqladmin' | ||
| module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4' = { | ||
| name: 'postgreServer' | ||
| params: { | ||
|
|
@@ -106,8 +115,8 @@ module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4 | |
| skuName: 'Standard_B1ms' | ||
| tier: 'Burstable' | ||
| // Non-required parameters | ||
| administratorLogin: postgreSqlDatabaseUser | ||
| administratorLoginPassword: postgreSqlDatabasePassword | ||
| geoRedundantBackup: 'Disabled' | ||
| passwordAuth:'Enabled' | ||
| firewallRules: [ | ||
|
|
@@ -119,13 +128,53 @@ module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4 | |
| ] | ||
| databases: [ | ||
| { | ||
| name: postgreSqlDatabaseName | ||
| } | ||
| ] | ||
| location: location | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity) }} | ||
| roleAssignments: [ | ||
| { | ||
| principalId: connectionCreatorIdentity.outputs.principalId | ||
| principalType: 'ServicePrincipal' | ||
| roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c' | ||
|
Author
There was a problem hiding this comment. This role is added in 4 scopes:
Delete any one of above 4 scopes will cause
Author
There was a problem hiding this comment. Without ACA environment, it will return error like |
||
| } | ||
| ] | ||
| {{- end}} | ||
| } | ||
| } | ||
| {{- end}} | ||
| {{- if (or (and .DbMySql .DbMySql.AuthUsingManagedIdentity) (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity))}} | ||
|
|
||
| module connectionCreatorIdentity 'br/public:avm/res/managed-identity/user-assigned-identity:0.2.1' = { | ||
| name: 'connectionCreatorIdentity' | ||
| params: { | ||
| name: '${abbrs.managedIdentityUserAssignedIdentities}cci-${resourceToken}' | ||
| location: location | ||
| } | ||
| } | ||
| {{- end}} | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity) }} | ||
| {{- range .Services}} | ||
| module {{bicepName .Name}}CreateConnectionToPostgreSql 'br/public:avm/res/resources/deployment-script:0.4.0' = { | ||
| name: '{{bicepName .Name}}CreateConnectionToPostgreSql' | ||
| params: { | ||
| kind: 'AzureCLI' | ||
| name: '${abbrs.deploymentScript}{{bicepName .Name}}-connection-to-pg-${resourceToken}' | ||
| azCliVersion: '2.63.0' | ||
| location: location | ||
| managedIdentities: { | ||
| userAssignedResourcesIds: [ | ||
| connectionCreatorIdentity.outputs.resourceId | ||
| ] | ||
| } | ||
| runOnce: false | ||
|
There was a problem hiding this comment. So we are still use deployment script to do the trick, does any database avm support passwordless yet?
Author
There was a problem hiding this comment.
This parameter can solve this problem: https://github.com/azure-javaee/azure-dev/wiki/Knowledge-Sharing#solution
Author
There was a problem hiding this comment.
We are still use deployment script to do the trick |
||
| retentionInterval: 'P1D' | ||
| scriptContent: 'apk update; apk add g++; apk add unixodbc-dev; az extension add --name containerapp; az extension add --name serviceconnector-passwordless --upgrade; az containerapp connection create postgres-flexible --connection appLinkToPostgres --source-id ${ {{bicepName .Name}}.outputs.resourceId} --target-id ${postgreServer.outputs.resourceId}/databases/${postgreSqlDatabaseName} --client-type springBoot --user-identity client-id=${ {{bicepName .Name}}Identity.outputs.clientId} subs-id=${subscription().subscriptionId} user-object-id=${connectionCreatorIdentity.outputs.principalId} -c main --yes;' | ||
| } | ||
| } | ||
| {{- end}} | ||
| {{- end}} | ||
| {{- if .AzureEventHubs }} | ||
|
|
||
| module eventHubNamespace 'br/public:avm/res/event-hub/namespace:0.7.1' = { | ||
|
|
@@ -266,6 +315,15 @@ module {{bicepName .Name}}Identity 'br/public:avm/res/managed-identity/user-assi | |
| params: { | ||
| name: '${abbrs.managedIdentityUserAssignedIdentities}{{bicepName .Name}}-${resourceToken}' | ||
| location: location | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity) }} | ||
| roleAssignments: [ | ||
| { | ||
| principalId: connectionCreatorIdentity.outputs.principalId | ||
| principalType: 'ServicePrincipal' | ||
| roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c' | ||
| } | ||
| ] | ||
| {{- end}} | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -315,14 +373,14 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = { | |
| keyVaultUrl: '${keyVault.outputs.uri}secrets/MONGODB-URL' | ||
| } | ||
| {{- end}} | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingUsernamePassword) }} | ||
| { | ||
| name: 'postgresql-password' | ||
| value: postgreSqlDatabasePassword | ||
| } | ||
| { | ||
| name: 'postgresql-db-url' | ||
| value: 'postgresql://${postgreSqlDatabaseUser}:${postgreSqlDatabasePassword}@${postgreServer.outputs.fqdn}:5432/${postgreSqlDatabaseName}' | ||
| } | ||
| {{- end}} | ||
| {{- if .DbRedis}} | ||
|
|
@@ -393,24 +451,38 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = { | |
| value: postgreServer.outputs.fqdn | ||
| } | ||
| { | ||
| name: 'POSTGRES_DATABASE' | ||
| value: postgreSqlDatabaseName | ||
| } | ||
| { | ||
| name: 'POSTGRES_PORT' | ||
| value: '5432' | ||
| } | ||
| { | ||
| name: 'SPRING_DATASOURCE_URL' | ||
| value: 'jdbc:postgresql://${postgreServer.outputs.fqdn}:5432/${postgreSqlDatabaseName}' | ||
|
Author
There was a problem hiding this comment.
|
||
| } | ||
| {{- end}} | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingUsernamePassword) }} | ||
| { | ||
| name: 'POSTGRES_URL' | ||
| secretRef: 'postgresql-db-url' | ||
|
Author
There was a problem hiding this comment. The |
||
| } | ||
| { | ||
| name: 'POSTGRES_USERNAME' | ||
| value: postgreSqlDatabaseUser | ||
| } | ||
| { | ||
| name: 'POSTGRES_PASSWORD' | ||
| secretRef: 'postgresql-password' | ||
| } | ||
| { | ||
| name: 'SPRING_DATASOURCE_USERNAME' | ||
| value: postgreSqlDatabaseUser | ||
| } | ||
| { | ||
| name: 'SPRING_DATASOURCE_PASSWORD' | ||
| secretRef: 'postgresql-password' | ||
| } | ||
| {{- end}} | ||
| {{- if .DbRedis}} | ||
|
|
@@ -574,6 +646,15 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = { | |
| environmentResourceId: containerAppsEnvironment.outputs.resourceId | ||
| location: location | ||
| tags: union(tags, { 'azd-service-name': '{{.Name}}' }) | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingManagedIdentity) }} | ||
| roleAssignments: [ | ||
| { | ||
| principalId: connectionCreatorIdentity.outputs.principalId | ||
| principalType: 'ServicePrincipal' | ||
| roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c' | ||
| } | ||
| ] | ||
| {{- end}} | ||
| } | ||
| } | ||
| {{- end}} | ||
|
|
@@ -627,10 +708,10 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.6.1' = { | |
| {{- end}} | ||
| ] | ||
| secrets: [ | ||
| {{- if (and .DbPostgres .DbPostgres.AuthUsingUsernamePassword) }} | ||
| { | ||
| name: 'postgresql-password' | ||
| value: postgreSqlDatabasePassword | ||
| } | ||
| {{- end}} | ||
| ] | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use different parameter name will make the bicep file easier to understand.