fix chap07

.pre-commit-config.yaml

@@ -4,8 +4,10 @@ repos:
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
+        exclude: CHAP07/privatemodule
       - id: terraform_validate
-        exclude: CHAP02/version|CHAP06/validate
+        exclude: CHAP02/version|CHAP06/validate|CHAP07/privatemodule|CHAP07/moduledemo/myapp-loop
       - id: terraform_tfsec
+        exclude: CHAP07/privatemodule
         args:
          - --args=--config-file=__GIT_WORKING_DIR__/.tfsec/config.yml  --ignore-hcl-errors

CHAP07/generatedmodule/examples/simple/main.tf

@@ -1,3 +1,6 @@
+terraform {
+  required_version = "~> 1.1"
+}
 module "random_shuffle" {
   source = "../../"
 }

CHAP07/generatedmodule/main.tf

@@ -1,3 +1,12 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    random = {
+      source  = "hashicorp/random"
+      version = "3.5.1"
+    }
+  }
+}
 resource "random_shuffle" "rs" {
   input        = var.raw_string_list
   result_count = var.permutation_count

CHAP07/generatedmodule/test/fixture/main.tf

@@ -1,3 +1,7 @@
+terraform {
+  required_version = "~> 1.1"
+}
+
 module "template" {
   source            = "../../"
   raw_string_list   = var.raw_string_list_test

CHAP07/generatedmodule/test/fixture/variables.tf

@@ -6,4 +6,5 @@ variable "raw_string_list_test" {
 
 variable "permutation_count_test" {
   description = ""
+  type        = number
 }

CHAP07/generatedmodule/variables.tf

@@ -7,4 +7,5 @@ variable "raw_string_list" {
 variable "permutation_count" {
   description = ""
   default     = 1
+  type        = number
 }

CHAP07/moduledemo/Modules/execscript/main.tf

@@ -1,3 +1,12 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    null = {
+      source  = "hashicorp/null"
+      version = "3.2.1"
+    }
+  }
+}
 resource "null_resource" "execfile" {
   provisioner "local-exec" {
     command     = "${path.module}/script.sh"

CHAP07/moduledemo/Modules/webapp/main.tf

@@ -1,12 +1,17 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "~> 1.1"
   required_providers {
     azurerm = {
-      version = "~> 3.18"
+      version = "~> 3.23"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.5.1"
     }
   }
 }
 
+
 provider "azurerm" {
   features {}
 }

CHAP07/moduledemo/Modules/webapp/variables.tf

@@ -1,17 +1,21 @@
 variable "resource_group_name" {
   description = "Resource group name"
+  type        = string
 }
 
 variable "location" {
   description = "Location of Azure resource"
   default     = "West Europe"
+  type        = string
 }
 
 variable "service_plan_name" {
   description = "Service plan name"
+  type        = string
 }
 
 variable "app_name" {
   description = "Name of application"
+  type        = string
 }
 

CHAP07/moduledemo/MyApp/main.tf

@@ -1,9 +1,8 @@
-
 terraform {
-  required_version = "~> 1.0"
+  required_version = "~> 1.1"
   required_providers {
     azurerm = {
-      version = "~> 3.18"
+      version = "~> 3.23"
     }
   }
 }

CHAP07/moduledemo/callscript/main.tf

@@ -1,3 +1,7 @@
+terraform {
+  required_version = "~> 1.1"
+}
+
 module "execfile" {
   source = "../Modules/execscript"
 }

CHAP07/moduledemo/myapp-loop/main.tf

@@ -1,9 +1,8 @@
-
 terraform {
-  required_version = "~> 1.0"
+  required_version = "~> 1.1"
   required_providers {
     azurerm = {
-      version = "~> 3.18"
+      version = "~> 3.23"
     }
     random = {
       source  = "hashicorp/random"

CHAP07/privatemodule/main.tf

@@ -1,6 +1,10 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 1.1"
+  required_providers {
+    azurerm = {
+      version = "~> 3.23"
+    }
+  }
 }
 
 provider "azurerm" {
@@ -13,7 +17,7 @@ resource "azurerm_resource_group" "rg-app" {
 }
 
 module "webapp" {
-  source              = "git@ssh.dev.azure.com:v3/BookLabs/Terraform-modules/terraform-azurerm-webapp"
+  source              = "git::https://BookLabs@dev.azure.com/BookLabs/Terraform-modules/_git/terraform-azurerm-webapp?ref=v1.0.0"
   service_plan_name   = "spmyapp2"
   app_name            = "myappdemobook2"
   location            = azurerm_resource_group.rg-app.location

CHAP07/publicmodule/main.tf

@@ -1,5 +1,12 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    azurerm = {
+      version = "~> 3.23"
+    }
+  }
+}
 
-terraform { required_version = ">= 1.0" }
 provider "azurerm" {
   features {}
 }
@@ -11,9 +18,11 @@ resource "azurerm_resource_group" "rg" {
 
 module "network" {
   source              = "Azure/network/azurerm"
+  version             = "5.3.0"
   resource_group_name = azurerm_resource_group.rg.name
   vnet_name           = "vnetdemo"
   address_space       = "10.0.0.0/16"
   subnet_prefixes     = ["10.0.1.0/24"]
   subnet_names        = ["subnetdemo"]
+  use_for_each        = true
 }

CHAP07/sample-app/main.tf

@@ -1,12 +1,12 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "~> 1.1"
   required_providers {
     azurerm = {
-      version = "~> 3.18"
+      version = "~> 3.23"
     }
     random = {
       source  = "hashicorp/random"
-      version = "2.3.0"
+      version = "3.5.1"
     }
   }
 }
@@ -15,12 +15,6 @@ provider "azurerm" {
   features {}
 }
 
-locals {
-  common_app_settings = {
-    "INSTRUMENTATIONKEY" = azurerm_application_insights.appinsight-app.instrumentation_key
-  }
-}
-
 resource "random_string" "random" {
   length  = 4
   special = false

CHAP07/sample-app/variables.tf

@@ -1,26 +1,32 @@
 variable "resource_group_name" {
   description = "Resource group name"
+  type        = string
 }
 
 variable "location" {
   description = "Location of Azure reource"
   default     = "westeurope"
+  type        = string
 }
 
 variable "service_plan_name" {
   description = "Service plan name"
+  type        = string
 }
 
 variable "app_name" {
   description = "Name of application"
   default     = "MyApp-demo"
+  type        = string
 }
 
 variable "environment" {
   description = "Environment Name"
+  type        = string
 }
 
 variable "createdby" {
   description = "name of the triggers user"
   default     = "NA"
+  type        = string
 }