Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 7, 2024
1 parent 5b39533 commit 1d360d1
Show file tree
Hide file tree
Showing 19 changed files with 52 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# These owners will be the default owners for everything in the repo.
* @anmolnagpal @clouddrove-ci @clouddrove/terraform-azure-admins
* @anmolnagpal @clouddrove-ci @clouddrove/terraform-azure-admins
2 changes: 1 addition & 1 deletion .github/workflows/auto_assignee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
assignees: 'clouddrove-ci'
assignees: 'clouddrove-ci'
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
GITHUB: ${{ secrets.GITHUB }}
with:
tfcheck: 'complete-example / Check code format'
...
...
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
secrets: inherit
with:
branch: 'master'
branch: 'master'
2 changes: 1 addition & 1 deletion .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@master
secrets:
TOKEN : ${{ secrets.GITHUB }}
SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
4 changes: 2 additions & 2 deletions .github/workflows/tf-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
secrets: inherit
with:
working_directory: './examples/site-to-site/'

complete-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
secrets: inherit
Expand All @@ -21,4 +21,4 @@ jobs:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
secrets: inherit
with:
working_directory: './examples/point-to-site-with-certificate/'
working_directory: './examples/point-to-site-with-certificate/'
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
tf-lint:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
secrets:
GITHUB: ${{ secrets.GITHUB }}
GITHUB: ${{ secrets.GITHUB }}
2 changes: 1 addition & 1 deletion .github/workflows/tfsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
secrets: inherit
with:
working_directory: '.'
working_directory: '.'
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[1.0.0]: https://github.com/clouddrove/terraform-azure-acr/compare/1.0.0...master
[1.0.1]: https://github.com/clouddrove/terraform-azure-vpn/compare/1.0.0...1.0.1

[1.0.2]: https://github.com/clouddrove/terraform-azure-vpn/compare/1.0.1...1.0.2
[1.0.2]: https://github.com/clouddrove/terraform-azure-vpn/compare/1.0.1...1.0.2
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Terraform AZURE VPN
</h1>

<p align="center" style="font-size: 1.2rem;">
<p align="center" style="font-size: 1.2rem;">
Terraform module to create vpn resource on AZURE.
</p>

Expand Down Expand Up @@ -38,7 +38,7 @@
<hr>


We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.
We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.

