Skip to content

Commit 535b2ba

Browse files
oliversalzburgoliversalzburg
committed
feat: Mess up everything
1 parent 38ac66b commit 535b2ba

File tree

27 files changed

+434
-182
lines changed

27 files changed

+434
-182
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ insert_final_newline = true
99

1010
[*.md]
1111
indent_size = 4
12+
13+
[Makefile]
14+
indent_style = tab

‎.github/workflows/infra-test.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ jobs:
2929
- name: Format Checkout
3030
run: terraform fmt -check -diff -recursive terraform
3131

32-
- name: Run tflint
33-
run: |
34-
podman run --rm -v $(pwd):/data -t ghcr.io/terraform-linters/tflint --init
35-
podman run --rm -v $(pwd):/data -t ghcr.io/terraform-linters/tflint --recursive
32+
- name: Lint
33+
run: make lint
3634

3735
- name: Environment Info
3836
run: |

‎Makefile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apply:
2+
tofu -chdir=terraform apply
3+
4+
init:
5+
tofu -chdir=terraform init
6+
7+
lint:
8+
podman run --rm -v $(shell pwd):/data -t --entrypoint /bin/sh ghcr.io/terraform-linters/tflint -c "tflint --init && tflint --recursive"
9+
10+
plan:
11+
tofu -chdir=terraform plan
12+
13+
pretty:
14+
tofu -chdir=terraform fmt -recursive .
15+
16+
upgrade:
17+
tofu -chdir=terraform init -upgrade

‎terraform/.terraform.lock.hcl‎

