Merge pull request #62 from opzkit/source_hash

fix: use source_hash instead of etag since KMS handles etag
opzkit · Sep 26, 2023 · 50d9b3f · 50d9b3f
2 parents ddbef00 + 8d7ded8
commit 50d9b3f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/k8s.tf b/k8s.tf
@@ -1,21 +1,21 @@
 resource "aws_s3_object" "extra_addons" {
-  for_each = { for a in local.addons : "${a.name}-${a.version}" => a }
-  bucket   = var.bucket_state_store.id
-  acl      = "private"
-  key      = "${var.name}-addons/${each.value.name}/v${each.value.version}.yaml"
-  content  = each.value.content
-  etag     = md5(each.value.content)
-  tags     = {}
-  metadata = {}
+  for_each    = { for a in local.addons : "${a.name}-${a.version}" => a }
+  bucket      = var.bucket_state_store.id
+  acl         = "private"
+  key         = "${var.name}-addons/${each.value.name}/v${each.value.version}.yaml"
+  content     = each.value.content
+  source_hash = md5(each.value.content)
+  tags        = {}
+  metadata    = {}
 }
 
 resource "aws_s3_object" "addons" {
-  bucket   = var.bucket_state_store.id
-  key      = "${var.name}-addons/addon.yaml"
-  content  = local.addons_yaml
-  etag     = md5(local.addons_yaml)
-  tags     = {}
-  metadata = {}
+  bucket      = var.bucket_state_store.id
+  key         = "${var.name}-addons/addon.yaml"
+  content     = local.addons_yaml
+  source_hash = md5(local.addons_yaml)
+  tags        = {}
+  metadata    = {}
 }
 
 resource "kops_cluster" "k8s" {

diff --git a/s3.tf b/s3.tf
@@ -11,7 +11,7 @@ resource "aws_s3_bucket_ownership_controls" "issuer" {
 }
 
 resource "aws_s3_bucket_public_access_block" "issuer" {
-  bucket = aws_s3_bucket.issuer.id
+  bucket                  = aws_s3_bucket.issuer.id
   block_public_acls       = false
   block_public_policy     = false
   ignore_public_acls      = false