Migrated to new s3 bucket

Author: xnoto

Makefile

@@ -6,7 +6,7 @@ S3_KEY        := $(shell sops decrypt secrets/secrets.yaml | grep ^s3_key
 S3_ACCESS_KEY := $(shell sops decrypt secrets/secrets.yaml | grep ^s3_access_key | cut -d ' ' -f 2)
 S3_SECRET_KEY := $(shell sops decrypt secrets/secrets.yaml | grep ^s3_secret_key | cut -d ' ' -f 2)
 
-.PHONY: help init plan apply test pre-commit-check-deps pre-commit-install-hooks argcd-login
+.PHONY: help init plan apply migrate test pre-commit-check-deps pre-commit-install-hooks argcd-login
 
 help:
 	@echo "General targets"
@@ -22,6 +22,7 @@ help:
 	@echo "\ttest: run pre-commmit checks"
 	@echo "\tplan: run 'terraform plan'"
 	@echo "\tapply: run 'terraform apply'"
+	@echo "\tmigrate; run terraform init -migrate-state"
 	@echo
 	@echo "One-time repo init targets"
 	@echo "--------------------------"
@@ -47,6 +48,9 @@ apply: test plan
 	@${TERRAFORM} apply -auto-approve -compact-warnings .terraform/plan
 	@rm -f .terraform/plan
 
+migrate: init
+	@${TERRAFORM} init -migrate-state -upgrade -input=false -backend-config="key=${S3_KEY}" -backend-config="bucket=${S3_BUCKET}" -backend-config="region=${S3_REGION}" -backend-config="access_key=${S3_ACCESS_KEY}" -backend-config="secret_key=${S3_SECRET_KEY}"
+
 test: .git/hooks/pre-commit
 	@pre-commit run -a
 

secrets/secrets.yaml

@@ -4,8 +4,8 @@ cloudflare_auth_client_id: ENC[AES256_GCM,data:VB1wVTx/Ty1vYkDTD/oYmlOijZCXyA0LK
 cloudflare_auth_client_secret: ENC[AES256_GCM,data:h2v8SarCEPXSZCAqpZBifWfNSOaFDuDumvLZENnBrldqw0u2OIr49wrnEJbkUCqcMIBWjYyp3eOl/UQ04Suyfg==,iv:eanDpbCPKz0vSNEqHr1cNC+K2M1dkwDKpfpJf46BOv0=,tag:/+VEro+OVjMXnORwou4Rpw==,type:str]
 ssh_user: ENC[AES256_GCM,data:YWSAXA==,iv:1Bri+4KYE6UeDL/XKhn/JVjDR3yQEF8dbXTMOavdR74=,tag:mT0WBdryoLiy7uTXnZYeJA==,type:str]
 ssh_host: ENC[AES256_GCM,data:gPoiBur4Bh6n2CgvBQnhGfomCg4=,iv:IC6AAmk1T2bGqlg6YY7yeMZAsE99xKoHlNajYSQZDwo=,tag:sogFq7S9G5WpmK7wvYb8Vw==,type:str]
-s3_bucket: ENC[AES256_GCM,data:FG3xizlGuRE=,iv:o+JtDRtzUBGE3wZ3mxtpH0Pd8eQVxb84Et4tcugR4Pc=,tag:kdTHdDAObh3mAWUHoeIdnw==,type:str]
-s3_key: ENC[AES256_GCM,data:E7VyakrYdQ==,iv:+uIn3H31mrSsB2pbMZ44+qIQRa1hbFlCHATBmX1MlXE=,tag:s3oXsuftdR6u0XKKLTYWAw==,type:str]
+s3_bucket: ENC[AES256_GCM,data:sbsol2huTZPIrXQUUGbNmFZqRkQ=,iv:i/rAaTPmnY9SzRBm+Y++mpNIo08BuLqvei4NBHjhzE4=,tag:NBNsG5p9/Q6Yub4Ax4oQKw==,type:str]
+s3_key: ENC[AES256_GCM,data:UJGeRgfK2BOxr+XAkz74PSgHwic=,iv:gAvEWLrIlYaAYHuAWG1h8z/B1E0IN0a6Qhc/wcyNr74=,tag:q9JGP9MCfoy4eh7BhYrDqQ==,type:str]
 s3_region: ENC[AES256_GCM,data:bW9LX1MvGLUW,iv:XsmnFQ7xqKnOeAwQ6Fgyexvn9YXQIDtZTJm1PJYckxA=,tag:95El6ki7awk1iwswHGgHYg==,type:str]
 s3_access_key: ENC[AES256_GCM,data:fHd74FNP/jNQePEDWmbFMUFfnCI=,iv:za6Dp4LOiaegTnEyFEENcwa46kvxXtOjXHDYwx6lzgM=,tag:dHj0gt906krov3zBTjJo1w==,type:str]
 s3_secret_key: ENC[AES256_GCM,data:ueafb5vZeMa2paJdm27HoFpRpeuhsvoG0LIk+z5VCJAvuQZP1VhnEQ==,iv:xZJEibkjJsDaWNOuqR+3XM3BlmCqAwigohS0UPmUoVo=,tag:6ehkC+qMxXZ2o+grVnCVlQ==,type:str]
@@ -36,7 +36,7 @@ sops:
             d2pVcDh3cDNqY1gzSVR5Z2NXcld1Qm8KRdv8vKhMBi1R8fGIphdmY4pfHV1sAqSb
             nAXWA6Ut5/KAPIluSnBtWFkcakulcXYT01XorziztVS0X4nJDzEvMg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-27T21:19:49Z"
-    mac: ENC[AES256_GCM,data:4ToSqQvTyREG2XeVSCPZYjXeVcM5SvLe8RJ8G+wWnjXWNKg+u8Z2CyiNYGr6Tn8waiQi/HyM90R/cAkxbcjgDKNrzYm9hwd1YG8sdAE3qLnBN9zbRn2nw5R92Rkko3ojmn0nWMpL0bEtuGg9lOF8u70AmdC4s59HSmdF+9VPAO0=,iv:QvQjb5LTFw3SftmeLXaQ7Qz++d8fgP86ati6XWQjYWw=,tag:u7pJLAsjvQPK32ILaub/4g==,type:str]
+    lastmodified: "2025-09-27T22:05:10Z"
+    mac: ENC[AES256_GCM,data:6WPRCHQnpkROYoGaq/ZR+pv5SoHo/7EfikX0QRTn3IFbT83DblU1cXjIomEqr9FTdVW27m2bWwihZ0QmA23Ixjui/GW15onqyqXVCuAhCsNNGqs0OamR/lrRledYCNj9QBz0AsNjNXnqnzpblRW82mg8dn1Kf+DiWRefzJ38/wc=,iv:Qv+WJP2KmHR1C0Maf6i7pG51eJ4cWflqQzRqxY3UFO4=,tag:qCJDKn0+ftj7XIP4326PZw==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2