Skip to content

Commit

Permalink
Merge branch 'main' into continuous-deployment-cloudflare
Browse files Browse the repository at this point in the history
  • Loading branch information
LesnyRumcajs authored Nov 3, 2023
2 parents 67d7b92 + f15b022 commit d47a521
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 16 deletions.
2 changes: 1 addition & 1 deletion composite-action/terraform/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
with:
terraform_version: v1.5.7
terraform_version: v1.6.3

- name: Terraform Init
run: terraform init
Expand Down
7 changes: 5 additions & 2 deletions terraform/daily_snapshot/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ terraform {
region = "us-west-1"
# The S3 region is determined by the endpoint. fra1 = Frankfurt.
# This region does not have to be shared by the droplet.
endpoint = "https://fra1.digitaloceanspaces.com"

endpoints = {
s3 = "https://fra1.digitaloceanspaces.com"
}
# Credentially can be validated through the Security Token Service (STS).
# Unfortunately, DigitalOcean does not support STS so we have to skip the
# validation.
skip_credentials_validation = "true"
skip_requesting_account_id = "true"
skip_s3_checksum = "true"
}
}

Expand Down
1 change: 1 addition & 0 deletions terraform/daily_snapshot/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ terraform {
# Unfortunately, DigitalOcean does not support STS so we have to skip the
# validation.
skip_credentials_validation = "true"
skip_s3_checksum = "true"
}
}

Expand Down
12 changes: 8 additions & 4 deletions terraform/forest-calibnet/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ terraform {
required_version = ">= 1.2"

backend "s3" {
bucket = "forest-iac"
key = "forest-calibnet/terraform.tfstate"
region = "us-west-1"
endpoint = "fra1.digitaloceanspaces.com"
bucket = "forest-iac"
key = "forest-calibnet/terraform.tfstate"
region = "us-west-1"
endpoints = {
s3 = "https://fra1.digitaloceanspaces.com"
}
skip_credentials_validation = true
skip_metadata_api_check = true
skip_requesting_account_id = true
skip_s3_checksum = true
}
}

Expand Down
12 changes: 8 additions & 4 deletions terraform/forest-mainnet/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ terraform {
required_version = "~> 1.3"

backend "s3" {
bucket = "forest-iac"
key = "forest_mainnet/terraform.tfstate"
region = "us-west-1"
endpoint = "fra1.digitaloceanspaces.com"
bucket = "forest-iac"
key = "forest_mainnet/terraform.tfstate"
region = "us-west-1"
endpoints = {
s3 = "https://fra1.digitaloceanspaces.com"
}
skip_credentials_validation = true
skip_metadata_api_check = true
skip_requesting_account_id = true
skip_s3_checksum = true
}
}

Expand Down
12 changes: 8 additions & 4 deletions terraform/new-relic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ terraform {
}
}
backend "s3" {
bucket = "forest-iac"
key = "new_relic/terraform.tfstate"
region = "us-west-1"
endpoint = "fra1.digitaloceanspaces.com"
bucket = "forest-iac"
key = "new_relic/terraform.tfstate"
region = "us-west-1"
endpoints = {
s3 = "https://fra1.digitaloceanspaces.com"
}
skip_credentials_validation = true
skip_metadata_api_check = true
skip_requesting_account_id = true
skip_s3_checksum = true
}
}

Expand Down
6 changes: 5 additions & 1 deletion terraform/sync_check/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ terraform {
region = "us-west-1"
# The S3 region is determined by the endpoint. fra1 = Frankfurt.
# This region does not have to be shared by the droplet.
endpoint = "https://fra1.digitaloceanspaces.com"
endpoints = {
s3 = "fra1.digitaloceanspaces.com"
}

# Credentially can be validated through the Security Token Service (STS).
# Unfortunately, DigitalOcean does not support STS so we have to skip the
# validation.
skip_credentials_validation = "true"
skip_requesting_account_id = "true"
skip_s3_checksum = "true"
}
}

Expand Down

0 comments on commit d47a521

Please sign in to comment.