diff --git a/.tfsec/config.yml b/.tfsec/config.yml index e23dfe0..6cfb99c 100644 --- a/.tfsec/config.yml +++ b/.tfsec/config.yml @@ -7,4 +7,5 @@ exclude: - azure-compute-disable-password-authentication - azure-network-ssh-blocked-from-internet - azure-network-no-public-ingress - - azure-storage-use-secure-tls-policy \ No newline at end of file + - azure-storage-use-secure-tls-policy + - azure-storage-enforce-https diff --git a/CHAP11/kitchen/.terraform.lock.hcl b/CHAP11/kitchen/.terraform.lock.hcl new file mode 100644 index 0000000..30cdb7c --- /dev/null +++ b/CHAP11/kitchen/.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/local" { + version = "2.4.0" + hashes = [ + "h1:R97FTYETo88sT2VHfMgkPU3lzCsZLunPftjSI5vfKe8=", + "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9", + "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf", + "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35", + "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04", + "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406", + "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6", + "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7", + "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2", + "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc", + "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce", + ] +} diff --git a/CHAP11/kitchen/main.tf b/CHAP11/kitchen/main.tf index 5de2933..3680bcc 100644 --- a/CHAP11/kitchen/main.tf +++ b/CHAP11/kitchen/main.tf @@ -1,3 +1,12 @@ +terraform { + required_version = "~> 1.1" + required_providers { + local = { + source = "hashicorp/local" + version = "2.4.0" + } + } +} variable "vmhosts" { type = list(string) diff --git a/CHAP11/moduletest/.terraform.lock.hcl b/CHAP11/moduletest/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/moduletest/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/moduletest/main.tf b/CHAP11/moduletest/main.tf index 9db9c23..e347f48 100644 --- a/CHAP11/moduletest/main.tf +++ b/CHAP11/moduletest/main.tf @@ -1,3 +1,15 @@ +terraform { + required_version = "~> 1.1" + required_providers { + azurerm = { + version = "~> 3.35" + } + } +} + +provider "azurerm" { + features {} +} resource "azurerm_resource_group" "rg" { name = "rg-demo-module" diff --git a/CHAP11/moduletest/provider.tf b/CHAP11/moduletest/provider.tf deleted file mode 100644 index a613eb1..0000000 --- a/CHAP11/moduletest/provider.tf +++ /dev/null @@ -1,12 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" - } - } -} - -provider "azurerm" { - features {} -} \ No newline at end of file diff --git a/CHAP11/moduletest/tests/defaults/.terraform.lock.hcl b/CHAP11/moduletest/tests/defaults/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/moduletest/tests/defaults/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/moduletest/tests/defaults/test_defaults.tf b/CHAP11/moduletest/tests/defaults/test_defaults.tf index 88d8f93..a7e75c5 100644 --- a/CHAP11/moduletest/tests/defaults/test_defaults.tf +++ b/CHAP11/moduletest/tests/defaults/test_defaults.tf @@ -1,4 +1,5 @@ terraform { + required_version = "~> 1.1" required_providers { # Because we're currently using a built-in provider as # a substitute for dedicated Terraform language syntax diff --git a/CHAP11/opa/.terraform.lock.hcl b/CHAP11/opa/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/opa/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/opa/main.tf b/CHAP11/opa/main.tf index 07a6645..9777aab 100644 --- a/CHAP11/opa/main.tf +++ b/CHAP11/opa/main.tf @@ -1,8 +1,8 @@ terraform { + required_version = "~> 1.1" required_providers { azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" + version = "~> 3.35" } } } diff --git a/CHAP11/pytest/.terraform.lock.hcl b/CHAP11/pytest/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/pytest/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/pytest/main.tf b/CHAP11/pytest/main.tf index 5fe5d93..dc9dc0d 100644 --- a/CHAP11/pytest/main.tf +++ b/CHAP11/pytest/main.tf @@ -1,8 +1,8 @@ terraform { + required_version = "~> 1.1" required_providers { azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" + version = "~> 3.35" } } } diff --git a/CHAP11/testing-terratest/module/main.tf b/CHAP11/testing-terratest/module/main.tf index 1874382..7cf2733 100644 --- a/CHAP11/testing-terratest/module/main.tf +++ b/CHAP11/testing-terratest/module/main.tf @@ -1,6 +1,14 @@ -variable "string1" {} +terraform { + required_version = "~> 1.1" +} -variable "string2" {} +variable "string1" { + type = string +} + +variable "string2" { + type = string +} ## PUT YOUR MODULE CODE ## diff --git a/CHAP11/testing-terratest/module/tests/fixture/main.tf b/CHAP11/testing-terratest/module/tests/fixture/main.tf index 728783d..d1fe156 100644 --- a/CHAP11/testing-terratest/module/tests/fixture/main.tf +++ b/CHAP11/testing-terratest/module/tests/fixture/main.tf @@ -1,3 +1,7 @@ +terraform { + required_version = "~> 1.1" +} + module "demo" { source = "../../" string1 = "module" diff --git a/CHAP11/tf-compliance/.terraform.lock.hcl b/CHAP11/tf-compliance/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/tf-compliance/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/tf-compliance/main.tf b/CHAP11/tf-compliance/main.tf index 3c79c6a..479c8f6 100644 --- a/CHAP11/tf-compliance/main.tf +++ b/CHAP11/tf-compliance/main.tf @@ -1,9 +1,8 @@ - terraform { + required_version = "~> 1.1" required_providers { azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" + version = "~> 3.35" } } } diff --git a/CHAP11/tf-pester/.terraform.lock.hcl b/CHAP11/tf-pester/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/tf-pester/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/tf-pester/main.tf b/CHAP11/tf-pester/main.tf index b96cb83..922accd 100644 --- a/CHAP11/tf-pester/main.tf +++ b/CHAP11/tf-pester/main.tf @@ -1,8 +1,8 @@ terraform { + required_version = "~> 1.1" required_providers { azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" + version = "~> 3.35" } } } diff --git a/CHAP11/tfsec/.terraform.lock.hcl b/CHAP11/tfsec/.terraform.lock.hcl new file mode 100644 index 0000000..330a632 --- /dev/null +++ b/CHAP11/tfsec/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/azurerm" { + version = "3.70.0" + constraints = "~> 3.0" + hashes = [ + "h1:jgxJjER0Odm7FCoPrd0Y+mFK6snGHFLDGJo+XkrKlZM=", + "zh:0b8a1fdce4406e066ad3f4cfe7217cdde83ff980c9d145dcea3de715b211bd46", + "zh:0cd04221c0242c579a4ab27aeb6f4d97cff26a23e8863d38d32c06a339791356", + "zh:4afa2e6d89f9e352402caee1a93ebe239218fb54c761d3170ed6acb70929455d", + "zh:62ba9870786632150ea806fa3e034fa4f822b8f4d17422033b21ed98001994cf", + "zh:762502f741936f4831692b32e7fe2f665001eec83cd18e65804fa04a02a0a311", + "zh:887c0e35e79fdb4a6740c232c683adc5344067f0297c28646d6f811b33501c6c", + "zh:927baea8f6a399782c9f53f8035f8abe306cdde2382b31ab982a0b5a975a98ab", + "zh:9d10f8821b23c331cb39fa275aaa298968344a7849ca72dc5dc7d6c04b4df4ec", + "zh:a6d907e78f78dc944c941d9853836b08f1402727026f9b9183a33f4302e39e1b", + "zh:a8f81fd109c3e0e662a0067cc5a2d4828f4906c07cb05d8e91a1c5b3fa09818f", + "zh:ba89168e9ca8144c84503071fe0498cced288965314cba40962a6b71cfcd5a4b", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/CHAP11/tfsec/main.tf b/CHAP11/tfsec/main.tf index e29622c..f028603 100644 --- a/CHAP11/tfsec/main.tf +++ b/CHAP11/tfsec/main.tf @@ -1,8 +1,8 @@ terraform { + required_version = "~> 1.1" required_providers { azurerm = { - source = "hashicorp/azurerm" - version = "~> 3.0" + version = "~> 3.35" } } }