Skip to content
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

fix:remove deprecations #30

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
da0116e
fix:remove deprecations
vjdbj Sep 13, 2024
a7a1d45
fix:update module according to latest version
vjdbj Sep 13, 2024
02939ef
fix:update formatting
vjdbj Sep 13, 2024
f4d994c
fix:removed lints
vjdbj Sep 13, 2024
132bf63
fix:added variable types
vjdbj Sep 13, 2024
a71d9a6
fix:removed unused variables
vjdbj Sep 13, 2024
bc357bd
fix:updated variable types
vjdbj Sep 13, 2024
b1a876f
fix:removed lints again
vjdbj Sep 13, 2024
44aad7b
fix: fixed all the changes mentioned in comments
vjdbj Sep 16, 2024
afcbc52
fix: added changes mentioned in pr comments
vjdbj Sep 16, 2024
ac3effc
fix: fixed README.yaml
vjdbj Sep 18, 2024
6f2dba7
fix: added log analytics in examples and fixed diagnostic settings
vjdbj Sep 20, 2024
50a8d08
fix: removed lints
vjdbj Sep 20, 2024
c9c32ad
Fix: Updated CODEOWNERS
vjdbj Sep 24, 2024
35ed11d
fix: fixed output.tf
vjdbj Oct 7, 2024
b1101c2
fix: fixed precommit
vjdbj Oct 7, 2024
61d3645
fix: pre-commit config file
vjdbj Oct 8, 2024
74a852b
fix: changed config file
vjdbj Oct 8, 2024
461f3ac
fix: fixed pre-commit config file
vjdbj Oct 8, 2024
c8efeb5
fix: fixed tf lints, docs and fmt
vjdbj Oct 8, 2024
9a1b7e0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 8, 2024
6e3855d
fix: fixed pre-commits
vjdbj Oct 8, 2024
6b69adc
fix: pre-commit errors
vjdbj Oct 9, 2024
f6db79a
fix: pre-commit errors
vjdbj Oct 9, 2024
0f2f09f
fix: pre-commit errors
vjdbj Oct 10, 2024
6fb8578
fix: added terraform binary
vjdbj Oct 11, 2024
e6fb744
fix: added terraform binary
vjdbj Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
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
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ updates:
schedule:
interval: "weekly"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/point-to-site-with-ad" # Location of package manifests
directory: "examples/complete" # Location of package manifests
schedule:
interval: "weekly"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/point-to-site-with-certificate" # Location of package manifests
directory: "examples/point-to-site-with-certificate" # Location of package manifests
schedule:
interval: "weekly"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/site-to-site" # Location of package manifests
directory: "examples/site-to-site" # Location of package manifests
schedule:
interval: "weekly"
14 changes: 14 additions & 0 deletions .github/workflows/auto_assignee.yml
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'
12 changes: 12 additions & 0 deletions .github/workflows/automerge.yml
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'
...
59 changes: 10 additions & 49 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,15 @@
name: 'Create README.md file'
name: Readme Workflow
on:
push:
branches:
- master

paths-ignore:
- 'README.md'
- 'docs/**'
workflow_dispatch:
jobs:
readme-create:
name: 'readme-create'
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@master

- name: 'Set up Python 3.7'
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: 'create readme'
uses: 'clouddrove/github-actions@v9.0.2'
with:
actions_subcommand: 'readme'
github_token: '${{ secrets.GITHUB }}'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


- name: 'pre-commit check errors'
uses: pre-commit/action@v2.0.0
continue-on-error: true

- name: 'pre-commit fix erros'
uses: pre-commit/action@v2.0.0
continue-on-error: true

- name: 'push readme'
uses: 'clouddrove/github-actions@v9.0.2'
continue-on-error: true
with:
actions_subcommand: 'push'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: 'Slack Notification'
uses: clouddrove/action-slack@v2
with:
status: ${{ job.status }}
fields: repo,author
author_name: 'CloudDrove'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
if: always()
README:
uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@master
secrets:
TOKEN : ${{ secrets.GITHUB }}
SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
30 changes: 0 additions & 30 deletions .github/workflows/semantic-releaser.yml

