Skip to content

Commit 95e5be4

Browse files
authored
Merge pull request #710 from rust-lang/metrics-initiative
Create AWS account for metrics-initiative
2 parents 5e92af8 + fe0bd19 commit 95e5be4

File tree

15 files changed

+221
-2
lines changed

15 files changed

+221
-2
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"aws": {
3+
"profile": "metrics-initiative-prod",
4+
"regions": [
5+
{
6+
"region": "us-east-2"
7+
}
8+
]
9+
}
10+
}

terragrunt/accounts/metrics-initiative-prod/datadog-aws/.terraform.lock.hcl

Lines changed: 47 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
terraform {
2+
source = "../../../modules//datadog-aws"
3+
}
4+
5+
include {
6+
path = find_in_parent_folders()
7+
merge_strategy = "deep"
8+
}
9+
10+
inputs = {
11+
env = "prod"
12+
}

terragrunt/accounts/metrics-initiative-prod/grafana/.terraform.lock.hcl

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
terraform {
2+
source = "../../../..//terragrunt/modules/grafana"
3+
}
4+
5+
include {
6+
path = find_in_parent_folders()
7+
merge_strategy = "deep"
8+
}
9+
10+
inputs = {
11+
workspace_name = "metrics-initiative-prod"
12+
}

terragrunt/accounts/metrics-initiative-prod/wiz/.terraform.lock.hcl

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
terraform {
2+
source = "../../../..//terragrunt/modules/wiz"
3+
}
4+
5+
include {
6+
path = find_in_parent_folders()
7+
merge_strategy = "deep"
8+
}

terragrunt/accounts/root/aws-organization/terragrunt.hcl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,11 @@ inputs = {
9393
9494
groups = ["release"]
9595
}
96+
"yaahc" = {
97+
given_name = "Jane"
98+
family_name = "Losare-Lusby"
99+
100+
groups = ["metrics-initiative"]
101+
}
96102
}
97103
}

terragrunt/modules/aws-organization/accounts.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ resource "aws_organizations_account" "ci_prod" {
5151
name = "ci-prod"
5252
5353
}
54+
55+
resource "aws_organizations_account" "metrics_initiative_prod" {
56+
name = "metrics-initiative-prod"
57+
58+
}

terragrunt/modules/aws-organization/groups.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ resource "aws_identitystore_group" "crates_io" {
3535
description = "The crates.io team"
3636
}
3737

38+
resource "aws_identitystore_group" "metrics_initiative" {
39+
identity_store_id = local.identity_store_id
40+
41+
display_name = "metrics-initiative"
42+
description = "The metrics-initiative team"
43+
}
44+
3845
resource "aws_identitystore_group" "triagebot" {
3946
identity_store_id = local.identity_store_id
4047

@@ -348,6 +355,18 @@ locals {
348355
permissions : [aws_ssoadmin_permission_set.read_only_access] },
349356
]
350357
},
358+
# metrics initiative prod
359+
{
360+
account : aws_organizations_account.metrics_initiative_prod,
361+
groups : [
362+
{ group : aws_identitystore_group.infra-admins,
363+
permissions : [aws_ssoadmin_permission_set.read_only_access, aws_ssoadmin_permission_set.administrator_access] },
364+
{ group : aws_identitystore_group.infra,
365+
permissions : [aws_ssoadmin_permission_set.read_only_access] },
366+
{ group : aws_identitystore_group.metrics_initiative,
367+
permissions : [aws_ssoadmin_permission_set.read_only_access] },
368+
]
369+
},
351370
]
352371
}
353372

0 commit comments

Comments
 (0)