Lines changed: 51 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎terraform/README.md‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,24 @@
66
| Name | Version |
77
|------|---------|
88
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.8.2 |
9-
| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.7.0 |
10-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.97.0 |
9+
| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.7.1 |
10+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.98.0 |
11+
| <a name="requirement_github"></a> [github](#requirement\_github) | 6.6.0 |
1112

1213
## Providers
1314

14-
| Name | Version |
15-
|------|---------|
16-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.97.0 |
17-
| <a name="provider_aws.global"></a> [aws.global](#provider\_aws.global) | 5.97.0 |
15+
No providers.
1816

1917
## Modules
2018

2119
| Name | Source | Version |
2220
|------|--------|---------|
23-
| <a name="module_kitten_science_website"></a> [kitten\_science\_website](#module\_kitten\_science\_website) | ./modules/kitten-science-website | n/a |
24-
| <a name="module_kitten_science_website_beta10"></a> [kitten\_science\_website\_beta10](#module\_kitten\_science\_website\_beta10) | ./modules/kitten-science-website | n/a |
25-
| <a name="module_kitten_science_website_beta8"></a> [kitten\_science\_website\_beta8](#module\_kitten\_science\_website\_beta8) | ./modules/kitten-science-website | n/a |
26-
| <a name="module_kitten_science_website_beta9"></a> [kitten\_science\_website\_beta9](#module\_kitten\_science\_website\_beta9) | ./modules/kitten-science-website | n/a |
21+
| <a name="module_scm"></a> [scm](#module\_scm) | ./github | n/a |
22+
| <a name="module_web"></a> [web](#module\_web) | ./aws | n/a |
2723

2824
## Resources
2925

30-
| Name | Type |
31-
|------|------|
32-
| [aws_cloudfront_response_headers_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/cloudfront_response_headers_policy) | resource |
33-
| [aws_iam_policy.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/iam_policy) | resource |
34-
| [aws_iam_role.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/iam_role) | resource |
35-
| [aws_iam_role_policy_attachment.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/iam_role_policy_attachment) | resource |
36-
| [aws_route53_record.github_validation](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/route53_record) | resource |
37-
| [aws_route53_record.google_validation](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/route53_record) | resource |
38-
| [aws_s3_bucket.logs](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket) | resource |
39-
| [aws_s3_bucket.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket) | resource |
40-
| [aws_s3_bucket_acl.logs](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_acl) | resource |
41-
| [aws_s3_bucket_lifecycle_configuration.logs](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_lifecycle_configuration) | resource |
42-
| [aws_s3_bucket_logging.logs](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_logging) | resource |
43-
| [aws_s3_bucket_ownership_controls.logs](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_ownership_controls) | resource |
44-
| [aws_s3_bucket_ownership_controls.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_ownership_controls) | resource |
45-
| [aws_s3_bucket_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_policy) | resource |
46-
| [aws_s3_bucket_public_access_block.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/resources/s3_bucket_public_access_block) | resource |
47-
| [aws_canonical_user_id.current](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/canonical_user_id) | data source |
48-
| [aws_cloudfront_log_delivery_canonical_user_id.current](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/cloudfront_log_delivery_canonical_user_id) | data source |
49-
| [aws_iam_policy_document.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/iam_policy_document) | data source |
50-
| [aws_iam_policy_document.maintainer_assume_role](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/iam_policy_document) | data source |
51-
| [aws_iam_policy_document.this](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/iam_policy_document) | data source |
52-
| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.97.0/docs/data-sources/route53_zone) | data source |
26+
No resources.
5327

5428
## Inputs
5529

‎terraform/aws/README.md‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# aws
2+
3+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
4+
## Requirements
5+
6+
| Name | Version |
7+
|------|---------|
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.8.2 |
9+
| <a name="requirement_archive"></a> [archive](#requirement\_archive) | >=2.7.1 |
10+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >=5.98.0 |
11+
12+
## Providers
13+
14+
| Name | Version |
15+
|------|---------|
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >=5.98.0 |
17+
| <a name="provider_aws.global"></a> [aws.global](#provider\_aws.global) | >=5.98.0 |
18+
19+
## Modules
20+
21+
| Name | Source | Version |
22+
|------|--------|---------|
23+
| <a name="module_kitten_science_website"></a> [kitten\_science\_website](#module\_kitten\_science\_website) | ./modules/kitten-science-website | n/a |
24+
| <a name="module_kitten_science_website_beta10"></a> [kitten\_science\_website\_beta10](#module\_kitten\_science\_website\_beta10) | ./modules/kitten-science-website | n/a |
25+
| <a name="module_kitten_science_website_beta8"></a> [kitten\_science\_website\_beta8](#module\_kitten\_science\_website\_beta8) | ./modules/kitten-science-website | n/a |
26+
| <a name="module_kitten_science_website_beta9"></a> [kitten\_science\_website\_beta9](#module\_kitten\_science\_website\_beta9) | ./modules/kitten-science-website | n/a |
27+
28+
## Resources
29+
30+
| Name | Type |
31+
|------|------|
32+
| [aws_cloudfront_response_headers_policy.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_response_headers_policy) | resource |
33+
| [aws_iam_policy.maintainer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
34+
| [aws_iam_role.maintainer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
35+
| [aws_iam_role_policy_attachment.maintainer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
36+
| [aws_route53_record.github_validation](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_record) | resource |
37+
| [aws_route53_record.google_validation](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_record) | resource |
38+
| [aws_s3_bucket.logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
39+
| [aws_s3_bucket.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
40+
| [aws_s3_bucket_acl.logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_acl) | resource |
41+
| [aws_s3_bucket_lifecycle_configuration.logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_lifecycle_configuration) | resource |
42+
| [aws_s3_bucket_logging.logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_logging) | resource |
43+
| [aws_s3_bucket_ownership_controls.logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_ownership_controls) | resource |
44+
| [aws_s3_bucket_ownership_controls.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_ownership_controls) | resource |
45+
| [aws_s3_bucket_policy.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_policy) | resource |
46+
| [aws_s3_bucket_public_access_block.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block) | resource |
47+
| [aws_canonical_user_id.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/canonical_user_id) | data source |
48+
| [aws_cloudfront_log_delivery_canonical_user_id.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/cloudfront_log_delivery_canonical_user_id) | data source |
49+
| [aws_iam_policy_document.maintainer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
50+
| [aws_iam_policy_document.maintainer_assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
51+
| [aws_iam_policy_document.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
52+
| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/route53_zone) | data source |
53+
54+
## Inputs
55+
56+
| Name | Description | Type | Default | Required |
57+
|------|-------------|------|---------|:--------:|
58+
| <a name="input_bucket_name"></a> [bucket\_name](#input\_bucket\_name) | Name of the S3 bucket to store web content in. | `string` | n/a | yes |
59+
| <a name="input_domain_name"></a> [domain\_name](#input\_domain\_name) | Name of the Route53 domain to use. | `string` | n/a | yes |
60+
61+
## Outputs
62+
63+
No outputs.
64+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎terraform/data.tf‎ renamed to ‎terraform/aws/data.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
data "aws_route53_zone" "kitten_science" {
2-
name = local.domain_name
2+
name = var.domain_name
33
}
44

55
data "aws_cloudfront_log_delivery_canonical_user_id" "current" {}

‎terraform/iam.tf‎ renamed to ‎terraform/aws/iam.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data "aws_iam_policy_document" "maintainer_assume_role" {
3131
}
3232
}
3333
resource "aws_iam_role" "maintainer" {
34-
name = "${local.bucket_name}-maintainer"
34+
name = "${var.bucket_name}-maintainer"
3535
assume_role_policy = data.aws_iam_policy_document.maintainer_assume_role.json
3636
}
3737

@@ -54,7 +54,7 @@ data "aws_iam_policy_document" "maintainer" {
5454
}
5555
}
5656
resource "aws_iam_policy" "maintainer" {
57-
name = "${local.bucket_name}-maintainer"
57+
name = "${var.bucket_name}-maintainer"
5858
description = "Allows changing the Kitten Science website."
5959
policy = data.aws_iam_policy_document.maintainer.json
6060
}

0 commit comments

Comments
 (0)