Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: assets bucket policy #485

Merged
merged 15 commits into from
Nov 28, 2024
Merged

fix: assets bucket policy #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e9cdf47
fix: updated cdn module
Wi11Shell Nov 27, 2024
75cdeb7
fix: remove original bucket ref
Wi11Shell Nov 27, 2024
11f049d
fix: duplicate ref
Wi11Shell Nov 27, 2024
2ed246d
fix: asset bucket attribute
Wi11Shell Nov 27, 2024
e61ec49
fix: removed unused ref
Wi11Shell Nov 27, 2024
0f677f6
fix: asset bucket issue
barkerl Nov 27, 2024
ab98a22
fix: provider issue
barkerl Nov 27, 2024
4b40c27
fix: provider issue pt 2
barkerl Nov 27, 2024
cc7d02d
fix: update lock files
barkerl Nov 27, 2024
29232db
fix: include .gitignore files and remove lock files to resolve issues…
barkerl Nov 28, 2024
d74d78c
fix: bucket name using local
barkerl Nov 28, 2024
96038f7
docs: update Terraform docs
github-actions[bot] Nov 28, 2024
f0f00ca
fix: tf-formatting
Wi11Shell Nov 28, 2024
c445427
fix: remove sts assume role from assets bucket
Wi11Shell Nov 28, 2024
a581ea4
fix: lint - remove unused variable
Wi11Shell Nov 28, 2024
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
2 changes: 0 additions & 2 deletions infra/terraform/accounts/nonprod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ module "environment-remote-state" {
module "account" {
source = "../../modules/account"

assets_bucket_policy_role = "OLCS-DEVAPPCI-DEVCI-OLCSCISLAVE"

create_ecr_resources = true
create_assets_bucket = true
create_github_resources = true
Expand Down
2 changes: 0 additions & 2 deletions infra/terraform/accounts/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ module "environment-remote-state" {
module "account" {
source = "../../modules/account"

assets_bucket_policy_role = "OLCS-APPCI-CI-OLCSCISLAVE"

create_ecr_resources = true
create_assets_bucket = true
create_github_resources = true
Expand Down
1 change: 0 additions & 1 deletion infra/terraform/modules/account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_assets_bucket_policy_role"></a> [assets\_bucket\_policy\_role](#input\_assets\_bucket\_policy\_role) | Assets bucket policy role | `string` | `""` | no |
| <a name="input_create_assets_bucket"></a> [create\_assets\_bucket](#input\_create\_assets\_bucket) | Whether to create the assets bucket. | `bool` | `false` | no |
| <a name="input_create_ecr_resources"></a> [create\_ecr\_resources](#input\_create\_ecr\_resources) | Whether to create the ECR resources. | `bool` | `false` | no |
| <a name="input_create_github_resources"></a> [create\_github\_resources](#input\_create\_github\_resources) | Whether to create the GitHub resources. | `bool` | `false` | no |
Expand Down
4 changes: 0 additions & 4 deletions infra/terraform/modules/account/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ data "aws_iam_policy_document" "s3_policy" {
type = "Service"
identifiers = ["cloudfront.amazonaws.com"]
}
principals {
type = "AWS"
identifiers = ["arn:aws:sts::${local.account_id}:assumed-role/${var.assets_bucket_policy_role}"]
}
}
}

Expand Down
6 changes: 0 additions & 6 deletions infra/terraform/modules/account/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,3 @@ variable "create_assets_bucket" {
description = "Whether to create the assets bucket."
default = false
}

variable "assets_bucket_policy_role" {
type = string
description = "Assets bucket policy role "
default = ""
}
Loading