Skip to content

Commit 7dd3b71

Browse files
committed
Upgrade terraform version 0.14
1 parent 5b4d265 commit 7dd3b71

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.43.0
3+
rev: v1.45.0
44
hooks:
55
- id: terraform_fmt
66

77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v3.2.0
8+
rev: v3.4.0
99
hooks:
1010
- id: check-merge-conflict
1111
- id: check-yaml

README.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-security-group
1616
# Badges to display
1717
badges:
1818
- name: "Terraform"
19-
image: "https://img.shields.io/badge/terraform-v0.13-green"
19+
image: "https://img.shields.io/badge/terraform-v0.14-green"
2020
url: "https://www.terraform.io"
2121
- name: "Licence"
2222
image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -40,12 +40,12 @@ usage: |-
4040
# use this
4141
module "security_group" {
4242
source = "clouddrove/security-group/aws"
43-
version = "0.13.0"
43+
version = "0.14.0"
4444
name = "security-group"
45-
application = "clouddrove"
45+
repository = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
4646
environment = "test"
4747
protocol = "tcp"
48-
label_order = ["environment", "application", "name"]
48+
label_order = ["name", "environment"]
4949
vpc_id = "vpc-xxxxxxxxx"
5050
allowed_ip = ["172.16.0.0/16", "10.0.0.0/16"]
5151
allowed_ipv6 = ["2405:201:5e00:3684:cd17:9397:5734:a167/128"]

_example/example.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ provider "aws" {
44

55
module "vpc" {
66
source = "clouddrove/vpc/aws"
7-
version = "0.13.0"
7+
version = "0.14.0"
88
name = "vpc"
9-
application = "clouddrove"
9+
repository = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
1010
environment = "test"
11-
label_order = ["environment", "application", "name"]
11+
label_order = ["name", "environment"]
1212
cidr_block = "10.0.0.0/16"
1313
}
1414

1515
module "security_group" {
1616
source = "./../"
1717

1818
name = "security-group"
19-
application = "clouddrove"
19+
repository = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
2020
environment = "test"
21-
label_order = ["environment", "application", "name"]
21+
label_order = ["name", "environment"]
2222
vpc_id = module.vpc.vpc_id
2323
protocol = "tcp"
2424
description = "Instance default security group (only egress access is allowed)."

variables.tf

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ variable "name" {
66
description = "Name (e.g. `app` or `cluster`)."
77
}
88

9-
variable "application" {
9+
variable "repository" {
1010
type = string
1111
default = ""
12-
description = "Application (e.g. `cd` or `clouddrove`)."
12+
description = "Terraform current module repo"
13+
14+
validation {
15+
# regex(...) fails if it cannot find a match
16+
condition = can(regex("^https://", var.repository))
17+
error_message = "The module-repo value must be a valid Git repo link."
18+
}
1319
}
1420

1521
variable "environment" {
@@ -20,8 +26,8 @@ variable "environment" {
2026

2127
variable "managedby" {
2228
type = string
23-
default = "anmol@clouddrove.com"
24-
description = "ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'."
29+
default = "hello@clouddrove.com"
30+
description = "ManagedBy, eg 'CloudDrove'."
2531
}
2632

2733
variable "label_order" {
@@ -48,6 +54,7 @@ variable "vpc_id" {
4854
type = string
4955
default = ""
5056
description = "The ID of the VPC that the instance security group belongs to."
57+
sensitive = true
5158
}
5259

5360
variable "description" {
@@ -60,18 +67,21 @@ variable "allowed_ports" {
6067
type = list
6168
default = []
6269
description = "List of allowed ingress ports."
70+
sensitive = true
6371
}
6472

6573
variable "allowed_ip" {
6674
type = list
6775
default = []
6876
description = "List of allowed ip."
77+
sensitive = true
6978
}
7079

7180
variable "security_groups" {
7281
type = list(string)
7382
default = []
7483
description = "List of Security Group IDs allowed to connect to the instance."
84+
sensitive = true
7585
}
7686

7787
variable "protocol" {
@@ -83,9 +93,12 @@ variable "allowed_ipv6" {
8393
type = list
8494
default = []
8595
description = "List of allowed ipv6."
96+
sensitive = true
8697
}
8798
variable "prefix_list" {
8899
type = list
89100
default = []
90101
description = "List of prefix list IDs (for allowing access to VPC endpoints)Only valid with egress"
102+
sensitive = true
103+
91104
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Terraform version
22
terraform {
3-
required_version = ">= 0.12.0, < 0.14.0"
3+
required_version = ">= 0.12.0, < 0.15.0"
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"

0 commit comments

Comments
 (0)