Upgrade to aws provider 4.x in releases/

This brings in a few new resources, which will be useful when merging #108.

The code delta is a no-op at plan time (after importing the new resources from
S3 bucket resource expansion in 4.x).

Author: Mark-Simulacrum

terraform/releases/.terraform.lock.hcl

@@ -6,7 +6,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.59"
+      version = "~> 4.20"
     }
     external = {
       source  = "hashicorp/external"
@@ -33,14 +33,12 @@ data "terraform_remote_state" "shared" {
 }
 
 provider "aws" {
-  profile = "default"
-  region  = "us-west-1"
+  region = "us-west-1"
 }
 
 provider "aws" {
-  profile = "default"
-  region  = "us-east-1"
-  alias   = "east1"
+  region = "us-east-1"
+  alias  = "east1"
 }
 
 data "aws_caller_identity" "current" {}

terraform/releases/_terraform.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = "~> 3.59"
+      version               = "~> 4.20"
       configuration_aliases = [aws.east1]
     }
   }

terraform/releases/impl/main.tf

@@ -1,33 +1,56 @@
 resource "aws_s3_bucket" "static" {
   bucket = var.bucket
-  acl    = "public-read"
+}
+
+resource "aws_s3_bucket_versioning" "static" {
+  bucket = aws_s3_bucket.static.bucket
 
-  versioning {
-    enabled = true
+  versioning_configuration {
+    status = "Enabled"
   }
+}
 
+resource "aws_s3_bucket_acl" "static" {
+  bucket = aws_s3_bucket.static.id
+  acl    = "public-read"
+}
+
+resource "aws_s3_bucket_cors_configuration" "static" {
+  bucket = aws_s3_bucket.static.id
   cors_rule {
     allowed_origins = ["*"]
     allowed_methods = ["GET"]
     max_age_seconds = 3000
     allowed_headers = ["Authorization"]
   }
+}
+
 
-  website {
-    index_document = "index.html"
-    error_document = "doc/nightly/not_found.html"
+resource "aws_s3_bucket_website_configuration" "static" {
+  bucket = aws_s3_bucket.static.id
+  index_document {
+    suffix = "index.html"
+  }
+  error_document {
+    key = "doc/nightly/not_found.html"
   }
+}
+
+resource "aws_s3_bucket_lifecycle_configuration" "static" {
+  bucket = aws_s3_bucket.static.id
 
   // Some files (such as the nightly tarballs) are overridden daily, creating
   // a bunch of old versions nobody cares about. This cleans up those files,
   // while keeping the past 3 months archived in case we need to rollback.
-  lifecycle_rule {
-    id      = "remove-old-versions"
-    enabled = true
+  rule {
+    id     = "remove-old-versions"
+    status = "Enabled"
 
-    abort_incomplete_multipart_upload_days = 2
+    abort_incomplete_multipart_upload {
+      days_after_initiation = 2
+    }
     noncurrent_version_expiration {
-      days = 90
+      noncurrent_days = 90
     }
   }
 }

terraform/releases/impl/storage.tf

@@ -10,21 +10,26 @@ locals {
 
 resource "aws_s3_bucket" "release_keys" {
   bucket = "rust-release-keys"
-  acl    = "private"
+}
 
-  versioning {
-    enabled = true
-  }
+resource "aws_s3_bucket_server_side_encryption_configuration" "release_keys" {
+  bucket = aws_s3_bucket.release_keys.bucket
 
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        sse_algorithm = "AES256"
-      }
+  rule {
+    apply_server_side_encryption_by_default {
+      sse_algorithm = "AES256"
     }
   }
 }
 
+resource "aws_s3_bucket_versioning" "release_keys" {
+  bucket = aws_s3_bucket.release_keys.bucket
+
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
 resource "aws_s3_bucket_public_access_block" "release_keys" {
   bucket = aws_s3_bucket.release_keys.id
 

terraform/releases/keys.tf

@@ -6,7 +6,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.59"
+      version = "~> 4.20"
     }
   }
 }

terraform/shared/modules/acm-certificate/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.59"
+      version = "~> 4.20"
     }
   }
 }