Skip to content

Commit cbc27d8

Browse files
committed
Update terraform
1 parent 286442f commit cbc27d8

4 files changed

Lines changed: 17 additions & 12 deletions

File tree

.azuredevops/deploy-infrastructure.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- task: TerraformInstaller@0
2323
displayName: "Install Terraform"
2424
inputs:
25-
terraformVersion: "1.9.1"
25+
terraformVersion: "1.10.5"
2626

2727
- task: TerraformTaskV4@4
2828
displayName: "Initialize Terraform"
@@ -51,7 +51,7 @@ jobs:
5151
condition: eq(variables['terraformPlan.changesPresent'], 'true')
5252
inputs:
5353
command: "apply"
54-
commandOptions: "main.tfplan -var env=${{ parameters.environment }}"
54+
commandOptions: "main.tfplan"
5555
environmentServiceNameAzureRM: $(serviceConnection)
5656
provider: "azurerm"
5757
workingDirectory: "$(System.DefaultWorkingDirectory)/ops"

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.6.0
4+
rev: v5.0.0
55
hooks:
66
- id: trailing-whitespace
77
- id: end-of-file-fixer
@@ -11,13 +11,13 @@ repos:
1111
- --unsafe
1212

1313
- repo: https://github.com/charliermarsh/ruff-pre-commit
14-
rev: "v0.6.5"
14+
rev: "v0.9.4"
1515
hooks:
1616
- id: ruff
1717
- id: ruff-format
1818

1919
- repo: https://github.com/sirosen/check-jsonschema
20-
rev: 0.29.2
20+
rev: 0.31.1
2121
hooks:
2222
- id: check-github-workflows
2323
- id: check-github-actions
@@ -29,9 +29,10 @@ repos:
2929
args: [--format, parsable, --strict]
3030

3131
- repo: https://github.com/antonbabenko/pre-commit-terraform
32-
rev: v1.95.0
32+
rev: v1.97.0
3333
hooks:
3434
- id: terraform_fmt
35+
- id: terraform_tflint
3536

3637
- repo: https://github.com/sirwart/ripsecrets
3738
rev: v0.1.8

ops/providers.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ terraform {
33
required_providers {
44
azurerm = {
55
source = "hashicorp/azurerm"
6-
version = ">=3.111.0"
6+
version = "~> 4.17"
7+
}
8+
random = {
9+
source = "hashicorp/random"
10+
version = "~> 3.5"
711
}
812
}
913
backend "azurerm" {

ops/stack.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ resource "azurerm_resource_group" "af-rg" {
88
name = "af-rg-${var.env}"
99
location = var.region
1010
}
11-
resource "azurerm_storage_account" "example-sa" {
12-
name = "examplesa${var.env}${random_id.unique-id.hex}"
11+
resource "azurerm_storage_account" "main-sa" {
12+
name = "mainsa${var.env}${random_id.unique-id.hex}"
1313
resource_group_name = azurerm_resource_group.af-rg.name
1414
location = azurerm_resource_group.af-rg.location
1515
account_tier = "Standard"
@@ -32,9 +32,9 @@ resource "azurerm_storage_account" "example-sa" {
3232
}
3333
}
3434

35-
resource "azurerm_storage_container" "example" {
36-
name = "mycontainer"
37-
storage_account_name = azurerm_storage_account.example-sa.name
35+
resource "azurerm_storage_container" "main-container" {
36+
name = "mycontainer"
37+
storage_account_id = azurerm_storage_account.main-sa.id
3838
}
3939

4040
resource "azurerm_key_vault" "af-kv" {

0 commit comments

Comments
 (0)