Skip to content

Commit fc9f867

Browse files
committed
more cleanup
1 parent ba7b8c1 commit fc9f867

File tree

6 files changed

+74
-29
lines changed

6 files changed

+74
-29
lines changed

.devcontainer/onCreate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://
1616
sudo apt update
1717
sudo apt-get install -y terraform
1818

19-
# Install Azure CLI
19+
# Install AWS CLI
2020
# TODO move this into base image
21-
sudo apt-get install -y azure-cli
21+
sudo apt-get install -y awscli

terraform/.terraform.lock.hcl

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

terraform/README.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,14 @@ export AWS_ACCESS_KEY_ID="your-access-key"
4040
export AWS_SECRET_ACCESS_KEY="your-secret-key"
4141
```
4242

43-
### 2. Set GitHub Token
44-
45-
You need a GitHub Personal Access Token with `repo` and `workflow` scopes:
46-
47-
```bash
48-
export TF_VAR_github_token="your-github-token"
49-
```
50-
51-
Or create a `terraform.tfvars` file:
52-
53-
```hcl
54-
github_token = "your-github-token"
55-
```
56-
57-
### 3. Initialize Terraform
43+
### 2. Initialize Terraform
5844

5945
```bash
6046
cd terraform
6147
terraform init
6248
```
6349

64-
### 4. Review and Customize Variables
50+
### 3. Review and Customize Variables
6551

6652
Edit `variables.tf` or create `terraform.tfvars` to customize:
6753

terraform/elasticache.tf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ resource "aws_elasticache_cluster" "redis" {
1616
security_group_ids = [aws_security_group.redis.id]
1717
port = var.redis_port
1818

19-
# Enable auth token for security
20-
auth_token = random_password.redis_auth_token.result
2119
transit_encryption_enabled = true
22-
at_rest_encryption_enabled = true
2320

2421
# Maintenance and backup
2522
maintenance_window = "sun:05:00-sun:06:00"
@@ -36,7 +33,7 @@ resource "aws_elasticache_cluster" "redis" {
3633

3734
# ElastiCache Parameter Group
3835
resource "aws_elasticache_parameter_group" "redis" {
39-
name_prefix = "${var.name_prefix}-redis-"
36+
name = "${var.name_prefix}-redis"
4037
family = "redis7"
4138
description = "Custom parameter group for ${var.name_prefix} Redis"
4239

terraform/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,3 @@ variable "github_repo" {
137137
type = string
138138
default = "drupal-example"
139139
}
140-
141-
variable "github_token" {
142-
description = "GitHub personal access token for pulling Docker images"
143-
type = string
144-
sensitive = true
145-
}

terraform/waf.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ resource "aws_wafv2_web_acl_association" "alb" {
127127

128128
# Configure WAF Logging to CloudWatch
129129
# Logs all traffic evaluated by the WAF (including blocked and allowed requests)
130-
resource "aws_wafv2_logging_configuration" "alb" {
130+
resource "aws_wafv2_web_acl_logging_configuration" "alb" {
131131
resource_arn = aws_wafv2_web_acl.alb.arn
132132
log_destination_configs = [aws_cloudwatch_log_group.waf.arn]
133133

0 commit comments

Comments
 (0)