Merge pull request #18 from clouddrove/azure_1

fix: update code and add tf latest version
clouddrove · Jan 2, 2024 · fdadd26 · fdadd26
2 parents c09c2f8 + 09cf297
commit fdadd26
Show file tree

Hide file tree

Showing 25 changed files with 345 additions and 294 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -0,0 +1,4 @@
+version = 1
+
+[[analyzers]]
+name = "terraform"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,15 +5,65 @@
 
 version: 2
 updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 3
+    assignees:
+      - "clouddrove-ci"
+    reviewers:
+      - "approvers"
+
   - package-ecosystem: "terraform" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
+
   - package-ecosystem: "terraform" # See documentation for possible values
-    directory: "_example/basic" # Location of package manifests
+    directory: "/_example/basic" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
+
+  - package-ecosystem: "terraform" # See documentation for possible values
+    directory: "/_example/complete" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
+
   - package-ecosystem: "terraform" # See documentation for possible values
-    directory: "_example/complete" # Location of package manifests
+    directory: "/_example/vnet_with_existing_ddos_id" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
@@ -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@1.0.8
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      assignees: 'clouddrove-ci'
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
@@ -6,8 +6,8 @@ on:
       - "*"
   workflow_dispatch:
 jobs:
-  call-workflow-changelog:
-    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
+  changelog:
+    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.8
     secrets: inherit
     with:
-      branch: 'master'
+      branch: 'master'
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -13,29 +13,28 @@ jobs:
         uses: actions/checkout@master
 
       - name: 'Set up Python 3.7'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v9.0.2'
+        uses: 'clouddrove/github-actions@9.0.3'
         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
+        uses: pre-commit/action@v3.0.0
         continue-on-error: true
 
       - name: 'pre-commit fix erros'
-        uses: pre-commit/action@v2.0.0
+        uses: pre-commit/action@v3.0.0
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v9.0.2'
+        uses: 'clouddrove/github-actions@9.0.3'
         continue-on-error: true
         with:
           actions_subcommand: 'push'
@@ -51,4 +50,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()
diff --git a/.github/workflows/semantic-releaser.yml b/.github/workflows/semantic-releaser.yml
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
@@ -0,0 +1,21 @@
+name: tf-checks
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+  basic-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
+    with:
+      working_directory: './_example/basic/'
+
+  complete-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
+    with:
+      working_directory: './_example/complete/'
+
+  vnet_with_existing_ddos_id-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.8
+    with:
+      working_directory: './_example/vnet_with_existing_ddos_id/'
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -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@1.0.8
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 jobs:
   tfsec:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.8
     secrets: inherit
     with:
-      working_directory: '.'
+      working_directory: '.'
diff --git a/README.yaml b/README.yaml
@@ -16,9 +16,12 @@ github_repo: clouddrove/terraform-azure-vnet
 
 # Badges to display
 badges:
-  - name: "Terraform"
-    image: "https://img.shields.io/badge/Terraform-v1.0.0-green"
-    url: "https://www.terraform.io"
+  - name: "Latest Release"
+    image: "https://img.shields.io/github/release/clouddrove/terraform-azure-vnet.svg"
+    url: "https://github.com/clouddrove/terraform-azure-vnet/releases/latest"
+  - name: "tfsec"
+    image: "https://github.com/clouddrove/terraform-azure-vnet/actions/workflows/tfsec.yml/badge.svg"
+    url: "https://github.com/clouddrove/terraform-azure-vnet/actions/workflows/tfsec.yml"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-APACHE-blue.svg"
     url: "LICENSE.md"
@@ -34,17 +37,43 @@ include:
 # How to use this project
 # yamllint disable rule:line-length
 usage: |-
-  ### Simple Example
   Here is an example of how you can use this module in your inventory structure:
+  ### Basic Example
   ```hcl
-  module "virtual-network" {
-   source                 = "clouddrove/vnet/azure"
-   name                   = "app"
-   environment            = "test"
-   label_order            = ["name", "environment"]
-   resource_group_name    = module.resource_group.resource_group_name
-   location               = module.resource_group.resource_group_location
-   address_space          = "10.0.0.0/16"
-   enable_network_watcher = false # To be set true when network security group flow logs are to be tracked and network watcher with specific name is to be deployed. 
-   }
-    ```
+    module "vnet" {
+    source                 = "clouddrove/vnet/azure"
+    name                   = local.name
+    environment            = local.environment
+    resource_group_name    = "testsg"
+    location               = "NorthEurope"
+    address_space          = "10.0.0.0/16"
+    enable_network_watcher = false # To be set true when network security group flow logs are to be tracked and network watcher with specific name is to be deployed.
+    }
+ ```
+ ### Complete Example
+  ```hcl
+    module "vnet" {
+    source                 = "clouddrove/vnet/azure"
+    name                   = local.name
+    environment            = local.environment
+    resource_group_name    = module.resource_group.resource_group_name
+    location               = module.resource_group.resource_group_location
+    address_space          = "10.0.0.0/16"
+    enable_ddos_pp         = false
+    enable_network_watcher = false # To be set true when network security group flow logs are to be tracked and network watcher with specific name is to be deployed.
+    }
+  ```
+  ### vnet_with_existing_ddos_id Example
+  ```hcl
+    module "vnet" {
+    source                 = "clouddrove/vnet/azure"
+    name                   = local.name
+    environment            = local.environment
+    resource_group_name    = module.resource_group.resource_group_name
+    location               = module.resource_group.resource_group_location
+    address_space          = "10.0.0.0/16"
+    existing_ddos_pp       = "/subscriptions/068245d4-3c94-42fe-9c4d-9e5e1cabc60c/resourceGroups/"
+    enable_network_watcher = false
+    }
+  ```
+
diff --git a/_example/basic/example.tf b/_example/basic/example.tf
@@ -1,18 +1,21 @@
+provider "azurerm" {
+  features {}
+}
+
 locals {
   name        = "app"
   environment = "test"
-  label_order = ["name", "environment"]
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Virtual Network module call.
 ##-----------------------------------------------------------------------------
 module "vnet" {
   source                 = "../../"
   name                   = local.name
   environment            = local.environment
-  resource_group_name    = "app-test"
+  resource_group_name    = "testrg"
   location               = "NorthEurope"
-  address_space          = "10.0.0.0/16"
-  enable_network_watcher = false # To be set true when network security group flow logs are to be tracked and network watcher with specific name is to be deployed. 
-}
+  address_spaces         = ["10.0.0.0/16"]
+  enable_network_watcher = false # To be set true when network security group flow logs are to be tracked and network watcher with specific name is to be deployed.
+}