This module is basically combination of [Terraform open source](https://www.terraform.io/) and includes automatation tests and examples. It also helps to create and improve your infrastructure with minimalistic code instead of maintaining the whole infrastructure code yourself.

Expand All @@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c

## Prerequisites

This module has a few dependencies:
This module has a few dependencies:

- [Terraform 1.x.x](https://learn.hashicorp.com/terraform/getting-started/install.html)
- [Go](https://golang.org/doc/install)
Expand Down Expand Up @@ -232,7 +232,7 @@ Here are some examples of how you can use this module in your inventory structur


## Testing
In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.
In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.

You need to run the following command in the testing folder:
```hcl
Expand All @@ -241,7 +241,7 @@ You need to run the following command in the testing folder:



## Feedback
## Feedback
If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/terraform-azure-vpn/issues), or feel free to drop us an email at [hello@clouddrove.com](mailto:hello@clouddrove.com).

If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-azure-vpn)!
Expand Down
3 changes: 0 additions & 3 deletions README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,3 @@ usage: |-
]
}
```
20 changes: 10 additions & 10 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ locals {
environment = "test"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Resource Group module call
## Resource group in which all resources will be deployed.
##-----------------------------------------------------------------------------
Expand All @@ -21,9 +21,9 @@ module "resource_group" {
location = "Canada Central"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Virtual Network module call.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
##-----------------------------------------------------------------------------
module "vnet" {
source = "clouddrove/vnet/azure"
Expand All @@ -35,9 +35,9 @@ module "vnet" {
address_space = "10.0.0.0/16"
}

##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
module "subnet" {
source = "clouddrove/subnet/azure"
Expand All @@ -62,7 +62,7 @@ module "subnet" {
]
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Log Analytics module call.
##-----------------------------------------------------------------------------
module "log-analytics" {
Expand All @@ -81,9 +81,9 @@ module "log-analytics" {
log_analytics_workspace_id = module.log-analytics.workspace_id
}

##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy point to site vpn in azure infratsructure.
##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy point to site vpn in azure infratsructure.
##-----------------------------------------------------------------------------
module "vpn" {
depends_on = [module.vnet]
Expand Down
1 change: 0 additions & 1 deletion examples/complete/output.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ output "vpn_gw_id" {
value = module.vpn.vpn_gw_id
description = "The ID of the Virtual Network Gateway."
}

2 changes: 1 addition & 1 deletion examples/complete/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ terraform {
version = ">=3.0.0"
}
}
}
}
20 changes: 10 additions & 10 deletions examples/point-to-site-with-certificate/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ locals {
environment = "test"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Resource Group module call
## Resource group in which all resources will be deployed.
##-----------------------------------------------------------------------------
Expand All @@ -21,9 +21,9 @@ module "resource_group" {
location = "Canada Central"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Virtual Network module call.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
##-----------------------------------------------------------------------------
module "vnet" {
source = "clouddrove/vnet/azure"
Expand All @@ -35,9 +35,9 @@ module "vnet" {
address_space = "10.0.0.0/16"
}

##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
module "subnet" {
source = "clouddrove/subnet/azure"
Expand All @@ -62,7 +62,7 @@ module "subnet" {
]
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Log Analytics module call.
##-----------------------------------------------------------------------------
module "log-analytics" {
Expand All @@ -81,9 +81,9 @@ module "log-analytics" {
log_analytics_workspace_id = module.log-analytics.workspace_id
}

##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy point to site vpn with ssl certificate in azure infratsructure.
##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy point to site vpn with ssl certificate in azure infratsructure.
##-----------------------------------------------------------------------------
module "vpn" {
source = "../../"
Expand Down
1 change: 0 additions & 1 deletion examples/point-to-site-with-certificate/output.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ output "vpn_gw_id" {
value = module.vpn.vpn_gw_id_certificate
description = "The ID of the Virtual Network Gateway."
}

2 changes: 1 addition & 1 deletion examples/point-to-site-with-certificate/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ terraform {
version = ">=3.0.0"
}
}
}
}
20 changes: 10 additions & 10 deletions examples/site-to-site/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ locals {
environment = "test"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Resource Group module call
## Resource group in which all resources will be deployed.
##-----------------------------------------------------------------------------
Expand All @@ -21,9 +21,9 @@ module "resource_group" {
location = "Canada Central"
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Virtual Network module call.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
## Virtual Network in which vpn subnet(Gateway Subnet) will be created.
##-----------------------------------------------------------------------------
module "vnet" {
source = "clouddrove/vnet/azure"
Expand All @@ -35,9 +35,9 @@ module "vnet" {
address_space = "10.0.0.0/16"
}

##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
## Subnet module call.
## Name specific subnet for vpn will be created.
##-----------------------------------------------------------------------------
module "subnet" {
source = "clouddrove/subnet/azure"
Expand All @@ -62,7 +62,7 @@ module "subnet" {
]
}

##-----------------------------------------------------------------------------
##-----------------------------------------------------------------------------
## Log Analytics module call.
##-----------------------------------------------------------------------------
module "log-analytics" {
Expand All @@ -81,9 +81,9 @@ module "log-analytics" {
log_analytics_workspace_id = module.log-analytics.workspace_id
}

##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy site to site vpn with ssl certificate in azure infratsructure.
##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy site to site vpn with ssl certificate in azure infratsructure.
##-----------------------------------------------------------------------------
module "vpn" {
depends_on = [module.vnet]
Expand Down
10 changes: 5 additions & 5 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ module "labels" {
}

##-----------------------------------------------------------------------------
## data block called for resource group.
## data block called for resource group.
##-----------------------------------------------------------------------------
data "azurerm_resource_group" "rg" {
name = var.resource_group_name
}

##-----------------------------------------------------------------------------
## Random string called
## Will be used further in public ip resource in domain name label.
## Will be used further in public ip resource in domain name label.
##-----------------------------------------------------------------------------
resource "random_string" "str" {
count = var.enable ? 1 : 0
Expand Down Expand Up @@ -100,7 +100,7 @@ resource "azurerm_virtual_network_gateway" "vpngw" {

##-----------------------------------------------------------------------------
## Virtual Network Gateway
## Following resource will deploy virtual network gateway with certificate.
## Following resource will deploy virtual network gateway with certificate.
##-----------------------------------------------------------------------------
resource "azurerm_virtual_network_gateway" "vpngw2" {
count = var.enable && var.vpn_with_certificate ? 1 : 0
Expand Down Expand Up @@ -202,7 +202,7 @@ resource "azurerm_virtual_network_gateway_connection" "az-hub-onprem" {
}

##-----------------------------------------------------------------------------
## Following resource will deploy diagnostic setting for virtual network gateway.
## Following resource will deploy diagnostic setting for virtual network gateway.
##-----------------------------------------------------------------------------
resource "azurerm_monitor_diagnostic_setting" "main" {
count = var.enable && var.diagnostic_setting_enable ? 1 : 0
Expand Down Expand Up @@ -233,7 +233,7 @@ resource "azurerm_monitor_diagnostic_setting" "main" {
}

##-----------------------------------------------------------------------------
## Following resource will deploy diagnostic setting for public ip.
## Following resource will deploy diagnostic setting for public ip.
##-----------------------------------------------------------------------------
resource "azurerm_monitor_diagnostic_setting" "pip_gw" {
count = var.enable && var.diagnostic_setting_enable ? 1 : 0
Expand Down

0 comments on commit 1d360d1

Please sign in to comment.