Skip to content

Commit

Permalink
Merge pull request #10 from clouddrove/azure_1
Browse files Browse the repository at this point in the history
feat: update github/workflows
  • Loading branch information
d4kverma authored Jan 2, 2024
2 parents 6376d78 + d4bfad0 commit 807153f
Show file tree
Hide file tree
Showing 17 changed files with 135 additions and 169 deletions.
4 changes: 4 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version = 1

[[analyzers]]
name = "terraform"
31 changes: 29 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,39 @@

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/" # 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
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/[email protected]
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
assignees: 'clouddrove-ci'
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
11 changes: 5 additions & 6 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1'
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.1'
uses: 'clouddrove/github-actions@9.0.3'
continue-on-error: true
with:
actions_subcommand: 'push'
Expand Down
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.

11 changes: 11 additions & 0 deletions .github/workflows/tf-checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: tf-checks
on:
push:
branches: [ master ]
pull_request:
workflow_dispatch:
jobs:
example:
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected]
with:
working_directory: './_example/'
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/[email protected]
secrets:
GITHUB: ${{ secrets.GITHUB }}
4 changes: 2 additions & 2 deletions .github/workflows/tfsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '.'
32 changes: 19 additions & 13 deletions README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ github_repo: clouddrove/terraform-azure-resource-group

# 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-resource-group.svg"
url: "https://github.com/clouddrove/terraform-azure-resource-group/releases/latest"
- name: "tfsec"
image: "https://github.com/clouddrove/terraform-azure-resource-group/actions/workflows/tfsec.yml/badge.svg"
url: "https://github.com/clouddrove/terraform-azure-resource-group/actions/workflows/tfsec.yml"
- name: "Licence"
image: "https://img.shields.io/badge/License-APACHE-blue.svg"
url: "LICENSE.md"
Expand All @@ -36,13 +39,16 @@ include:
usage: |-
### Simple Example
Here is an example of how you can use this module in your inventory structure:
```hcl
module "resource_group" {
source = "terraform/resource-group/azure"
version = "1.0.0"
environment = "test"
label_order = ["name","environment"]
name = "example"
location = "North Europe"
}
```
```hcl
module "resource_group" {
source = "terraform/resource-group/azure"
version = "1.0.0"
name = "example"
environment = "test"
location = "North Europe"
#resource lock
resource_lock_enabled = true
lock_level = "CanNotDelete"
}
```
11 changes: 4 additions & 7 deletions _example/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ provider "azurerm" {
}

module "resource_group" {
source = "../"

environment = "tested"
label_order = ["name", "environment", ]

name = "example"
location = "North Europe"
source = "../"
name = "example"
environment = "test"
location = "North Europe"

#resource lock
resource_lock_enabled = true
Expand Down
13 changes: 13 additions & 0 deletions _example/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Terraform version
terraform {
required_version = ">= 1.6.6"
}

terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = ">=3.85.0"
}
}
}
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ resource "azurerm_resource_group" "default" {
resource "azurerm_management_lock" "resource-group-level" {
count = var.enabled && var.resource_lock_enabled ? 1 : 0
name = format("%s-rg-lock", var.lock_level)
scope = azurerm_resource_group.default.*.id[0]
scope = azurerm_resource_group.default[0].id
lock_level = var.lock_level
notes = "This Resource Group is locked by terrafrom"
}
notes = var.notes
}
6 changes: 3 additions & 3 deletions outputs.tf
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
output "resource_group_id" {
value = join("", azurerm_resource_group.default.*.id)
value = azurerm_resource_group.default[0].id
description = "The ID of the Resource Group."
}

output "resource_group_name" {
value = join("", azurerm_resource_group.default.*.name)
value = azurerm_resource_group.default[0].name
description = "The Name which should be used for this Resource Group. Changing this forces a new Resource Group to be created."
}

output "resource_group_location" {
value = join("", azurerm_resource_group.default.*.location)
value = azurerm_resource_group.default[0].location
description = "The Azure Region where the Resource Group should exist. Changing this forces a new Resource Group to be created."
}

Expand Down
Loading

0 comments on commit 807153f

Please sign in to comment.