diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 96fd7cb..cca934d 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -2,7 +2,6 @@ name: 'Terraform' on: push: - branches: [ "main" ] jobs: terraform: @@ -21,26 +20,25 @@ jobs: # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token - name: Setup Terraform - uses: hashicorp/setup-terraform@v1 + uses: opentofu/setup-opentofu@v1.0.6 with: - cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} - # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. - - name: Terraform Init - run: terraform init + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Init + run: tofu init # Generates an execution plan for Terraform - - name: Terraform Plan - run: terraform plan -input=false + - name: Plan + run: tofu plan -input=false # On push to "main", build or change infrastructure according to Terraform configuration files # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks - - name: Terraform Apply - if: github.event_name == 'push' - run: terraform apply -auto-approve -input=false + - name: Apply + if: github.ref_name == 'main' + run: tofu apply -auto-approve -input=false - name: Trigger Cluster Deployment - if: github.event_name == 'push' uses: peter-evans/repository-dispatch@v2 with: token: ${{ secrets.ACTIONS_KEY }} diff --git a/.gitignore b/.gitignore index 9e088eb..8495f59 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,7 @@ override.tf.json .terraformrc terraform.rc .secrets + + +.idea/ +.vscode/ \ No newline at end of file diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 5ba5807..7fbd59d 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -1,72 +1,65 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.44.0" +provider "registry.opentofu.org/cloudflare/cloudflare" { + version = "4.52.5" constraints = "~> 4.0" hashes = [ - "h1:MeMGdavako/OPTU/qAgKRIQKD49x9tn4PGrOTWi9tFE=", - "zh:0cae95e8c9d2d979669712745251dcf5720cee2a59bb81d8ad2c2dcf0e6e0c7a", - "zh:1220aee9549e7938648f6a36237929ead0de8244c6a00f8e8cded559f4b65a2f", - "zh:23ae1862e5fe5b583b8ec2c96f80a5ba0e3883be8e1169a0484a45106cc238ce", - "zh:3034654c6f34e419c53dcd6ea558b715e1150fbcc70c93209c5ee88a03025072", - "zh:3b64a66f3ddeb04345511262ad9376eb3c26e0683a78f47a3fd7f5e71f3f7e27", - "zh:4b29435e1e8f970b92bb38eca52820f7a8362c16235334aef9a83be32bd00094", - "zh:4f8fe69db7f54bce0e78a4c671aa5db20515114626035051f387d9833f4a5a91", - "zh:86776bfbdabd2095975be9b3ca999c2f47ca5194ece6c58c69130ccfa2e3c97d", + "h1:18bXaaOSq8MWKuMxo/4y7EB7/i7G90y5QsKHZRmkoDo=", + "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b", + "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a", + "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7", + "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238", + "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b", + "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072", + "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661", + "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c", "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:9d50271a09ee01a7105c06e582c52743a3baaf46f298d52bfc9e64cd7bfaa712", - "zh:a1e12d1c3472d457140de0e8b77a4b09e5cdcd3e2f6c0be0fe0dae0526d368db", - "zh:ad638e2c91490367d55ec6fe46ee34a9f7c151ca6e3cc52e5bad9f358e77f1aa", - "zh:cc4c496f2c594994a9d966f7ebe00a797eca9b924ac1bbe5aef26ec83ec7f833", - "zh:e74d5a3695deb38c2858d1c99c424495900e9b298ca8961c0a2fc1b3714c4c77", - "zh:f4b6efa4c2b4c85c92171dc0824dbf42af9dde5250131494de803e0b9fe1ea3c", + "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54", + "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852", + "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0", + "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5", + "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036", + "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803", ] } -provider "registry.terraform.io/hashicorp/aws" { +provider "registry.opentofu.org/hashicorp/aws" { version = "5.17.0" constraints = "5.17.0" hashes = [ - "h1:U+EDfeUqefebA1h7KyBMD1xH0h311LMi7wijPDPkC/0=", - "zh:0087b9dd2c9c638fd63e527e5b9b70988008e263d480a199f180efe5a4f070f0", - "zh:0fd532a4fd03ddef11f0502ff9fe4343443e1ae805cb088825a71d6d48906ec7", - "zh:16411e731100cd15f7e165f53c23be784b2c86c2fcfd34781e0642d17090d342", - "zh:251d520927e77f091e2ec6302e921d839a2430ac541c6a461aed7c08fb5eae12", - "zh:4919e69682dc2a8c32d44f6ebc038a52c9f40af9c61cb574b64e322800d6a794", - "zh:5334c60759d5f76bdc51355d1a3ebcc451d4d20f632f5c73b6e55c52b5dc9e52", - "zh:7341a2b7247572eba0d0486094a870b872967702ec0ac7af728c2df2c30af4e5", - "zh:81d1b1cb2cac6b3922a05adab69543b678f344a01debd54500263700dad7a288", - "zh:882bc8e15ef6d4020a07321ec4c056977c5c1d96934118032922561d29504d43", - "zh:8cd4871ef2b03fd916de1a6dc7eb8a81a354c421177d4334a2e3308e50215e41", - "zh:97e12fe6529b21298adf1046c5e20ac35d0569c836a6f385ff041e257e00cfd2", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9f5baf5d59b9f3cf5504d1fa975f10f27da3791896a9e18ece47c258bac17634", - "zh:dffafba6731ac1db1c540bdbd6a8c878486b71de9d0ca1d23c5c00a6c3c14d80", - "zh:fa7440c3c15a42fc5731444d324ced75407d417bfe3184661ae47d40a9718dce", + "h1:W36mpfU1j5XA4amyTjuDjDO4zHQqSr1n4geeBKhs2ZA=", + "zh:4528cbaa1527a25e0a546d0d410769b5c8e85274d141bc2124af070c76f355b1", + "zh:4dd4373912b7f836f8ea74e7d923ee21c0d3c0ab6616b796934db15bc35e891b", + "zh:5d374cacda2f7357f5bb6d39c10d114d09a2bb76f788236af0ffe324074ccdd6", + "zh:5ef8f3e6a91bbc1ca9c9cf57ddc741753b49b55e1b5612f305fed77d9be586d1", + "zh:6b35a6e180516e9e28236ea2fa66f02de3125e30c144d8042ff324246d14a3a2", + "zh:6c48b44a3633378f57be8c2d319cf5b4403da69306fd6a36d579c67f46468b2d", + "zh:7f08e93cb0391bedd7758474648c945e3001d56582cfa5828fd66f73ec7fc33a", + "zh:88026eadf2a37e3702d07e8346f0c93da0b31c9931a506d6b8665fd5a5e2b387", + "zh:8dac7650763f7d50ef48cad2d79e9b479f65b3363f65bbf2305b32afd3586cc5", + "zh:efa5214b523a0be6ff6791c503bc7f4b0b97bd599bc38e2c725e059debdeaf95", ] } -provider "registry.terraform.io/hashicorp/tls" { +provider "registry.opentofu.org/hashicorp/tls" { version = "3.1.0" constraints = "3.1.0" hashes = [ - "h1:fUJX8Zxx38e2kBln+zWr1Tl41X+OuiE++REjrEyiOM4=", - "zh:3d46616b41fea215566f4a957b6d3a1aa43f1f75c26776d72a98bdba79439db6", - "zh:623a203817a6dafa86f1b4141b645159e07ec418c82fe40acd4d2a27543cbaa2", - "zh:668217e78b210a6572e7b0ecb4134a6781cc4d738f4f5d09eb756085b082592e", - "zh:95354df03710691773c8f50a32e31fca25f124b7f3d6078265fdf3c4e1384dca", - "zh:9f97ab190380430d57392303e3f36f4f7835c74ea83276baa98d6b9a997c3698", - "zh:a16f0bab665f8d933e95ca055b9c8d5707f1a0dd8c8ecca6c13091f40dc1e99d", - "zh:be274d5008c24dc0d6540c19e22dbb31ee6bfdd0b2cddd4d97f3cd8a8d657841", - "zh:d5faa9dce0a5fc9d26b2463cea5be35f8586ab75030e7fa4d4920cd73ee26989", - "zh:e9b672210b7fb410780e7b429975adcc76dd557738ecc7c890ea18942eb321a5", - "zh:eb1f8368573d2370605d6dbf60f9aaa5b64e55741d96b5fb026dbfe91de67c0d", - "zh:fc1e12b713837b85daf6c3bb703d7795eaf1c5177aebae1afcf811dd7009f4b0", + "h1:CMIl4zey2VGNVCGg67ivz32tOQu639O3I6bJ61eB/oA=", + "zh:14ba2752cea244e63eeaf71ec0e81e0db1d0e79d5d74dae4ca37c569d86fae5a", + "zh:1919a594702531f422f51534fd7e599c1056b0e2aba58bb7a94422e5c8bef236", + "zh:4f83a1d5b79be72f5d9174eff774841df3f29b6c43c3809aee4d3ce06cc1a5d6", + "zh:5de6e1858da99d76a78512cfb1725e9179df4d7e6633de665788559225f4c28f", + "zh:79a3f025e750dd8892a9e15a6a8247aa6933c8388aec804300faf3f5d759b8b2", + "zh:c8084df9e841d71cdb3585941546257d80d3cbbe0cf669a45a1059b9f3b0ed12", + "zh:d67d74c0426dfccc2c2a96af311a73f7b9c06771b0064c4e80bedb70e1855415", + "zh:db83ab9624b43b9bcca04b08173042b59918e7de0f024067d1cf02f9a2938196", + "zh:e034a51c35eff3890257f40b6b053eb4e83d0d5266207c0ec0848afe30b9d587", ] } -provider "registry.terraform.io/hideyoshinakazone/yoshik3s" { +provider "registry.opentofu.org/hideyoshinakazone/yoshik3s" { version = "1.1.2" constraints = "1.1.2" hashes = [ @@ -89,7 +82,7 @@ provider "registry.terraform.io/hideyoshinakazone/yoshik3s" { ] } -provider "registry.terraform.io/integrations/github" { +provider "registry.opentofu.org/integrations/github" { version = "6.3.1" constraints = "6.3.1" hashes = [ diff --git a/bucket/.terraform.lock.hcl b/bucket/.terraform.lock.hcl deleted file mode 100644 index 5ba9129..0000000 --- a/bucket/.terraform.lock.hcl +++ /dev/null @@ -1,24 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/aws" { - version = "5.17.0" - hashes = [ - "h1:U+EDfeUqefebA1h7KyBMD1xH0h311LMi7wijPDPkC/0=", - "zh:0087b9dd2c9c638fd63e527e5b9b70988008e263d480a199f180efe5a4f070f0", - "zh:0fd532a4fd03ddef11f0502ff9fe4343443e1ae805cb088825a71d6d48906ec7", - "zh:16411e731100cd15f7e165f53c23be784b2c86c2fcfd34781e0642d17090d342", - "zh:251d520927e77f091e2ec6302e921d839a2430ac541c6a461aed7c08fb5eae12", - "zh:4919e69682dc2a8c32d44f6ebc038a52c9f40af9c61cb574b64e322800d6a794", - "zh:5334c60759d5f76bdc51355d1a3ebcc451d4d20f632f5c73b6e55c52b5dc9e52", - "zh:7341a2b7247572eba0d0486094a870b872967702ec0ac7af728c2df2c30af4e5", - "zh:81d1b1cb2cac6b3922a05adab69543b678f344a01debd54500263700dad7a288", - "zh:882bc8e15ef6d4020a07321ec4c056977c5c1d96934118032922561d29504d43", - "zh:8cd4871ef2b03fd916de1a6dc7eb8a81a354c421177d4334a2e3308e50215e41", - "zh:97e12fe6529b21298adf1046c5e20ac35d0569c836a6f385ff041e257e00cfd2", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9f5baf5d59b9f3cf5504d1fa975f10f27da3791896a9e18ece47c258bac17634", - "zh:dffafba6731ac1db1c540bdbd6a8c878486b71de9d0ca1d23c5c00a6c3c14d80", - "zh:fa7440c3c15a42fc5731444d324ced75407d417bfe3184661ae47d40a9718dce", - ] -} diff --git a/dns/.terraform.lock.hcl b/dns/.terraform.lock.hcl deleted file mode 100644 index 9615818..0000000 --- a/dns/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/zaneatwork/godaddy" { - version = "1.9.10" - constraints = "1.9.10" - hashes = [ - "h1:KZxLOy1oSAWDELKzlKog3Vkj7dkL5vnFM+upG05URZc=", - "zh:0f82e078d455e31432bb2dec1647afab95f1cf14ba4e4e466e84c83f7116f267", - "zh:29b0f2880ead720b735e10b1ea861556abfa77bcd9d2e19393bcbe9f01e9949f", - "zh:462a501f572be4340800963f0e32fff868edd822f70f7c0f89da078d85d7910f", - "zh:51f7023cc410b89e88e7f4d962dcf741165d98c5e77f34cdf92d69285efef521", - "zh:55103119896e8d9b58119c39a7f0df3ffc24f18e10274cd6e1c6fba02819840e", - "zh:55f95b8894874839402ed1ba21516a08c2de3ffe24a78e759c2a841f6fc174d3", - "zh:65fb702c9aabc2755722ab7c556a5e0d93c0fe23a12cd281a7c8274957b21027", - "zh:709de4a72eb680c543261e745a6b1049a06132cdc29856fa94d1a3ae04e66c8a", - "zh:80a6b47a5b7750aac95d6c8917a977269c8fd7194b65aa4a2848bdd0d6dc81c4", - "zh:a2cd5aca2f56e8cba11bdf72f2fb1a859a46b7f050131cd4348e103a1c1f0bef", - "zh:bb53536ebb52807811f3cb2337f679c427059024b2f1cb82909ab2dd9e412f61", - "zh:ca5c22df37d56e889946c6d5a2d9cdbde4443dffabc3c373d1483af6b0cc60e4", - "zh:d146fd079775588788f827af2cb248da9587c9a01f297f251ed4cf4a5f0b9b93", - "zh:d965709316a14d90f6e2fc9c35596b92f208347406e2588e87dec4793e92e5f6", - "zh:ef271d08825d3479a231fb03c9980b66ee5c7ecf4838e04fffcaabf7744a9d19", - ] -} diff --git a/instances/.terraform.lock.hcl b/instances/.terraform.lock.hcl deleted file mode 100644 index 5ba9129..0000000 --- a/instances/.terraform.lock.hcl +++ /dev/null @@ -1,24 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/aws" { - version = "5.17.0" - hashes = [ - "h1:U+EDfeUqefebA1h7KyBMD1xH0h311LMi7wijPDPkC/0=", - "zh:0087b9dd2c9c638fd63e527e5b9b70988008e263d480a199f180efe5a4f070f0", - "zh:0fd532a4fd03ddef11f0502ff9fe4343443e1ae805cb088825a71d6d48906ec7", - "zh:16411e731100cd15f7e165f53c23be784b2c86c2fcfd34781e0642d17090d342", - "zh:251d520927e77f091e2ec6302e921d839a2430ac541c6a461aed7c08fb5eae12", - "zh:4919e69682dc2a8c32d44f6ebc038a52c9f40af9c61cb574b64e322800d6a794", - "zh:5334c60759d5f76bdc51355d1a3ebcc451d4d20f632f5c73b6e55c52b5dc9e52", - "zh:7341a2b7247572eba0d0486094a870b872967702ec0ac7af728c2df2c30af4e5", - "zh:81d1b1cb2cac6b3922a05adab69543b678f344a01debd54500263700dad7a288", - "zh:882bc8e15ef6d4020a07321ec4c056977c5c1d96934118032922561d29504d43", - "zh:8cd4871ef2b03fd916de1a6dc7eb8a81a354c421177d4334a2e3308e50215e41", - "zh:97e12fe6529b21298adf1046c5e20ac35d0569c836a6f385ff041e257e00cfd2", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9f5baf5d59b9f3cf5504d1fa975f10f27da3791896a9e18ece47c258bac17634", - "zh:dffafba6731ac1db1c540bdbd6a8c878486b71de9d0ca1d23c5c00a6c3c14d80", - "zh:fa7440c3c15a42fc5731444d324ced75407d417bfe3184661ae47d40a9718dce", - ] -} diff --git a/terraform-cloud.tf b/terraform-cloud.tf index b91370f..654b9f4 100644 --- a/terraform-cloud.tf +++ b/terraform-cloud.tf @@ -1,6 +1,7 @@ terraform { required_version = ">1.5" backend "remote" { + hostname = "app.terraform.io" organization = "HideyoshiNakazone" workspaces {