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.

Sign up for GitHub

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

Jump to bottom

fix: update github/workflows version #12

Merged
merged 2 commits into from
Jan 9, 2024
Merged

fix: update github/workflows version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608dc68
fix: update github/workflows version
mamrajyadav Jan 2, 2024
7dafee8
fix: update automerge and workflows version
mamrajyadav Jan 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/auto_assignee.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
jobs:
assignee:
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].8
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].10
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/automerge.yml
View file
Open in desktop
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/[email protected]
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
tfcheck: 'example / Check code format'
...
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
jobs:
changelog:
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].8
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].10
secrets: inherit
with:
branch: 'master'
2 changes: 1 addition & 1 deletion .github/workflows/tf-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:
workflow_dispatch:
jobs:
example:
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].8
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].10
with:
working_directory: './_example/'
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ on:
workflow_dispatch:
jobs:
tf-lint:
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].8
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].10
secrets:
GITHUB: ${{ secrets.GITHUB }}
2 changes: 1 addition & 1 deletion .github/workflows/tfsec.yml
View file
Open in desktop
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/[email protected].8
uses: clouddrove/github-shared-workflows/.github/workflows/[email protected].10
secrets: inherit
with:
working_directory: '.'
3 changes: 3 additions & 0 deletions _example/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ provider "azurerm" {
features {}
}

##-----------------------------------------------------------------------------
## Resource Group module call.
##-----------------------------------------------------------------------------
module "resource_group" {
source = "../"
name = "example"
Expand Down
17 changes: 10 additions & 7 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
## Managed By : CloudDrove
## Copyright @ CloudDrove. All Right Reserved.

#Module : labels
#Description : Terraform module to create consistent naming for multiple names.
##-----------------------------------------------------------------------------
## Labels module callled that will be used for naming and tags.
##-----------------------------------------------------------------------------
module "labels" {
source = "clouddrove/labels/azure"
version = "1.0.0"
Expand All @@ -15,8 +13,10 @@ module "labels" {
repository = var.repository
}

#Module : RESOURCE GROUP
#Description : Terraform resource for resource group.
##-----------------------------------------------------------------------------
## Terraform resource for resource group.
## Azure automatically deletes any Resources nested within the Resource Group when a Resource Group is deleted.
##-----------------------------------------------------------------------------
resource "azurerm_resource_group" "default" {
count = var.enabled ? 1 : 0
name = format("%s-resource-group", module.labels.id)
Expand All @@ -31,6 +31,9 @@ resource "azurerm_resource_group" "default" {
}
}

##-----------------------------------------------------------------------------
## Manages a Management Lock which is scoped to a Subscription, Resource Group or Resource.
##-----------------------------------------------------------------------------
resource "azurerm_management_lock" "resource-group-level" {
count = var.enabled && var.resource_lock_enabled ? 1 : 0
name = format("%s-rg-lock", var.lock_level)
Expand Down
3 changes: 0 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ variable "enabled" {
description = "Flag to control the module creation."
}


## Resource Group

variable "location" {
type = string
default = null
Expand Down