Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 8 additions & 0 deletions terragrunt/accounts/legacy/rustup-prod/rustup/terragrunt.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
terraform {
source = "git::../../../../..//terragrunt/modules/rustup?ref=${trimspace(file("../deployed-ref"))}"
}

include {
path = find_in_parent_folders()
merge_strategy = "deep"
}
11 changes: 11 additions & 0 deletions terragrunt/modules/rustup/_terraform.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
terraform {
required_version = "~> 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.20"
}
}
}

51 changes: 51 additions & 0 deletions terragrunt/modules/rustup/s3.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# The rust-lang/rustup repository on GitHub builds and uploads Rustup artifacts
# to this S3 bucket.
resource "aws_s3_bucket" "builds" {
provider = aws.us-east-1

bucket = "rustup-builds"
}

module "aws_iam_user" {
source = "../gha-iam-user"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really be using OIDC for anything new, not IAM users.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a working configuration somewhere that we can either copy or extract into a module?

org = "rust-lang"
repo = "rustup"
}

data "aws_iam_policy_document" "upload_builds" {
statement {
sid = "WriteToRustupBuilds"
effect = "Allow"

actions = [
"s3:PutObject",
]

resources = ["${aws_s3_bucket.builds.arn}/*"]
}
}

resource "aws_iam_user_policy" "upload_builds" {
name = "upload-rustup-builds"
user = module.aws_iam_user.user_name
policy = data.aws_iam_policy_document.upload_builds.json
}

data "aws_iam_policy_document" "legacy_ci" {
statement {
sid = "WriteToDevStatic"
effect = "Allow"

actions = [
"s3:*",
]

resources = ["arn:aws:s3:::dev-static-rust-lang-org/rustup/*"]
}
}

resource "aws_iam_user_policy" "legacy_ci" {
name = "legacy-ci"
user = module.aws_iam_user.user_name
policy = data.aws_iam_policy_document.legacy_ci.json
}