diff --git a/_stacks_generated/.terraform.lock.hcl b/_stacks_generated/.terraform.lock.hcl index bb3e5b7..7df6d71 100755 --- a/_stacks_generated/.terraform.lock.hcl +++ b/_stacks_generated/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "6.27.0" + version = "6.28.0" hashes = [ - "h1:6PyQLswSmmWDFh6G2H4XIeBG8kY0pKAPKLoBarRdfNs=", - "h1:bixp2PSsP5ZGBczGCxcbSDn6lF5QFlUXlNroq9cdab4=", - "h1:emgTfB1LXSFYh9uAwgsRMoMIN5Wz7jNNKq3rqC0EHWk=", - "zh:177a24b806c72e8484b5cabc93b2b38e3d770ae6f745a998b54d6619fd0e8129", - "zh:4ac4a85c14fb868a3306b542e6a56c10bd6c6d5a67bc0c9b8f6a9060cf5f3be7", - "zh:552652185bc85c8ba1da1d65dea47c454728a5c6839c458b6dcd3ce71c19ccfc", - "zh:60284b8172d09aee91eae0856f09855eaf040ce3a58d6933602ae17c53f8ed04", - "zh:6be38d156756ca61fb8e7c752cc5d769cd709686700ac4b230f40a6e95b5dbc9", - "zh:7a409138fae4ef42e3a637e37cb9efedf96459e28a3c764fc4e855e8db9a7485", - "zh:8070cf5224ed1ed3a3e9a59f7c30ff88bf071c7567165275d477c1738a56c064", - "zh:894439ef340a9a79f69cd759e27ad11c7826adeca27be1b1ca82b3c9702fa300", - "zh:89d035eebf08a97c89374ff06040955ddc09f275ecca609d0c9d58d149bef5cf", - "zh:985b1145d724fc1f38369099e4a5087141885740fd6c0b1dbc492171e73c2e49", + "h1:2bDndcCvti7hgXw4MkMo37cyAAu1gk+JvsU9/UbRJNQ=", + "h1:RwoFuX1yGMVaKJaUmXDKklEaQ/yUCEdt5k2kz+/g08c=", + "h1:wzZdGs0FFmNqIgPyo9tKnGKJ37BGNSgwRrEXayL29+0=", + "zh:0ba0d5eb6e0c6a933eb2befe3cdbf22b58fbc0337bf138f95bf0e8bb6e6df93e", + "zh:23eacdd4e6db32cf0ff2ce189461bdbb62e46513978d33c5de4decc4670870ec", + "zh:307b06a15fc00a8e6fd243abde2cbe5112e9d40371542665b91bec1018dd6e3c", + "zh:37a02d5b45a9d050b9642c9e2e268297254192280df72f6e46641daca52e40ec", + "zh:3da866639f07d92e734557d673092719c33ede80f4276c835bf7f231a669aa33", + "zh:480060b0ba310d0f6b6a14d60b276698cb103c48fd2f7e2802ae47c963995ec6", + "zh:57796453455c20db80d9168edbf125bf6180e1aae869de1546a2be58e4e405ec", + "zh:69139cba772d4df8de87598d8d8a2b1b4b254866db046c061dccc79edb14e6b9", + "zh:7312763259b859ff911c5452ca8bdf7d0be6231c5ea0de2df8f09d51770900ac", + "zh:8d2d6f4015d3c155d7eb53e36f019a729aefb46ebfe13f3a637327d3a1402ecc", + "zh:94ce589275c77308e6253f607de96919b840c2dd36c44aa798f693c9dd81af42", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a80b47ae8d1475201c86bd94a5dcb9dd4da5e8b73102a90820b68b66b76d50fd", - "zh:d3395be1556210f82199b9166a6b2e677cee9c4b67e96e63f6c3a98325ad7ab0", - "zh:db0b869d09657f6f1e4110b56093c5fcdf9dbdd97c020db1e577b239c0adcbce", - "zh:ffc72e680370ae7c21f9bd3082c6317730df805c6797427839a6b6b7e9a26a01", + "zh:adaceec6a1bf4f5df1e12bd72cf52b72087c72efed078aef636f8988325b1a8b", + "zh:d37be1ce187d94fd9df7b13a717c219964cd835c946243f096c6b230cdfd7e92", + "zh:fe6205b5ca2ff36e68395cb8d3ae10a3728f405cdbcd46b206a515e1ebcf17a1", ] } diff --git a/_stacks_generated/deployment.tfdeploy.hcl b/_stacks_generated/deployment.tfdeploy.hcl index c98c445..22e104a 100755 --- a/_stacks_generated/deployment.tfdeploy.hcl +++ b/_stacks_generated/deployment.tfdeploy.hcl @@ -16,9 +16,9 @@ deployment "dev-workspace" { access_key = store.varset.tokens.AWS_ACCESS_KEY_ID secret_key = store.varset.tokens.AWS_SECRET_ACCESS_KEY session_token = store.varset.tokens.AWS_SESSION_TOKEN + instance_name = "stack-v3-test-dev-instance" instance_type = "t3.micro" ami_id = "ami-0dee22c13ea7a9a67" - instance_name = "stack-v3-test-dev-instance" } import = true } @@ -30,9 +30,9 @@ deployment "prod-workspace" { access_key = store.varset.tokens.AWS_ACCESS_KEY_ID secret_key = store.varset.tokens.AWS_SECRET_ACCESS_KEY session_token = store.varset.tokens.AWS_SESSION_TOKEN + ami_id = "ami-0dee22c13ea7a9a67" instance_name = "stack-v3-test-prod-instance" instance_type = "t3.micro" - ami_id = "ami-0dee22c13ea7a9a67" } import = true } diff --git a/_stacks_generated/providers.tfcomponent.hcl b/_stacks_generated/providers.tfcomponent.hcl index f1fe711..02e1afc 100755 --- a/_stacks_generated/providers.tfcomponent.hcl +++ b/_stacks_generated/providers.tfcomponent.hcl @@ -4,7 +4,7 @@ provider "aws" "this" { config { - region = "ap-south-1" + region = "ap-south-1" access_key = var.access_key secret_key = var.secret_key token = var.session_token diff --git a/_stacks_generated/variables.tfcomponent.hcl b/_stacks_generated/variables.tfcomponent.hcl index 8230dd1..0a3f4f2 100755 --- a/_stacks_generated/variables.tfcomponent.hcl +++ b/_stacks_generated/variables.tfcomponent.hcl @@ -38,3 +38,4 @@ variable "session_token" { sensitive = true ephemeral = true } + diff --git a/stacks_migration_infra/.terraform.lock.hcl b/stacks_migration_infra/.terraform.lock.hcl index 2795e4f..f1de7f9 100644 --- a/stacks_migration_infra/.terraform.lock.hcl +++ b/stacks_migration_infra/.terraform.lock.hcl @@ -2,22 +2,22 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/tfe" { - version = "0.72.0" - constraints = ">= 0.67.0" + version = "0.73.0" + constraints = ">= 0.73.0" hashes = [ - "h1:DSx+rdyWBkDyBcollXYzGehREnCvwe5dyNT+gK0S0YQ=", - "zh:0c5a72feab8b911d8ecd618aa875e59693f7ba18d01cac2938693d15d9a3de88", - "zh:2e902f3f26d76f856767c7033de01de94f2128779602eec530ff7b03775ff379", - "zh:4489a949eb07bc606947ae8fedc2e681d12db1ea63915f88698cb2e594fca478", + "h1:ZNeSgNWA/SdS9sBIEeg6w3eQtcHlORZRpdk8Ie3R7Ag=", + "zh:063efb04537080f009e3cc4f2402c7d6c583b51ed29af5b1e7575af677e0643b", + "zh:284ca57835ebdaa2c8aad5881ab0712603c3ccc1654fdb43138e207e3f6272d6", + "zh:3f5283dfa57c54ae4503c4aca32b28a8ca403bf18823f09723f64966fc4d2757", "zh:541d4532c875b2ee7ecb98da9a1461e76788893b623b0adf7c634d9fff7770e3", - "zh:78db652be0568fafc326e995e3eff153381a0d3abf1ecf96347f1bdf65a2e881", - "zh:89f71cbc5ee52afd5e98bf4603d3f2528bb6272cfb77f0215d9c5ffab3c06d6a", - "zh:a6bd22d4425b425a97cffbb85eddafb9c958ed15d4b95146a0c6da15d97bf098", - "zh:a72507ca718c3040845f14e7f3e72a8fe3fc8b581edcdfc301305e0087b19991", - "zh:a8eb3261495366e739e155d9b65864d88387c409552ccf82e50b9553a3a4ab89", - "zh:aab6de3906be0f112b3ed04179624cd34200b258517f9fad1830af97ac4ef708", - "zh:e194e5d053bd95bbf57dc6ab326850c36ad3938573ba4281b5e465a7ffafb7ab", - "zh:f603f1e884c8a194ea762526f2e462d22599d02fe12cb83ab0c030369be4bd4e", + "zh:59c8deae55405f4043b2c17e12b9e218d71340c1e7640c0d479b667f5b6e698f", + "zh:8c948e6d3488f4aa8dd0df2469a6710972104523e01862665c0350a423215bef", + "zh:90fff7cf1d901126ca02de60467f79e2c727d33c9f412a2b7c7125ab38643675", + "zh:97fe934fad86781509dced436c991c2eb4f6be0f236424b2b4970d1f323878cf", + "zh:a512cd517dcbc2ace10799fd81b274c913a267c8d0d8055fa2261c9aaee088af", + "zh:b051d92e8cff8e2e1edf7e82319bdb6f805683353bc2f1bc59d84184e0f4880d", + "zh:c2c5042185f5dab8dc7841b1d9e165945f78cbed137d802e46cae1ad0c7b8f9d", + "zh:d170428b6e174b48a5b4abd0750c55570c2f4607433d799c18defbfe3ddd6281", ] } diff --git a/stacks_migration_infra/main.tf b/stacks_migration_infra/main.tf index 576b11d..10c4b69 100644 --- a/stacks_migration_infra/main.tf +++ b/stacks_migration_infra/main.tf @@ -1,8 +1,8 @@ terraform { required_providers { tfe = { - source = "hashicorp/tfe" - version = ">= 0.67.0" + source = "hashicorp/tfe" + version = ">= 0.73.0" } tfmigrate = { source = "hashicorp/tfmigrate" @@ -22,15 +22,16 @@ resource "tfe_project" "stack_project" { } resource "tfe_stack" "stack" { - name = var.stack_name - project_id = tfe_project.stack_project.id + name = var.stack_name + project_id = tfe_project.stack_project.id + migration = true # Identifies the stack is created for migration purposes } resource "tfmigrate_stack_migration" "stack_migration" { - config_file_dir = var.stacks_config_file_dir - organization = var.organization_name - name = tfe_stack.stack.name - project = tfe_project.stack_project.name - terraform_config_dir = var.terraform_config_dir + config_file_dir = var.stacks_config_file_dir + organization = var.organization_name + name = tfe_stack.stack.name + project = tfe_project.stack_project.name + terraform_config_dir = var.terraform_config_dir workspace_deployment_mapping = var.workspace_deployment_mapping -} \ No newline at end of file +} diff --git a/stacks_migration_infra/output.tf b/stacks_migration_infra/output.tf index 8c6ced1..e0f6f15 100644 --- a/stacks_migration_infra/output.tf +++ b/stacks_migration_infra/output.tf @@ -4,17 +4,4 @@ output "project_url" { output "stack_url" { value = "https://app.terraform.io/app/${var.organization_name}/projects/${tfe_project.stack_project.id}/stacks/${tfe_stack.stack.id}" -} - -locals { - stack_deployment_details = ( - tfmigrate_stack_migration.stack_migration.migration_hash != "" ? - provider::tfmigrate::decode_stacks_migration_hash_to_json( - tfmigrate_stack_migration.stack_migration.migration_hash - ) : null - ) -} - -output "stack_deployment_details" { - value = local.stack_deployment_details } \ No newline at end of file diff --git a/stacks_migration_infra/variables.tf b/stacks_migration_infra/variables.tf index 4fa6ecd..e693c36 100644 --- a/stacks_migration_infra/variables.tf +++ b/stacks_migration_infra/variables.tf @@ -7,11 +7,11 @@ variable "tfe_hostname" { } variable "project_name" { - default = "new-stacks-project" + default = "stack-with-source" } variable "stack_name" { - default = "new-stacks-v1" + default = "stack-with-migration-source-v1" } variable "stacks_config_file_dir" {