diff --git a/providers/terraform/connection/testdata/dynamic_block/.terraform.lock.hcl b/providers/terraform/connection/testdata/dynamic_block/.terraform.lock.hcl new file mode 100644 index 0000000000..e9a7627b51 --- /dev/null +++ b/providers/terraform/connection/testdata/dynamic_block/.terraform.lock.hcl @@ -0,0 +1,21 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/helm" { + version = "2.17.0" + hashes = [ + "h1:kQMkcPVvHOguOqnxoEU2sm1ND9vCHiT8TvZ2x6v/Rsw=", + "zh:06fb4e9932f0afc1904d2279e6e99353c2ddac0d765305ce90519af410706bd4", + "zh:104eccfc781fc868da3c7fec4385ad14ed183eb985c96331a1a937ac79c2d1a7", + "zh:129345c82359837bb3f0070ce4891ec232697052f7d5ccf61d43d818912cf5f3", + "zh:3956187ec239f4045975b35e8c30741f701aa494c386aaa04ebabffe7749f81c", + "zh:66a9686d92a6b3ec43de3ca3fde60ef3d89fb76259ed3313ca4eb9bb8c13b7dd", + "zh:88644260090aa621e7e8083585c468c8dd5e09a3c01a432fb05da5c4623af940", + "zh:a248f650d174a883b32c5b94f9e725f4057e623b00f171936dcdcc840fad0b3e", + "zh:aa498c1f1ab93be5c8fbf6d48af51dc6ef0f10b2ea88d67bcb9f02d1d80d3930", + "zh:bf01e0f2ec2468c53596e027d376532a2d30feb72b0b5b810334d043109ae32f", + "zh:c46fa84cc8388e5ca87eb575a534ebcf68819c5a5724142998b487cb11246654", + "zh:d0c0f15ffc115c0965cbfe5c81f18c2e114113e7a1e6829f6bfd879ce5744fbb", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/LICENSE.txt b/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/LICENSE.txt new file mode 100644 index 0000000000..b9ac071eb6 --- /dev/null +++ b/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/LICENSE.txt @@ -0,0 +1,375 @@ +Copyright (c) 2017 HashiCorp, Inc. + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/terraform-provider-helm_v2.17.0_x5 b/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/terraform-provider-helm_v2.17.0_x5 new file mode 100755 index 0000000000..406624f369 Binary files /dev/null and b/providers/terraform/connection/testdata/dynamic_block/.terraform/providers/registry.terraform.io/hashicorp/helm/2.17.0/darwin_arm64/terraform-provider-helm_v2.17.0_x5 differ diff --git a/providers/terraform/connection/testdata/dynamic_block/main.tf b/providers/terraform/connection/testdata/dynamic_block/main.tf new file mode 100644 index 0000000000..c8b69dd016 --- /dev/null +++ b/providers/terraform/connection/testdata/dynamic_block/main.tf @@ -0,0 +1,37 @@ +variable "environment" { + type = string +} + +locals { + set = { + set1 = { + name = "service.type" + value = "LoadBalancer" + } + set2 = { + name = "replicaCount" + value = "2" + } + set3 = { + name = "ingress.enabled" + value = "true" + } + set4 = { + name = "environment" + value = var.environment + } + } +} +resource "helm_release" "nginx" { + name = "my-nginx" + chart = "nginx" + repository = "https://charts.bitnami.com/bitnami" + version = "13.2.12" + dynamic "set" { + for_each = local.set + content { + name = set.value.name + value = set.value.value + } + } +} diff --git a/providers/terraform/connection/testdata/dynamic_block/tfplan.json b/providers/terraform/connection/testdata/dynamic_block/tfplan.json new file mode 100644 index 0000000000..b704f8e9e6 --- /dev/null +++ b/providers/terraform/connection/testdata/dynamic_block/tfplan.json @@ -0,0 +1 @@ +{"format_version":"1.2","terraform_version":"1.8.5","variables":{"environment":{"value":"dev"}},"planned_values":{"root_module":{"resources":[{"address":"helm_release.nginx","mode":"managed","type":"helm_release","name":"nginx","provider_name":"registry.terraform.io/hashicorp/helm","schema_version":1,"values":{"atomic":false,"chart":"nginx","cleanup_on_fail":false,"create_namespace":false,"dependency_update":false,"description":null,"devel":null,"disable_crd_hooks":false,"disable_openapi_validation":false,"disable_webhooks":false,"force_update":false,"keyring":null,"lint":false,"max_history":0,"name":"my-nginx","namespace":"default","pass_credentials":false,"postrender":[],"recreate_pods":false,"render_subchart_notes":true,"replace":false,"repository":"https://charts.bitnami.com/bitnami","repository_ca_file":null,"repository_cert_file":null,"repository_key_file":null,"repository_password":null,"repository_username":null,"reset_values":false,"reuse_values":false,"set":[{"name":"environment","type":"","value":"dev"},{"name":"ingress.enabled","type":"","value":"true"},{"name":"replicaCount","type":"","value":"2"},{"name":"service.type","type":"","value":"LoadBalancer"}],"set_list":[],"set_sensitive":[],"skip_crds":false,"status":"deployed","timeout":300,"upgrade_install":null,"values":null,"verify":false,"version":"13.2.12","wait":true,"wait_for_jobs":false},"sensitive_values":{"metadata":[],"postrender":[],"repository_password":true,"set":[{},{},{},{}],"set_list":[],"set_sensitive":[]}}]}},"resource_changes":[{"address":"helm_release.nginx","mode":"managed","type":"helm_release","name":"nginx","provider_name":"registry.terraform.io/hashicorp/helm","change":{"actions":["create"],"before":null,"after":{"atomic":false,"chart":"nginx","cleanup_on_fail":false,"create_namespace":false,"dependency_update":false,"description":null,"devel":null,"disable_crd_hooks":false,"disable_openapi_validation":false,"disable_webhooks":false,"force_update":false,"keyring":null,"lint":false,"max_history":0,"name":"my-nginx","namespace":"default","pass_credentials":false,"postrender":[],"recreate_pods":false,"render_subchart_notes":true,"replace":false,"repository":"https://charts.bitnami.com/bitnami","repository_ca_file":null,"repository_cert_file":null,"repository_key_file":null,"repository_password":null,"repository_username":null,"reset_values":false,"reuse_values":false,"set":[{"name":"environment","type":"","value":"dev"},{"name":"ingress.enabled","type":"","value":"true"},{"name":"replicaCount","type":"","value":"2"},{"name":"service.type","type":"","value":"LoadBalancer"}],"set_list":[],"set_sensitive":[],"skip_crds":false,"status":"deployed","timeout":300,"upgrade_install":null,"values":null,"verify":false,"version":"13.2.12","wait":true,"wait_for_jobs":false},"after_unknown":{"id":true,"manifest":true,"metadata":true,"postrender":[],"set":[{},{},{},{}],"set_list":[],"set_sensitive":[]},"before_sensitive":false,"after_sensitive":{"metadata":[],"postrender":[],"repository_password":true,"set":[{},{},{},{}],"set_list":[],"set_sensitive":[]}}}],"configuration":{"provider_config":{"helm":{"name":"helm","full_name":"registry.terraform.io/hashicorp/helm"}},"root_module":{"resources":[{"address":"helm_release.nginx","mode":"managed","type":"helm_release","name":"nginx","provider_config_key":"helm","expressions":{"chart":{"constant_value":"nginx"},"name":{"constant_value":"my-nginx"},"repository":{"constant_value":"https://charts.bitnami.com/bitnami"},"version":{"constant_value":"13.2.12"}},"schema_version":1}],"variables":{"environment":{}}}},"timestamp":"2025-01-22T19:13:07Z","applyable":true,"complete":true,"errored":false} diff --git a/providers/terraform/connection/tfplan.go b/providers/terraform/connection/tfplan.go index 52d0b03aef..374ddd9893 100644 --- a/providers/terraform/connection/tfplan.go +++ b/providers/terraform/connection/tfplan.go @@ -19,11 +19,13 @@ type Plan struct { PriorState json.RawMessage `json:"prior_state,omitempty"` Configuration json.RawMessage `json:"configuration,omitempty"` PlannedValues plannedStateValues `json:"planned_values,omitempty"` - Variables variables `json:"variables,omitempty"` + Variables Variables `json:"variables,omitempty"` ResourceChanges []ResourceChange `json:"resource_changes,omitempty"` ResourceDrift []ResourceChange `json:"resource_drift,omitempty"` RelevantAttributes []resourceAttr `json:"relevant_attributes,omitempty"` OutputChanges map[string]change `json:"output_changes,omitempty"` + Applyable bool `json:"applyable,omitempty"` + Errored bool `json:"errored,omitempty"` } type plannedStateValues struct { @@ -83,9 +85,9 @@ type resource struct { SensitiveValues json.RawMessage `json:"sensitive_values,omitempty"` } -type variables map[string]*variable +type Variables map[string]*Variable -type variable struct { +type Variable struct { Value json.RawMessage `json:"value,omitempty"` } diff --git a/providers/terraform/connection/tfplan_test.go b/providers/terraform/connection/tfplan_test.go index 6cd5775c41..4a1c5261f5 100644 --- a/providers/terraform/connection/tfplan_test.go +++ b/providers/terraform/connection/tfplan_test.go @@ -21,3 +21,19 @@ func TestTfplan(t *testing.T) { require.NoError(t, err) assert.NotNil(t, plan) } + +func TestTfWithDynamicBlocksAndVariables(t *testing.T) { + data, err := os.ReadFile("./testdata/dynamic_block/tfplan.json") + require.NoError(t, err) + + var plan Plan + err = json.Unmarshal(data, &plan) + require.NoError(t, err) + assert.NotNil(t, plan) + envVar, ok := plan.Variables["environment"] + if assert.True(t, ok) { + assert.Equal(t, "dev", envVar) + } + assert.True(t, plan.Applyable) + assert.False(t, plan.Errored) +} diff --git a/providers/terraform/resources/terraform.lr b/providers/terraform/resources/terraform.lr index 430bdb3563..b320eb3a9c 100644 --- a/providers/terraform/resources/terraform.lr +++ b/providers/terraform/resources/terraform.lr @@ -167,6 +167,12 @@ terraform.plan { terraformVersion string // Resource changes resourceChanges() []terraform.plan.resourceChange + // Variables used to generate the Terraform plan + variables []terraform.plan.variable + // Indicates if the plan is applyable or not + applyable bool + // Indicates if the plan errored or not + errored bool } // Terraform plan configuration @@ -177,6 +183,14 @@ terraform.plan.configuration { resources() []dict } +// Terraform plan variable +terraform.plan.variable @defaults("name value") { + // Variable name + name string + // Variable value + value dict +} + // Terraform plan resource change terraform.plan.resourceChange @defaults("type name") { // Resource address diff --git a/providers/terraform/resources/terraform.lr.go b/providers/terraform/resources/terraform.lr.go index 8d65d5479e..5ed7840516 100644 --- a/providers/terraform/resources/terraform.lr.go +++ b/providers/terraform/resources/terraform.lr.go @@ -65,6 +65,10 @@ func init() { // to override args, implement: initTerraformPlanConfiguration(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) Create: createTerraformPlanConfiguration, }, + "terraform.plan.variable": { + // to override args, implement: initTerraformPlanVariable(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) + Create: createTerraformPlanVariable, + }, "terraform.plan.resourceChange": { // to override args, implement: initTerraformPlanResourceChange(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) Create: createTerraformPlanResourceChange, @@ -318,12 +322,27 @@ var getDataFields = map[string]func(r plugin.Resource) *plugin.DataRes{ "terraform.plan.resourceChanges": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlTerraformPlan).GetResourceChanges()).ToDataRes(types.Array(types.Resource("terraform.plan.resourceChange"))) }, + "terraform.plan.variables": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlTerraformPlan).GetVariables()).ToDataRes(types.Array(types.Resource("terraform.plan.variable"))) + }, + "terraform.plan.applyable": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlTerraformPlan).GetApplyable()).ToDataRes(types.Bool) + }, + "terraform.plan.errored": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlTerraformPlan).GetErrored()).ToDataRes(types.Bool) + }, "terraform.plan.configuration.providerConfig": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlTerraformPlanConfiguration).GetProviderConfig()).ToDataRes(types.Array(types.Dict)) }, "terraform.plan.configuration.resources": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlTerraformPlanConfiguration).GetResources()).ToDataRes(types.Array(types.Dict)) }, + "terraform.plan.variable.name": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlTerraformPlanVariable).GetName()).ToDataRes(types.String) + }, + "terraform.plan.variable.value": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlTerraformPlanVariable).GetValue()).ToDataRes(types.Dict) + }, "terraform.plan.resourceChange.address": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlTerraformPlanResourceChange).GetAddress()).ToDataRes(types.String) }, @@ -670,6 +689,18 @@ var setDataFields = map[string]func(r plugin.Resource, v *llx.RawData) bool { r.(*mqlTerraformPlan).ResourceChanges, ok = plugin.RawToTValue[[]interface{}](v.Value, v.Error) return }, + "terraform.plan.variables": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlan).Variables, ok = plugin.RawToTValue[[]interface{}](v.Value, v.Error) + return + }, + "terraform.plan.applyable": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlan).Applyable, ok = plugin.RawToTValue[bool](v.Value, v.Error) + return + }, + "terraform.plan.errored": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlan).Errored, ok = plugin.RawToTValue[bool](v.Value, v.Error) + return + }, "terraform.plan.configuration.__id": func(r plugin.Resource, v *llx.RawData) (ok bool) { r.(*mqlTerraformPlanConfiguration).__id, ok = v.Value.(string) return @@ -682,6 +713,18 @@ var setDataFields = map[string]func(r plugin.Resource, v *llx.RawData) bool { r.(*mqlTerraformPlanConfiguration).Resources, ok = plugin.RawToTValue[[]interface{}](v.Value, v.Error) return }, + "terraform.plan.variable.__id": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlanVariable).__id, ok = v.Value.(string) + return + }, + "terraform.plan.variable.name": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlanVariable).Name, ok = plugin.RawToTValue[string](v.Value, v.Error) + return + }, + "terraform.plan.variable.value": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlTerraformPlanVariable).Value, ok = plugin.RawToTValue[interface{}](v.Value, v.Error) + return + }, "terraform.plan.resourceChange.__id": func(r plugin.Resource, v *llx.RawData) (ok bool) { r.(*mqlTerraformPlanResourceChange).__id, ok = v.Value.(string) return @@ -1732,6 +1775,9 @@ type mqlTerraformPlan struct { FormatVersion plugin.TValue[string] TerraformVersion plugin.TValue[string] ResourceChanges plugin.TValue[[]interface{}] + Variables plugin.TValue[[]interface{}] + Applyable plugin.TValue[bool] + Errored plugin.TValue[bool] } // createTerraformPlan creates a new instance of this resource @@ -1795,6 +1841,18 @@ func (c *mqlTerraformPlan) GetResourceChanges() *plugin.TValue[[]interface{}] { }) } +func (c *mqlTerraformPlan) GetVariables() *plugin.TValue[[]interface{}] { + return &c.Variables +} + +func (c *mqlTerraformPlan) GetApplyable() *plugin.TValue[bool] { + return &c.Applyable +} + +func (c *mqlTerraformPlan) GetErrored() *plugin.TValue[bool] { + return &c.Errored +} + // mqlTerraformPlanConfiguration for the terraform.plan.configuration resource type mqlTerraformPlanConfiguration struct { MqlRuntime *plugin.Runtime @@ -1853,6 +1911,60 @@ func (c *mqlTerraformPlanConfiguration) GetResources() *plugin.TValue[[]interfac }) } +// mqlTerraformPlanVariable for the terraform.plan.variable resource +type mqlTerraformPlanVariable struct { + MqlRuntime *plugin.Runtime + __id string + // optional: if you define mqlTerraformPlanVariableInternal it will be used here + Name plugin.TValue[string] + Value plugin.TValue[interface{}] +} + +// createTerraformPlanVariable creates a new instance of this resource +func createTerraformPlanVariable(runtime *plugin.Runtime, args map[string]*llx.RawData) (plugin.Resource, error) { + res := &mqlTerraformPlanVariable{ + MqlRuntime: runtime, + } + + err := SetAllData(res, args) + if err != nil { + return res, err + } + + if res.__id == "" { + res.__id, err = res.id() + if err != nil { + return nil, err + } + } + + if runtime.HasRecording { + args, err = runtime.ResourceFromRecording("terraform.plan.variable", res.__id) + if err != nil || args == nil { + return res, err + } + return res, SetAllData(res, args) + } + + return res, nil +} + +func (c *mqlTerraformPlanVariable) MqlName() string { + return "terraform.plan.variable" +} + +func (c *mqlTerraformPlanVariable) MqlID() string { + return c.__id +} + +func (c *mqlTerraformPlanVariable) GetName() *plugin.TValue[string] { + return &c.Name +} + +func (c *mqlTerraformPlanVariable) GetValue() *plugin.TValue[interface{}] { + return &c.Value +} + // mqlTerraformPlanResourceChange for the terraform.plan.resourceChange resource type mqlTerraformPlanResourceChange struct { MqlRuntime *plugin.Runtime diff --git a/providers/terraform/resources/terraform.lr.manifest.yaml b/providers/terraform/resources/terraform.lr.manifest.yaml index bd67ac9ea5..fb131bbddd 100755 --- a/providers/terraform/resources/terraform.lr.manifest.yaml +++ b/providers/terraform/resources/terraform.lr.manifest.yaml @@ -87,9 +87,15 @@ resources: title: Display all loaded Terraform modules terraform.plan: fields: + applyable: + min_mondoo_version: 9.0.0 + errored: + min_mondoo_version: 9.0.0 formatVersion: {} resourceChanges: {} terraformVersion: {} + variables: + min_mondoo_version: 9.0.0 min_mondoo_version: latest platform: name: @@ -132,6 +138,14 @@ resources: platform: name: - terraform-plan + terraform.plan.variable: + fields: + name: {} + value: {} + min_mondoo_version: 9.0.0 + platform: + name: + - terraform-plan terraform.settings: fields: backend: diff --git a/providers/terraform/resources/tfplan.go b/providers/terraform/resources/tfplan.go index 0672923a60..3ec1d9e3ca 100644 --- a/providers/terraform/resources/tfplan.go +++ b/providers/terraform/resources/tfplan.go @@ -40,6 +40,12 @@ func initTerraformPlan(runtime *plugin.Runtime, args map[string]*llx.RawData) (m args["formatVersion"] = llx.StringData(plan.FormatVersion) args["terraformVersion"] = llx.StringData(plan.TerraformVersion) + args["applyable"] = llx.BoolData(plan.Applyable) + args["errored"] = llx.BoolData(plan.Errored) + args["variables"] = llx.ArrayData( + variablesToArrayInterface(runtime, plan.Variables), + types.Resource("terraform.plan.variables"), + ) return args, nil, nil } @@ -153,6 +159,11 @@ func (t *mqlTerraformPlanConfiguration) id() (string, error) { return "terraform.plan.configuration", nil } +func (t *mqlTerraformPlanVariable) id() (string, error) { + id := t.Name + return "terraform.plan.variable/name/" + id.Data, nil +} + type PlanConfiguration struct { ProviderConfig map[string]json.RawMessage `json:"provider_config"` RootModule struct { @@ -223,3 +234,25 @@ func (t *mqlTerraformPlanConfiguration) resources() ([]interface{}, error) { } return res, nil } + +func variablesToArrayInterface(runtime *plugin.Runtime, variables connection.Variables) []interface{} { + var list []interface{} + for k, v := range variables { + var value interface{} + err := json.Unmarshal(v.Value, &value) + if err != nil { + continue + } + variable, err := CreateResource(runtime, "terraform.plan.variable", map[string]*llx.RawData{ + "name": llx.StringData(k), + "value": llx.AnyData(value), + }) + if err != nil { + continue + } + + list = append(list, variable) + } + + return list +}