This file was deleted.

74 changes: 0 additions & 74 deletions .github/workflows/static-checks.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/tf-checks.yml
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:
site-to-site-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
secrets: inherit
with:
working_directory: './examples/site-to-site/'

complete-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
secrets: inherit
with:
working_directory: './examples/complete/'

point-to-site-with-certificate-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
secrets: inherit
with:
working_directory: './examples/point-to-site-with-certificate/'
11 changes: 11 additions & 0 deletions .github/workflows/tflint.yml
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 }}
28 changes: 23 additions & 5 deletions README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# Name of this project
name : Terraform AZURE VPN
name: Terraform AZURE VPN

# License of this project
license: "APACHE"
Expand All @@ -18,18 +18,36 @@ badges:
- name: "Terraform"
image: "https://img.shields.io/badge/Terraform-v1.1.7-green"
url: "https://www.terraform.io"
- name: "tfsec"
image: "https://github.com/clouddrove/terraform-azure-vpn/actions/workflows/tfsec.yml/badge.svg"
url: "https://github.com/clouddrove/terraform-azure-vpn/actions/workflows/tfsec.yml"
- name: "Licence"
image: "https://img.shields.io/badge/License-APACHE-blue.svg"
url: "LICENSE.md"
- name: "Changelog"
image: "https://img.shields.io/badge/Changelog-blue"
url: "CHANGELOG.md"

# Prerequesties to display
prerequesties:
- name: Terraform
url: https://learn.hashicorp.com/terraform/getting-started/install.html
version: ">= 1.0.0"

providers:
- name: azure
url: https://azure.microsoft.com/
version: ">= 3.0.0"

module_dependencies:
- name: Labels Module
url: https://github.com/clouddrove/terraform-azure-labels
description: Provides resource tagging.

# description of this project
description: |-
Terraform module to create vpn resource on AZURE.
# extra content
include:
- "terraform.md"

# How to use this project
# How to use this project
usage: |-
Here are some examples of how you can use this module in your inventory structure:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider "azurerm" {
features {}
subscription_id = ""
subscription_id = "000000-11111-1223-XXX-XXXXXXXXXXXX"
}

locals {
Expand Down Expand Up @@ -41,15 +41,15 @@ module "vnet" {
##-----------------------------------------------------------------------------
module "subnet" {
source = "clouddrove/subnet/azure"
version = "1.0.2"
version = "1.2.1"
name = local.name
environment = local.environment
resource_group_name = module.resource_group.resource_group_name
location = module.resource_group.resource_group_location
virtual_network_name = join("", module.vnet.vnet_name)
#subnet
specific_name_subnet = true
specific_subnet_names = "GatewaySubnet"
specific_subnet_names = ["GatewaySubnet"]
subnet_prefixes = ["10.0.1.0/24"]
# route_table
enable_route_table = false
Expand All @@ -62,6 +62,25 @@ module "subnet" {
]
}

##-----------------------------------------------------------------------------
## Log Analytics module call.
##-----------------------------------------------------------------------------
module "log-analytics" {
source = "clouddrove/log-analytics/azure"
version = "1.1.0"
name = local.name
environment = local.environment
create_log_analytics_workspace = true
log_analytics_workspace_sku = "PerGB2018"
retention_in_days = 90
daily_quota_gb = "-1"
internet_ingestion_enabled = true
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
}

##-----------------------------------------------------------------------------
## VPN module call.
## Following module will deploy point to site vpn in azure infratsructure.
Expand All @@ -84,5 +103,5 @@ module "vpn" {
}
#### enable diagnostic setting
diagnostic_setting_enable = false
log_analytics_workspace_id = ""
log_analytics_workspace_id = module.log-analytics.workspace_id
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
output "vpn_gw_id" {
value = join("", module.vpn.*.vpn_gw_id)
value = module.vpn.vpn_gw_id
description = "The ID of the Virtual Network Gateway."
}

13 changes: 13 additions & 0 deletions examples/complete/version.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Terraform version
terraform {
required_version = ">= 1.0.0"
}

terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = ">=3.0.0"
}
}
}
Loading