fix chap12

PacktPublishing · Aug 24, 2023 · 489b246 · 489b246
1 parent fd81c84
commit 489b246
Show file tree

Hide file tree

Showing 26 changed files with 483 additions and 62 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
-        exclude: CHAP07/privatemodule
+        exclude: CHAP07/privatemodule|CHAP12/preventdestroy/
       - id: terraform_validate
         exclude: CHAP02/version|CHAP06/validate|CHAP07/privatemodule|CHAP07/moduledemo/myapp-loop
       - id: terraform_tfsec

diff --git a/CHAP12/ansible-inventory/main.tf b/CHAP12/ansible-inventory/main.tf
@@ -9,6 +9,10 @@ terraform {
       source  = "hashicorp/random"
       version = "3.5.1"
     }
+    local = {
+      source  = "hashicorp/local"
+      version = "2.4.0"
+    }
   }
 }
 
@@ -18,16 +22,6 @@ resource "random_string" "random" {
   upper   = false
 }
 
-variable "virtual_machines" {
-  default = [
-    {
-      dns        = "test1.test.cloud"
-      index      = "01"
-      address_ip = "0.0.0.1"
-    }
-  ]
-}
-
 
 provider "azurerm" {
   features {
@@ -63,6 +57,7 @@ resource "azurerm_subnet" "snet1" {
 
 module "linuxservers" {
   source              = "Azure/compute/azurerm"
+  version             = "5.3.0"
   resource_group_name = azurerm_resource_group.rg.name
   vm_os_simple        = "UbuntuServer"
   nb_instances        = 2
@@ -74,8 +69,6 @@ module "linuxservers" {
   admin_password      = "test123*"
 }
 
-
-
 resource "local_file" "inventory" {
   filename = "inventory"
   content = templatefile("template-inventory.tpl",

diff --git a/CHAP12/cert/.terraform.lock.hcl b/CHAP12/cert/.terraform.lock.hcl
diff --git a/CHAP12/cert/main.tf b/CHAP12/cert/main.tf
@@ -1,4 +1,5 @@
 terraform {
+  required_version = "~> 1.1"
   required_providers {
     tls = {
       source  = "hashicorp/tls"
@@ -12,6 +13,10 @@ terraform {
       source  = "hashicorp/random"
       version = "3.5.1"
     }
+    local = {
+      source  = "hashicorp/local"
+      version = "2.4.0"
+    }
   }
 }
 

diff --git a/CHAP12/demogrunt-wrapper/.terraform.lock.hcl b/CHAP12/demogrunt-wrapper/.terraform.lock.hcl
diff --git a/CHAP12/demogrunt-wrapper/main.tf b/CHAP12/demogrunt-wrapper/main.tf
@@ -1,5 +1,3 @@
-
-
 terraform {
   required_version = "~> 1.1"
   backend "local" {}
@@ -18,12 +16,6 @@ provider "azurerm" {
   features {}
 }
 
-locals {
-  common_app_settings = {
-    "INSTRUMENTATIONKEY" = azurerm_application_insights.appinsight-app.instrumentation_key
-  }
-}
-
 resource "random_string" "random" {
   length  = 4
   special = false

diff --git a/CHAP12/demogrunt-wrapper/variables.tf b/CHAP12/demogrunt-wrapper/variables.tf
@@ -25,13 +25,6 @@ variable "environment" {
   description = "Environment Name"
 }
 
-
-variable "custom_app_settings" {
-  type        = map(string)
-  description = "Custom App settings"
-  default     = {}
-}
-
 variable "createdby" {
   type        = string
   description = "name of the triggers user"

diff --git a/CHAP12/demogrunt/dev/network/.terraform.lock.hcl b/CHAP12/demogrunt/dev/network/.terraform.lock.hcl
diff --git a/CHAP12/demogrunt/dev/network/main.tf b/CHAP12/demogrunt/dev/network/main.tf
@@ -1,3 +1,11 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    azurerm = {
+      version = "~> 3.35"
+    }
+  }
+}
 
 provider "azurerm" {
   features {}
@@ -14,7 +22,6 @@ resource "azurerm_virtual_network" "vnet" {
   }
 }
 
-
 resource "azurerm_subnet" "subnet" {
   name                 = var.subnet_name
   resource_group_name  = var.resource_group_name

diff --git a/CHAP12/demogrunt/dev/rg/.terraform.lock.hcl b/CHAP12/demogrunt/dev/rg/.terraform.lock.hcl
diff --git a/CHAP12/demogrunt/dev/rg/main.tf b/CHAP12/demogrunt/dev/rg/main.tf
@@ -1,3 +1,12 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    azurerm = {
+      version = "~> 3.35"
+    }
+  }
+}
+
 provider "azurerm" {
   features {}
 }

diff --git a/CHAP12/demogrunt/dev/rg/variables.tf b/CHAP12/demogrunt/dev/rg/variables.tf
@@ -4,4 +4,5 @@ variable "resource_group_name" {
 
 variable "location" {
   default = "West Europe"
+  type    = string
 }
diff --git a/CHAP12/demogrunt/dev/vm-web/.terraform.lock.hcl b/CHAP12/demogrunt/dev/vm-web/.terraform.lock.hcl
diff --git a/CHAP12/demogrunt/dev/vm-web/main.tf b/CHAP12/demogrunt/dev/vm-web/main.tf
@@ -1,9 +1,16 @@
+terraform {
+  required_version = "~> 1.1"
+  required_providers {
+    azurerm = {
+      version = "~> 3.35"
+    }
+  }
+}
+
 provider "azurerm" {
   features {}
 }
 
-
-
 data "azurerm_subnet" "subnet" {
   name                 = var.subnet_name
   resource_group_name  = var.resource_group_name
@@ -13,6 +20,7 @@ data "azurerm_subnet" "subnet" {
 
 module "linuxservers" {
   source              = "Azure/compute/azurerm"
+  version             = "5.3.0"
   resource_group_name = var.resource_group_name
   vm_os_simple        = "UbuntuServer"
   vnet_subnet_id      = data.azurerm_subnet.subnet.id