Merge pull request #13 from clouddrove/azure_1

Azure 1
clouddrove · Jan 26, 2024 · d54ea1e · d54ea1e
2 parents bf9588e + 26eed41
commit d54ea1e
Show file tree

Hide file tree

Showing 26 changed files with 420 additions and 338 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,11 +5,54 @@
 
 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" # Location of package manifests
+    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/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
+
+
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.2.1
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      assignees: 'clouddrove-ci'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,12 @@
+---
+name: Auto merge
+on:
+  pull_request:
+jobs:
+  auto-merge:
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.2.1
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      tfcheck: 'complete / Get min/max versions'
+...
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   changelog:
-    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.2.1
     secrets: inherit
     with:
       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'

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,18 @@
+name: tf-checks
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+   complete-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1
+    with:
+      working_directory: './_example/complete/'
+
+   basic-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1
+    with:
+      working_directory: './_example/basic/'
+
+
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.2.1
+    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.2.1
     secrets: inherit
     with:
-      working_directory: '.'
+      working_directory: '.'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14 +1,21 @@
 repos:
-  - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.130.0
+
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.12 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
     hooks:
-      - id: terraform_fmt
-      - id: terraform_tflint
+      - id: terraform-fmt
+      - id: shellcheck
+      - id: tflint
 
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1 # Use the ref you want to point at
     hooks:
-      - id: check-merge-conflict
+      - id: end-of-file-fixer
       - id: trailing-whitespace
+      - id: mixed-line-ending
+      - id: check-byte-order-marker
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: debug-statements
       - id: check-yaml
       - id: check-added-large-files
diff --git a/README.yaml b/README.yaml
@@ -15,9 +15,12 @@ github_repo: clouddrove/terraform-azure-bastion
 
 # Badges to display
 badges:
-  - name: "Terraform"
-    image: "https://img.shields.io/badge/Terraform-v1.1.7-green"
-    url: "https://www.terraform.io"
+  - name: "Latest Release"
+    image: "https://img.shields.io/github/release/clouddrove/terraform-azure-bastion.svg"
+    url: "https://github.com/clouddrove/terraform-azure-bastion/releases/latest"
+  - name: "tfsec"
+    image: "https://github.com/clouddrove/terraform-azure-bastion/actions/workflows/tfsec.yml/badge.svg"
+    url: "https://github.com/clouddrove/terraform-azure-bastion/actions/workflows/tfsec.yml"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-APACHE-blue.svg"
     url: "LICENSE.md"
@@ -34,16 +37,19 @@ usage: |-
   Here are some examples of how you can use this module in your inventory structure:
   ```hcl
     module "bastion" {
-    source                              = "clouddrove/bastion/azure"
-    version                             = "1.0.0"
-    name                                = "app"
-    environment                         = "test"
-    resource_group_name                 = module.resource_group.resource_group_name
-    azure_bastion_subnet_address_prefix = ["10.0.5.0/24"]
-    virtual_network_name                = module.virtual_network.vnet_name[0]
+    source               = "clouddrove/bastion/azure"
+    version              = "1.0.0"
+    name                 = "app"
+    environment          = "test"
+    resource_group_name  = module.resource_group.resource_group_name
+    location             = module.resource_group.resource_group_location
+    virtual_network_name = module.vnet.vnet_name[0]
+    subnet_id            = module.name_specific_subnet.specific_subnet_id[0]
 
     #### enable diagnostic setting
-    diagnostic_setting_enable  = false
+    diagnostic_setting_enable  = true
     log_analytics_workspace_id = ""
-  }
+    }
   ```
+  
+  
diff --git a/_example/basic/example.tf b/_example/basic/example.tf
@@ -0,0 +1,21 @@
+provider "azurerm" {
+  features {}
+}
+
+##-----------------------------------------------------------------------------
+## Bastion module call.
+##-----------------------------------------------------------------------------
+module "bastion" {
+  source              = "./../../"
+  name                = "app"
+  environment         = "test"
+  resource_group_name = "resource_group_name"
+  location            = "Central India"
+  subnet_id           = "<subnet_id>"
+
+  ##-----------------------------------------------------------------------------
+  ## enable diagnostic setting
+  ##-----------------------------------------------------------------------------
+  diagnostic_setting_enable = false
+
+}
diff --git a/_example/basic/outputs.tf b/_example/basic/outputs.tf
@@ -0,0 +1,14 @@
+output "bastion_dns_name" {
+  value       = module.bastion.dns_name
+  description = "Specifies the name of the bastion host"
+}
+
+output "bastion_id" {
+  value       = module.bastion.id
+  description = "Specifies the name of the bastion host"
+}
+
+
+
+
+