Skip to content

Commit 76992e9

Browse files
authored
Merge pull request #17 from masterpointio/fix/lifecycle_rules
fix: lifecycle rules + repo chores
2 parents 9aef4a9 + 83ff946 commit 76992e9

File tree

6 files changed

+89
-46
lines changed

6 files changed

+89
-46
lines changed

.editorconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Unix-style newlines with a newline ending every file
2+
[*]
3+
charset = utf-8
4+
end_of_line = lf
5+
indent_size = 2
6+
indent_style = space
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.{tf,tfvars}]
11+
indent_size = 2
12+
indent_style = space
13+
14+
[*.md]
15+
max_line_length = 0
16+
trim_trailing_whitespace = false
17+
18+
# Override for Makefile
19+
[{Makefile, makefile, GNUmakefile, Makefile.*}]
20+
tab_width = 2
21+
indent_style = tab
22+
indent_size = 4
23+
24+
[COMMIT_EDITMSG]
25+
max_line_length = 0

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Use this file to define individuals or teams that are responsible for code in a repository.
2+
# Read more: <https://help.github.com/articles/about-codeowners/>
3+
#
4+
# Order is important: the last matching pattern takes the most precedence
5+
6+
# These owners will be the default owners for everything
7+
* @masterpointio/masterpoint-internal

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## what
2+
* Describe high-level what changed as a result of these commits (i.e. in plain-english, what do these changes mean?)
3+
* Use bullet points to be concise and to the point.
4+
5+
## why
6+
* Provide the justifications for the changes (e.g. business case).
7+
* Describe why these changes were made (e.g. why do these commits fix the problem?)
8+
* Use bullet points to be concise and to the point.
9+
10+
## references
11+
* Link to any supporting github issues or helpful documentation to add some context (e.g. stackoverflow).
12+
* Use `closes #123`, if this PR closes a GitHub issue `#123`
13+

README.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,37 @@ Big shout out to the following projects which this project uses/depends on/menti
2323

2424
```hcl
2525
module "ssm_agent" {
26-
source = "git::https://github.com/masterpointio/terraform-aws-ssm-agent.git?ref=tags/0.1.0"
26+
source = "masterpointio/ssm-agent/aws"
27+
version = "0.15.1"
2728
stage = var.stage
2829
namespace = var.namespace
2930
vpc_id = module.vpc.vpc_id
3031
subnet_ids = module.subnets.private_subnet_ids
3132
}
3233
3334
module "vpc" {
34-
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.10.0"
35-
namespace = var.namespace
36-
stage = var.stage
37-
name = var.name
38-
cidr_block = "10.0.0.0/16"
35+
source = "cloudposse/vpc/aws"
36+
version = "2.1.0"
37+
38+
namespace = var.namespace
39+
stage = var.stage
40+
name = var.name
41+
42+
ipv4_primary_cidr_block = "10.0.0.0/16"
43+
assign_generated_ipv6_cidr_block = true
3944
}
4045
4146
module "subnets" {
42-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.19.0"
43-
availability_zones = var.availability_zones
44-
namespace = var.namespace
45-
stage = var.stage
46-
vpc_id = module.vpc.vpc_id
47-
igw_id = module.vpc.igw_id
48-
cidr_block = module.vpc.vpc_cidr_block
49-
nat_gateway_enabled = var.nat_gateway_enabled
50-
nat_instance_enabled = ! var.nat_gateway_enabled
47+
source = "cloudposse/dynamic-subnets/aws"
48+
version = "2.3.0"
49+
namespace = var.namespace
50+
stage = var.stage
51+
52+
availability_zones = var.availability_zones
53+
vpc_id = module.vpc.vpc_id
54+
igw_id = [module.vpc.igw_id]
55+
ipv4_cidr_block = [module.vpc.vpc_cidr_block]
56+
ipv6_enabled = var.ipv6_enabled
5157
}
5258
```
5359

examples/complete/main.tf

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,28 @@ provider "aws" {
33
}
44

55
module "vpc" {
6-
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.26.1"
7-
namespace = var.namespace
8-
stage = var.stage
9-
name = var.name
10-
cidr_block = "10.0.0.0/16"
6+
source = "cloudposse/vpc/aws"
7+
version = "2.1.0"
8+
9+
namespace = var.namespace
10+
stage = var.stage
11+
name = var.name
12+
13+
ipv4_primary_cidr_block = "10.0.0.0/16"
14+
assign_generated_ipv6_cidr_block = true
1115
}
1216

1317
module "subnets" {
14-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.39.3"
15-
availability_zones = var.availability_zones
16-
namespace = var.namespace
17-
stage = var.stage
18-
vpc_id = module.vpc.vpc_id
19-
igw_id = module.vpc.igw_id
20-
cidr_block = module.vpc.vpc_cidr_block
21-
nat_gateway_enabled = var.nat_gateway_enabled
22-
nat_instance_enabled = !var.nat_gateway_enabled
18+
source = "cloudposse/dynamic-subnets/aws"
19+
version = "2.3.0"
20+
namespace = var.namespace
21+
stage = var.stage
22+
23+
availability_zones = var.availability_zones
24+
vpc_id = module.vpc.vpc_id
25+
igw_id = [module.vpc.igw_id]
26+
ipv4_cidr_block = [module.vpc.vpc_cidr_block]
27+
ipv6_enabled = var.ipv6_enabled
2328
}
2429

2530
module "ssm_agent" {

main.tf

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -222,24 +222,11 @@ module "logs_bucket" {
222222
noncurrent_version_transition = [{
223223
noncurrent_days = 30
224224
storage_class = "GLACIER"
225-
},
226-
{
227-
noncurrent_days = 0
228-
storage_class = "DEEP_ARCHIVE"
229-
}]
225+
}, ]
230226
transition = [{
231-
days = 30
232-
storage_class = "STANDARD_IA"
233-
},
234-
{
235-
days = 90
236-
storage_class = "GLACIER"
237-
},
238-
{
239-
days = 0
240-
storage_class = "DEEP_ARCHIVE"
241-
242-
}]
227+
days = 90
228+
storage_class = "GLACIER"
229+
}, ]
243230
}]
244231
}
245232

0 commit comments

Comments
 (0)