From 5daf9650bbaf2a219ef42181ec4b803c3a4a735d Mon Sep 17 00:00:00 2001 From: Yulei Liu Date: Fri, 18 Oct 2024 12:33:11 +1100 Subject: [PATCH] upgrade vcs-connected-workspace module version (#138) * upgrade vcs-connected-workspace module version * update provider.lck file * another test * upgrade non-vcs-connected-workspace to newer version * comment out deprecated excution_mode property --- .terraform.lock.hcl | 97 ++++++++++++++++--------------- flexible-workspaces.tf | 16 ++--- management-settings.tf | 6 +- non-vcs-workspaces.tf | 2 +- tfc-config-as-code.code-workspace | 8 --- vcs-connected-workspaces.tf | 2 +- 6 files changed, 62 insertions(+), 69 deletions(-) delete mode 100644 tfc-config-as-code.code-workspace diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index c6bbfc5..8d6fcf2 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,44 +2,44 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/auth0/auth0" { - version = "0.35.0" - constraints = "~> 0.35.0" + version = "1.7.1" + constraints = ">= 0.35.0" hashes = [ - "h1:xIS2dIpTgcjKsWERQr2Ed46JNIF6r3FuiCNTxdWJ2r4=", - "zh:1441b4e390ab970a2c3405d4b5381f19f6f31388ecdc701bc6ac64e01538459a", - "zh:3473ca85c1d5aa43cd32d9abd50ec3d967154056506113a6e72a4b4b9d028aa2", - "zh:3d73c114bbeb07802e859b3a03df07e259cf747a4a509b3e2ecda24f80e340c9", - "zh:8a1e1adab4773b2876727d24abd7de2b28a4ca068cc0ec88b4a18b6122cfa2b8", - "zh:94625fa8db2f354445eab2d0eec5d2e3a3ee639b7ebee6cc48cab5fac5da36c5", - "zh:9713739ae7562bb31e9a2f2993959a2a2e3b7ddab6f40d5b4d0f009074480e41", - "zh:9f37addad86a53de02c2028329de05a6ab5eebfeea9d9f16aaa7a3680565fdf3", - "zh:a6a728a5e318c8b1a3eee2f0bcc331febc55e8575d7590619b5c238cdcec51ad", - "zh:b6924ec7bcd4a949a422d699b9c1a3f06d641ab84645b9b85df719d3548bde94", - "zh:c4e648fafe387da586975632e3c17d122608b193e4c3a1f8ae6314b431adce1b", - "zh:c8f31dae233c17644b1af5bac63c3676bf3c997edbc66cc1eaa909032e1515b5", - "zh:ca7d7c8b86b344e371ccb975ab3558fd97f361b02893bb5e823199a7217ee7ae", - "zh:d189271a97776023d4de4b8846d3bbc9ebf840228e7b4aa6cd7acf7825a3c4bc", - "zh:dd61150a0eeff5e68f5e0140320df8e9259d5ea2563a4822fa91ce7ad0d2a82f", + "h1:uKl4wOHbQOPqWneEZwDRNeo511TLDdM6tbqLqTXVwQo=", + "zh:0507d40f7eccf341f3cf4f76e20f2dd5b65aff0735ad611346652e4a8e02cba6", + "zh:20daab1414acc6d4d67666cfc5365e3392a8232d6016637f06ed87ebc59befb7", + "zh:33013b1f2ffd068327e8757c54759ae2538aeea040472b36e4652449ee2f1f04", + "zh:4f9bb0d8caa3e226d9560541c512f0bdd82e16d0856382fc94acb93a7e66e5bc", + "zh:5a91449a7f371e8a71fedb8f88cf6115c0d9fce2f02f0a643b2b244dba4d40c4", + "zh:7a1366efde9d04da5fb9b13db1cfde61d585f06a89100736eebadb545104c47d", + "zh:7bf862207a0ea8b013a2409e364095c8e9c5b31fd27a8057f2f57339f8a359ad", + "zh:8c6aca2029521bc0a3f77c7cf874a1116288c60effcaa8259b36f6120611d838", + "zh:90423f892fceb72d5bbef307abb416d0a32c0f3082e204c90c7fde91f5ca2a75", + "zh:ca322db22dbcb3525151e2755c64b068f4c757fb5a496275ce6c46c48e749e1e", + "zh:ced37839b601c5753777e3e645243036b34d612752453ea49f290dd59f8df409", + "zh:d31cb47b467eaf0b0095fb6b5f055df79f2d4d07afbd60fe1d982069550ab431", + "zh:dae99a252718d8fb02fbee13afb1a67f4b4fe5a12aa978aea400960f5c0dab91", + "zh:f303d8d6318166f9fe4be0c4c145fc5806259f670009d8226db9bd4d9ab6b90b", ] } provider "registry.terraform.io/hashicorp/tfe" { - version = "0.58.1" - constraints = ">= 0.26.0, 0.58.1" + version = "0.59.0" + constraints = ">= 0.58.0, 0.59.0" hashes = [ - "h1:I6H+Yq1+icMcETbDEjF/fV6MQ3onCS3NUskZz6n2z+o=", - "zh:0287e18fd54bb8f029a20b680138dc060624b0680d8fff03ef2d50060486495a", - "zh:035a4db8a4eb850de9cfb9802ec4bf6882edf14a9a479554f87d5eb4dc9675f6", - "zh:1fa3dbde072e3148560b92502d54766f8ae8174da02e1454af336c30fc41bc7f", - "zh:3a83e6f7f3c32b219ac74b730c2b666f4e4b5d00d14767bd2c33bc1f9d425077", - "zh:5338578c52a23ef29725eb829dac2440e8c85406ec370c4d31815b7a47b7d3d6", - "zh:87e2455211b4faf376618d5ba00b3a6e8a7690f136f634654c3443ed4a3fb739", - "zh:8c121cd999d9ce20e8493e5469e72e6d9c85a1abc3bc39214b5dfd4a3eabc5e5", - "zh:a30aa3a515c281e2be843fc200367aa007c15d0e9a58499f0dd6e78be77bc5b8", - "zh:b2c0c1d981e955841e6f0035c3d6f5f6247dd96d4c44072dd34abd0eba21977f", - "zh:bee9c8ced3fc1d5d865b4b3484e0c8d4a5ddcec8462efed97f0371dfbb7899f7", + "h1:Imh9PHOAaBJFBbyiKHYoItWjtWrrSolE5444EUYDgRU=", + "zh:39d4513f023d57c83f3d1e659db6093dd661ef34f7b5d8025b8155a19244e8e4", + "zh:4c2183c32356c0345c86b063c0bc9276fe704c9fc5c94ba9b45394de9d22a08a", + "zh:55ec15a226636e48dc17bad05781c2f679c9fd40940aff3f8109e6c2d4869e3e", + "zh:6cac67993b64000fd7a9856c82115e3af9ebf2ebe5e6c9870865cbb1da5a8b8e", + "zh:6ea98ea1e4afd42b44a84756914ee80dbc6f81f0aa314def7316c9c14b8114b0", + "zh:a708a6bdc80cf77793c2e9d367f628c3fdd8b1ec05f7b08ffb8ef4944d625a23", + "zh:a960e9330494d63a796ed71e3563b13121115f02806dfea8c64231753dac53bd", + "zh:b752c5c1000728b22cda47b5032ae537a46a8e5c197642102cb3e5dab95ce090", + "zh:c16b0899b984ef398b2b234d4171cab17484c8eeb7f20cc0eaea172d337ae187", "zh:d95ec293fa70e946b6cd657912b33155f8be3413e6128ed2bfa5a493f788e439", - "zh:eb85330441985da624bb195a86743b7b50e1d2f14a002de8cd587daec5f937bd", + "zh:ddb8ddcf0cc945f369e537285c727be9c673477ca62d7f9800287041539841aa", + "zh:e917a03a99b8f3ca1021a099e421824e8e98fc63913de2932bb0a7dd54b24461", ] } @@ -64,23 +64,24 @@ provider "registry.terraform.io/hashicorp/vault" { } provider "registry.terraform.io/integrations/github" { - version = "4.31.0" - constraints = "~> 4.0, 4.31.0" + version = "6.3.1" + constraints = ">= 6.0.0, 6.3.1" hashes = [ - "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", - "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", - "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", - "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", - "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", - "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", - "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", - "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", - "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", - "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", - "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", - "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", - "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", - "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", - "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", + "h1:vKWgfpIrSNic7pYVi4LKIDQ2MgUpHq7uSj8nA8xfrw0=", + "zh:25ae1cb97ec528e6b7e9330489f4a33acc0fa80b909c113a8445656bc524c5b9", + "zh:3e1f6300dc10e52a54f13352770ed79f25ff4ba9ac49b776c52a655a3488a20b", + "zh:4aaf2877ec22e63358d7c9cd48c7d7947d1a1dc4d03231f0af193d8975d5918a", + "zh:4b904a81fac12a2a7606c8d811cb9c4e13581adcaaa19e503a067ac95c515925", + "zh:54fe7e0dca04e698631a5b86bdd43ef09a31375e68f8f89970b4315cd5fc6312", + "zh:6b14f92cf62784eaf20f43ef58ce966735f30d43deeab077943bd410c0d8b8b2", + "zh:86c49a1c11c024b26b6750c446f104922a3fe8464d3706a5fb9a4a05c6ca0b0a", + "zh:8939fb6332c4a58c4e90245eb9f0110987ccafff06b45a7ed513f2759a2abe6a", + "zh:8b4068a78c1f357325d1151facdb1aff506b9cd79d2bab21a55651255a130e2f", + "zh:ae22f5e52f534f19811d7f9480b4eb442f12ff16367b3893abb4e449b029ff6b", + "zh:afae9cfd9d49002ddfea552aa4844074b9974bd56ff2c2458f2297fe0df56a5b", + "zh:bc7a434408eb16a4fbceec0bd86b108a491408b727071402ad572cdb1afa2eb7", + "zh:c8e4728ea2d2c6e3d2c1bc5e7d92ed1121c02bab687702ec2748e3a6a0844150", + "zh:f6314b2cff0c0a07a216501cda51b35e6a4c66a2418c7c9966ccfe701e01b6b0", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/flexible-workspaces.tf b/flexible-workspaces.tf index 22e7c52..e22ec27 100644 --- a/flexible-workspaces.tf +++ b/flexible-workspaces.tf @@ -193,7 +193,7 @@ resource "tfe_workspace" "aws-s3-demo" { description = "A simple demo to show how sentinel policy as code engine can make sure s3 are provisioned securely." allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = false name = "aws-s3-demo" @@ -224,7 +224,7 @@ resource "tfe_workspace" "gcp-playground" { description = "A simple demo of deploying gcp resources." allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = false name = "gcp-playground" @@ -255,7 +255,7 @@ resource "tfe_workspace" "aws-shared-infra" { allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = false remote_state_consumer_ids = values(data.tfe_workspace_ids.awsconsumer-apps.ids) @@ -290,7 +290,7 @@ resource "tfe_workspace" "azure-shared-infra" { description = "Core azure infra" allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = true name = "azure-shared-infra" @@ -313,7 +313,7 @@ resource "tfe_workspace" "vault-config-as-code-aws" { description = "A workspace that's used to manage my own Vault's configuration as code." allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = false @@ -340,8 +340,8 @@ resource "tfe_workspace" "vault-config-as-code-local" { description = "A workspace that's used to manage my own Vault's configuration as code." allow_destroy_plan = true auto_apply = true - execution_mode = "agent" - agent_pool_id = tfe_agent_pool.local-agent-pool.id + # execution_mode = "agent" + # agent_pool_id = tfe_agent_pool.local-agent-pool.id file_triggers_enabled = false global_remote_state = false @@ -368,7 +368,7 @@ resource "tfe_workspace" "vault-config-as-code-hcp" { description = "A workspace that's used to manage my own Vault's configuration as code." allow_destroy_plan = true auto_apply = true - execution_mode = "remote" + # execution_mode = "remote" file_triggers_enabled = false global_remote_state = false diff --git a/management-settings.tf b/management-settings.tf index ca7e32d..637448b 100644 --- a/management-settings.tf +++ b/management-settings.tf @@ -2,15 +2,15 @@ terraform { required_version = ">= 1.0" required_providers { - tfe = "= 0.58.1" + tfe = ">= 0.58.0" vault = "= 4.4.0" github = { source = "integrations/github" - version = "= 4.31.0" + version = ">= 6.0" } auth0 = { source = "auth0/auth0" - version = "~> 0.35.0" + version = ">= 0.35.0" } } } diff --git a/non-vcs-workspaces.tf b/non-vcs-workspaces.tf index 8acdf86..6d29aae 100644 --- a/non-vcs-workspaces.tf +++ b/non-vcs-workspaces.tf @@ -9,7 +9,7 @@ locals { module "non-vcs-connected-workspace" { source = "ausmartway/non-vcs-connected-workspace/tfe" - version = "0.0.1" + version = "0.1.0" for_each = local.inputworkspacemap # insert the 4 required variables here organization = var.organization diff --git a/tfc-config-as-code.code-workspace b/tfc-config-as-code.code-workspace deleted file mode 100644 index 876a149..0000000 --- a/tfc-config-as-code.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": {} -} \ No newline at end of file diff --git a/vcs-connected-workspaces.tf b/vcs-connected-workspaces.tf index c0e349d..2463513 100644 --- a/vcs-connected-workspaces.tf +++ b/vcs-connected-workspaces.tf @@ -9,7 +9,7 @@ locals { module "vcs-connected-workspace" { source = "ausmartway/vcs-connected-workspace/tfe" - version = "0.0.4" + version = "0.1.0" # insert the 5 required variables here for_each = local.inputvcsworkspacemap organization = var.organization