-
Notifications
You must be signed in to change notification settings - Fork 1
fix:update azurerm version #41
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.
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
Merged
Merged
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
2bfdcb0
fix:update azurerm version
vishal-cd 6ac5dc3
fix:fixed formatting
vishal-cd e0cd9c5
fix:fixed tflint warnings
vishal-cd 90643e1
fix:fixed errors due to tflint
vishal-cd 562e132
fix: updated random provider
vishal-cd 6e469c8
fix: ran tf fmt
vishal-cd 2c84383
fix: tflint warnings
vishal-cd 9b1daa9
fix: removed unused variables
vishal-cd 06ad1a4
fix:fixed tflint errors and removed unused variables
vishal-cd 665d708
fix:fixed automerge workflow
vishal-cd fbfd4f0
fix:fixed yaml syntax error in automerge workflow
vishal-cd 68e5a6c
fix:removed subscription id
vishal-cd 2478adf
Added resource for data encryption
vishal-cd 3e5084a
Fix:Added network_acls in vault
vishal-cd b332a11
Fix:fixed variables
vishal-cd 5663a91
Fix:fixed git repo link in precommit ci
vishal-cd da3a5e2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2ce6dbd
Fix:removed lints
vishal-cd 368d760
updated .pre-commit-config file
vishal-cd 1a4a752
fix: fixed subscription_id
vishal-cd 66fd2e8
fix:configured name and environment from locals in vault module
vishal-cd c8cd09a
Merge branch 'master' into fix/version-upgrade
dverma-cd f3a1c96
fix mysql server naming
dverma-cd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,2 @@ | ||
| .github/* @clouddrove/approvers | ||
|
|
||
| * @clouddrove/clouddrovians @clouddrove/approvers | ||
|
|
||
| .github/mergify.yml @clouddrove/admins | ||
| .github/CODEOWNERS @clouddrove/admins | ||
| # These owners will be the default owners for everything in the repo. | ||
| * @anmolnagpal @clouddrove-ci @clouddrove/terraform-azure-admins |
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| name: Auto Assign PRs | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened] | ||
|
|
||
| workflow_dispatch: | ||
| jobs: | ||
| assignee: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master | ||
| secrets: | ||
| GITHUB: ${{ secrets.GITHUB }} | ||
| with: | ||
| assignees: 'clouddrove-ci' |
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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| name: Auto merge | ||
| on: | ||
| pull_request: | ||
| jobs: | ||
| auto-merge: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@master | ||
| secrets: | ||
| GITHUB: ${{ secrets.GITHUB }} | ||
| with: | ||
| tfcheck: 'complete-example / Check code format' | ||
| ... |
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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: tf-checks | ||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| pull_request: | ||
| workflow_dispatch: | ||
| jobs: | ||
| complete-example: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master | ||
| secrets: inherit | ||
| with: | ||
| working_directory: './examples/complete/' | ||
|
|
||
| basic-example: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master | ||
| secrets: inherit | ||
| with: | ||
| working_directory: './examples/basic/' | ||
|
|
||
| mysql-flexible-server-replication-example: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master | ||
| secrets: inherit | ||
| with: | ||
| working_directory: './examples/mysql-flexible-server-replication/' |
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 |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| name: tf-lint | ||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| pull_request: | ||
| workflow_dispatch: | ||
| jobs: | ||
| tf-lint: | ||
| uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master | ||
| secrets: | ||
| GITHUB: ${{ secrets.GITHUB }} |
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
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 |
|---|---|---|
| @@ -1,10 +1,19 @@ | ||
| provider "azurerm" { | ||
| features {} | ||
| subscription_id = "068245d4-3c94-42fe-9c4d-9e5e1cabc60c" | ||
| } | ||
|
|
||
| provider "azurerm" { | ||
| features {} | ||
| alias = "peer" | ||
| subscription_id = "068245d4-3c94-42fe-9c4d-9e5e1cabc60c" | ||
| } | ||
|
|
||
| data "azurerm_client_config" "current_client_config" {} | ||
|
|
||
| locals { | ||
| name = "app" | ||
| environment = "test" | ||
| name = "lacoster-23" | ||
| environment = "maximum-32" | ||
| label_order = ["name", "environment"] | ||
| } | ||
|
|
||
|
|
@@ -60,12 +69,52 @@ module "subnet" { | |
| } | ||
| } | ||
|
|
||
| ##----------------------------------------------------------------------------- | ||
| ## Key Vault module call. | ||
| ##----------------------------------------------------------------------------- | ||
| module "vault" { | ||
| source = "clouddrove/key-vault/azure" | ||
| version = "1.2.0" | ||
|
|
||
| providers = { | ||
| azurerm.dns_sub = azurerm.peer, | ||
| azurerm.main_sub = azurerm | ||
| } | ||
|
|
||
| name = "oliveware-23" | ||
|
||
| environment = "vilod-32" | ||
| label_order = ["name", "environment", ] | ||
| resource_group_name = module.resource_group.resource_group_name | ||
| location = module.resource_group.resource_group_location | ||
| admin_objects_ids = [data.azurerm_client_config.current_client_config.object_id] | ||
| virtual_network_id = module.vnet.vnet_id[0] | ||
| subnet_id = module.subnet.default_subnet_id[0] | ||
| enable_rbac_authorization = true | ||
| enabled_for_disk_encryption = false | ||
| #private endpoint | ||
| enable_private_endpoint = false | ||
| network_acls = null | ||
| ########Following to be uncommnented only when using DNS Zone from different subscription along with existing DNS zone. | ||
|
|
||
| # diff_sub = true | ||
| # alias = "" | ||
| # alias_sub = "" | ||
|
|
||
| #########Following to be uncommmented when using DNS zone from different resource group or different subscription. | ||
| # existing_private_dns_zone = "" | ||
| # existing_private_dns_zone_resource_group_name = "" | ||
|
|
||
| #### enable diagnostic setting | ||
| diagnostic_setting_enable = false | ||
| log_analytics_workspace_id = module.log-analytics.workspace_id ## when diagnostic_setting_enable enable, add log analytics workspace id | ||
| } | ||
|
||
|
|
||
| ##----------------------------------------------------------------------------- | ||
| ## Log Analytics module call. | ||
| ##----------------------------------------------------------------------------- | ||
| module "log-analytics" { | ||
| source = "clouddrove/log-analytics/azure" | ||
| version = "1.0.1" | ||
| version = "1.1.0" | ||
| name = local.name | ||
| environment = local.environment | ||
| label_order = local.label_order | ||
|
|
@@ -77,35 +126,37 @@ module "log-analytics" { | |
| internet_query_enabled = true | ||
| resource_group_name = module.resource_group.resource_group_name | ||
| log_analytics_workspace_location = module.resource_group.resource_group_location | ||
| log_analytics_workspace_id = module.log-analytics.workspace_id | ||
| } | ||
|
|
||
| ##----------------------------------------------------------------------------- | ||
| ## Flexible Mysql server module call. | ||
| ##----------------------------------------------------------------------------- | ||
| module "flexible-mysql" { | ||
| depends_on = [module.resource_group, module.vnet] | ||
| source = "../../" | ||
| name = local.name | ||
| environment = local.environment | ||
| resource_group_name = module.resource_group.resource_group_name | ||
| location = module.resource_group.resource_group_location | ||
| virtual_network_id = module.vnet.vnet_id[0] | ||
| delegated_subnet_id = module.subnet.default_subnet_id[0] | ||
| mysql_version = "8.0.21" | ||
| mysql_server_name = "testmysqlserver" | ||
| private_dns = true | ||
| zone = "1" | ||
| admin_username = "mysqlusername" | ||
| admin_password = "ba5yatgfgfhdsv6A3ns2lu4gqzzc" | ||
| sku_name = "GP_Standard_D8ds_v4" | ||
| db_name = "maindb" | ||
| charset = "utf8mb3" | ||
| collation = "utf8mb3_unicode_ci" | ||
| auto_grow_enabled = true | ||
| iops = 360 | ||
| size_gb = "20" | ||
| ##azurerm_mysql_flexible_server_configuration | ||
| depends_on = [module.resource_group, module.vnet, module.vault] | ||
| source = "../../" | ||
| name = local.name | ||
| environment = local.environment | ||
| resource_group_name = module.resource_group.resource_group_name | ||
| location = module.resource_group.resource_group_location | ||
| virtual_network_id = module.vnet.vnet_id[0] | ||
| delegated_subnet_id = module.subnet.default_subnet_id[0] | ||
| mysql_version = "8.0.21" | ||
| private_dns = true | ||
| zone = "1" | ||
| admin_username = "mysqlusername" | ||
| admin_password = "ba5yatgfgfhdsv6A3ns2lu4gqzzc" | ||
| sku_name = "GP_Standard_D8ds_v4" | ||
| db_name = "maindb" | ||
| charset = "utf8mb3" | ||
| collation = "utf8mb3_unicode_ci" | ||
| auto_grow_enabled = true | ||
| iops = 360 | ||
| size_gb = "20" | ||
| server_configuration_names = ["interactive_timeout", "audit_log_enabled", "audit_log_events"] | ||
| values = ["600", "ON", "CONNECTION,ADMIN,DDL,TABLE_ACCESS"] | ||
| log_analytics_workspace_id = module.log-analytics.workspace_id | ||
| key_vault_id = module.vault.id | ||
| key_vault_with_rbac = true | ||
| cmk_enabled = true | ||
| } | ||
Oops, something went wrong.
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.
Please revert it to
appandtestThere 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.
done