From 781c7dc62165f1169d0a11c2c806c483d611d01f Mon Sep 17 00:00:00 2001
From: Yakov K <hyakunosuke7@gmail.com>
Date: Sat, 2 Nov 2024 11:34:56 +0200
Subject: [PATCH 1/2] Solution

---
 backend.tf                   |  8 ++++
 main.tf                      | 41 ++++++++++++++++++
 modules/compute/main.tf      | 83 ++++++++++++++++++++++++++++++++++++
 modules/compute/outputs.tf   | 14 ++++++
 modules/compute/variables.tf | 29 +++++++++++++
 modules/network/main.tf      | 43 +++++++++++++++++++
 modules/network/outputs.tf   | 29 +++++++++++++
 modules/network/variables.tf | 15 +++++++
 modules/storage/main.tf      | 13 ++++++
 modules/storage/outputs.tf   |  9 ++++
 modules/storage/variables.tf | 14 ++++++
 outputs.tf                   | 34 +++++++++++++++
 terraform.tfvars             |  3 ++
 variables.tf                 | 51 ++++++++++++++++++++++
 14 files changed, 386 insertions(+)
 create mode 100644 backend.tf
 create mode 100644 main.tf
 create mode 100644 modules/compute/main.tf
 create mode 100644 modules/compute/outputs.tf
 create mode 100644 modules/compute/variables.tf
 create mode 100644 modules/network/main.tf
 create mode 100644 modules/network/outputs.tf
 create mode 100644 modules/network/variables.tf
 create mode 100644 modules/storage/main.tf
 create mode 100644 modules/storage/outputs.tf
 create mode 100644 modules/storage/variables.tf
 create mode 100644 outputs.tf
 create mode 100644 terraform.tfvars
 create mode 100644 variables.tf

diff --git a/backend.tf b/backend.tf
new file mode 100644
index 0000000..2e952a8
--- /dev/null
+++ b/backend.tf
@@ -0,0 +1,8 @@
+terraform {
+  backend "azurerm" {
+    resource_group_name  = "mate-azure-task-12"
+    storage_account_name = "tfstate144"
+    container_name       = "tfstate"
+    key                  = "terraform.tfstate"
+  }
+}
diff --git a/main.tf b/main.tf
new file mode 100644
index 0000000..6a2a487
--- /dev/null
+++ b/main.tf
@@ -0,0 +1,41 @@
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "3.105.0"
+    }
+  }
+}
+
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "main" {
+  name     = var.resource_group_name
+  location = var.location
+}
+
+module "compute" {
+  source              = "./modules/compute"
+  resource_group_name = azurerm_resource_group.main.name
+  vm_name             = var.vm_name
+  location            = azurerm_resource_group.main.location
+  subnet_id           = module.network.subnet_id
+  public_ip_id        = module.network.public_ip_address
+  ssh_key             = var.ssh_key
+}
+
+module "network" {
+  source              = "./modules/network"
+  resource_group_name = azurerm_resource_group.main.name
+  location            = azurerm_resource_group.main.location
+  dns_label_prefix    = var.dns_label
+}
+
+module "storage" {
+  source               = "./modules/storage"
+  resource_group_name  = azurerm_resource_group.main.name
+  location             = azurerm_resource_group.main.location
+  storage_account_name = var.storage_account_name
+}
diff --git a/modules/compute/main.tf b/modules/compute/main.tf
new file mode 100644
index 0000000..d68e281
--- /dev/null
+++ b/modules/compute/main.tf
@@ -0,0 +1,83 @@
+resource "azurerm_network_interface" "main" {
+  name                = "${var.vm_name}-nic"
+  location            = var.location
+  resource_group_name = var.resource_group_name
+
+  ip_configuration {
+    name                          = "internal"
+    subnet_id                     = var.subnet_id
+    private_ip_address_allocation = "Dynamic"
+    public_ip_address_id          = azurerm_public_ip.linuxboxpip.id
+  }
+}
+
+resource "azurerm_public_ip" "linuxboxpip" {
+  name                = "linuxboxpip"
+  location            = var.location
+  resource_group_name = var.resource_group_name
+  allocation_method   = "Static"
+  sku                 = "Standard"
+}
+
+resource "azurerm_virtual_machine" "main" {
+  name                             = "matebox"
+  location                         = var.location
+  resource_group_name              = var.resource_group_name
+  network_interface_ids            = [azurerm_network_interface.main.id]
+  vm_size                          = "Standard_B1s"
+  delete_os_disk_on_termination    = true
+  delete_data_disks_on_termination = true
+
+  os_profile {
+    computer_name  = "todoappserver"
+    admin_username = "adminuser"
+  }
+
+  os_profile_linux_config {
+    disable_password_authentication = true
+
+    ssh_keys {
+    path     = "/home/adminuser/.ssh/authorized_keys"
+    key_data = var.ssh_key
+    }
+  }
+
+  storage_image_reference {
+    publisher = "Canonical"
+    offer     = "0001-com-ubuntu-server-jammy"
+    sku       = "22_04-lts"
+    version   = "latest"
+  }
+
+  storage_os_disk {
+    name              = "myosdisk1"
+    caching           = "ReadWrite"
+    create_option     = "FromImage"
+    managed_disk_type = "Standard_LRS"
+  }
+
+  tags = {
+    environment = "staging"
+  }
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
+resource "azurerm_virtual_machine_extension" "CustomScript" {
+  name                       = "CustomScript"
+  virtual_machine_id         = azurerm_virtual_machine.main.id
+  publisher                  = "Microsoft.Azure.Extensions"
+  type                       = "CustomScript"
+  type_handler_version       = "2.0"
+  auto_upgrade_minor_version = true
+
+  settings = <<SETTINGS
+{
+  "fileUris": ["https://lvkzxjncklvjn.blob.core.windows.net/task-artifacts/install-app.sh"],
+  "commandToExecute": "bash install-app.sh",
+  "skipDos2Unix": true
+}
+SETTINGS
+}
diff --git a/modules/compute/outputs.tf b/modules/compute/outputs.tf
new file mode 100644
index 0000000..c4ddcaf
--- /dev/null
+++ b/modules/compute/outputs.tf
@@ -0,0 +1,14 @@
+output "network_interface_id" {
+  description = "The ID of the network interface."
+  value       = azurerm_network_interface.main.id
+}
+
+output "virtual_machine_id" {
+  description = "The ID of the virtual machine."
+  value       = azurerm_virtual_machine.main.id
+}
+
+output "vm_extension_id" {
+  description = "The ID of the VM extension."
+  value       = azurerm_virtual_machine_extension.CustomScript.id
+}
diff --git a/modules/compute/variables.tf b/modules/compute/variables.tf
new file mode 100644
index 0000000..96c92f5
--- /dev/null
+++ b/modules/compute/variables.tf
@@ -0,0 +1,29 @@
+variable "vm_name" {
+  description = "The name of the virtual machine."
+  type        = string
+}
+
+variable "subnet_id" {
+  description = "The ID of the subnet."
+  type        = string
+}
+
+variable "public_ip_id" {
+  description = "The ID of the public IP address."
+  type        = string
+}
+
+variable "ssh_key" {
+  description = "The SSH public key for authentication."
+  type        = string
+}
+
+variable "resource_group_name" {
+  description = "The name of the resource group."
+  type        = string
+}
+
+variable "location" {
+  description = "The location where resources will be created."
+  type        = string
+}
diff --git a/modules/network/main.tf b/modules/network/main.tf
new file mode 100644
index 0000000..f642e79
--- /dev/null
+++ b/modules/network/main.tf
@@ -0,0 +1,43 @@
+resource "azurerm_virtual_network" "main" {
+  name                = "vnet"
+  address_space       = ["10.0.0.0/16"]
+  location            = var.location
+  resource_group_name = var.resource_group_name
+}
+
+resource "azurerm_subnet" "internal" {
+  name                 = "default"
+  resource_group_name  = var.resource_group_name
+  virtual_network_name = azurerm_virtual_network.main.name
+  address_prefixes     = ["10.0.0.0/24"]
+}
+
+resource "azurerm_network_security_group" "default-nsg" {
+  name                = "default-nsg"
+  location            = var.location
+  resource_group_name = var.resource_group_name
+
+  security_rule {
+      name                       = "TaskRule"
+      priority                   = 100
+      direction                  = "Inbound"
+      access                     = "Allow"
+      protocol                   = "Tcp"
+      source_port_range          = "*"
+      destination_port_range     = "*"
+      source_address_prefix      = "*"
+      destination_address_prefix = "*"
+    }
+  }
+resource "azurerm_public_ip" "linuxboxpip" {
+  name                = "linuxboxpip"
+  resource_group_name = var.resource_group_name
+  location            = var.location
+  allocation_method   = "Dynamic"
+  domain_name_label = "${var.dns_label_prefix}${random_integer.random.result}"
+}
+
+resource "random_integer" "random" {
+  min = 1000
+  max = 9999
+}
diff --git a/modules/network/outputs.tf b/modules/network/outputs.tf
new file mode 100644
index 0000000..d0c02a1
--- /dev/null
+++ b/modules/network/outputs.tf
@@ -0,0 +1,29 @@
+output "vnet_id" {
+  description = "The ID of the virtual network."
+  value       = azurerm_virtual_network.main.id
+}
+
+output "network_security_group_id" {
+  description = "The ID of the network security group."
+  value       = azurerm_network_security_group.default-nsg.id
+}
+
+output "public_ip_id" {
+  description = "The ID of the public IP address."
+  value       = azurerm_public_ip.linuxboxpip.id
+}
+
+output "public_ip_address" {
+  description = "The public IP address value."
+  value       = azurerm_public_ip.linuxboxpip.ip_address
+}
+
+output "public_ip_fqdn" {
+  description = "The fully qualified domain name (FQDN) of the public IP address."
+  value       = azurerm_public_ip.linuxboxpip.fqdn
+}
+
+output "subnet_id" {
+  description = "The ID of the subnet."
+  value = azurerm_subnet.internal.id
+}
diff --git a/modules/network/variables.tf b/modules/network/variables.tf
new file mode 100644
index 0000000..0699d9d
--- /dev/null
+++ b/modules/network/variables.tf
@@ -0,0 +1,15 @@
+variable "resource_group_name" {
+  description = "The name of the resource group."
+  type        = string
+}
+
+variable "location" {
+  description = "The location where resources will be created."
+  type        = string
+}
+
+variable "dns_label_prefix" {
+  description = "The prefix for the DNS label."
+  type        = string
+  default     = "matetask"
+}
diff --git a/modules/storage/main.tf b/modules/storage/main.tf
new file mode 100644
index 0000000..6cffc9a
--- /dev/null
+++ b/modules/storage/main.tf
@@ -0,0 +1,13 @@
+resource "azurerm_storage_account" "storage_account" {
+  name                     = var.storage_account_name
+  resource_group_name      = var.resource_group_name
+  location                 = var.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_container" "task_artifacts" {
+  name                  = "task-artifacts"
+  storage_account_name  = azurerm_storage_account.storage_account.name
+  container_access_type = "private"
+}
diff --git a/modules/storage/outputs.tf b/modules/storage/outputs.tf
new file mode 100644
index 0000000..782f59d
--- /dev/null
+++ b/modules/storage/outputs.tf
@@ -0,0 +1,9 @@
+output "storage_account_name" {
+  value       = azurerm_storage_account.storage_account.name
+  description = "The name of the storage account."
+}
+
+output "storage_container_name" {
+  value       = azurerm_storage_container.task_artifacts.name
+  description = "The name of the storage container."
+}
diff --git a/modules/storage/variables.tf b/modules/storage/variables.tf
new file mode 100644
index 0000000..67d1ea0
--- /dev/null
+++ b/modules/storage/variables.tf
@@ -0,0 +1,14 @@
+variable "resource_group_name" {
+  description = "The name of the resource group."
+  type        = string
+}
+
+variable "storage_account_name" {
+  description = "The name of the storage account."
+  type        = string
+}
+
+variable "location" {
+  description = "The location where resources will be created."
+  type        = string
+}
diff --git a/outputs.tf b/outputs.tf
new file mode 100644
index 0000000..2349bd0
--- /dev/null
+++ b/outputs.tf
@@ -0,0 +1,34 @@
+output "virtual_network_id" {
+  description = "The ID of the virtual network."
+  value       = module.network.vnet_id
+}
+
+output "subnet_id" {
+  description = "The ID of the subnet."
+  value       = module.network.subnet_id
+}
+
+output "network_security_group_id" {
+  description = "The ID of the network security group."
+  value       = module.network.network_security_group_id
+}
+
+output "public_ip_address" {
+  description = "The public IP address."
+  value       = module.network.public_ip_address
+}
+
+output "virtual_machine_id" {
+  description = "The ID of the virtual machine."
+  value       = module.compute.virtual_machine_id
+}
+
+output "vm_extension_id" {
+  description = "The ID of the VM extension."
+  value       = module.compute.vm_extension_id
+}
+
+output "network_interface_id" {
+  description = "The ID of the network interface."
+  value       = module.compute.network_interface_id
+}
diff --git a/terraform.tfvars b/terraform.tfvars
new file mode 100644
index 0000000..746ee1d
--- /dev/null
+++ b/terraform.tfvars
@@ -0,0 +1,3 @@
+ssh_key = <<EOF
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjSa8xOgez5hycgVIbUnCA4Sf+pYofWWSc0H5fGM8ahdhzQ+RxvncmkMhda14lRU5tjTjVtbNKiw+9sZsUpkMcGKH+UEUGIOwXN9NKnZPMGvzByWQragaqAj5vanlDaTdiUYgqD/Ydvhy3zI5ax+PuNr1MQBOZ5bgwlR6fWT71NvY/XQt4cEDE/03ypjwAg57scK6hUsWfYk9iIF9V78d09PyOjIiTi5sVqUFkOtvy02Okqpuvjhtsr7W4gySu46ftKosXJTkYqCkxP7PmWuiOsBWrRAx6ZOvv/IY+CofrMOUUiRMKH9tXD/4mTjlkMwYtVQ4WEZkXLZOo2aVNri0usERnPjEkDmRxEV3YqHxTDhPWZBFnK59QLyPoEpy3HXS1H3Fe3xBVPSMJTzzPwrFo090Lovm8QYveBScLARh1WNGY4PiZFX/tOuadamb7LXNKeSA1MCVKK64D6H9MQ6CK9/NpQYeGXtGfl7TtJkqoIVg+1tgMwqx7JK27KaQG7nu3zY22oFgpqeBxady95JuGWm7mtrEQKv6kJhtByVTZ7xdcqJ62/sn1hcSfGpGsIcLn8tjdr6Ry0o6xSfvRC6iIEzubmCHiUyf/BIH9c1Ab1PgfLA4A8ecPUtAx9rvwvOyM3x2iKsTcmahV/gE6wt8wl0+n4BY9epwNdlUADmvNQQ== hyakunosuke7@gmail.com
+EOF
diff --git a/variables.tf b/variables.tf
new file mode 100644
index 0000000..4096d78
--- /dev/null
+++ b/variables.tf
@@ -0,0 +1,51 @@
+variable "location" {
+  default = "uksouth"
+}
+
+variable "resource_group_name" {
+  default = "mate-azure-task-12"
+}
+
+variable "storage_account_name" {
+  default = "tfstate144"
+}
+
+variable "virtual_network_name" {
+  default = "vnet"
+}
+
+variable "vnet_address_prefix" {
+  default = "10.0.0.0/16"
+}
+
+variable "subnet_name" {
+  default = "default"
+}
+
+variable "subnet_address_prefix" {
+  default = "10.0.0.0/24"
+}
+
+variable "network_security_group_name" {
+  default = "defaultnsg"
+}
+
+variable "public_ip_address_name" {
+  default = "linuxboxpip"
+}
+
+variable "vm_name" {
+  default = "matebox"
+}
+
+variable "vm_size" {
+  default = "Standard_B1s"
+}
+
+variable "ssh_key" {
+  default     = "~/.ssh/id_rsa.pub"
+}
+
+variable "dns_label" {
+  default = "matetask"
+}

From b1df706a5be4206df51309acc8e50b0dc1b2add9 Mon Sep 17 00:00:00 2001
From: Yakov K <hyakunosuke7@gmail.com>
Date: Sat, 2 Nov 2024 13:24:39 +0200
Subject: [PATCH 2/2] Solution2MajorChanges

---
 main.tf                      | 25 +++++-----
 modules/compute/main.tf      | 89 +++++++++++++++---------------------
 modules/compute/outputs.tf   |  4 +-
 modules/compute/variables.tf | 20 ++++----
 modules/network/main.tf      | 35 +++++++-------
 modules/network/outputs.tf   |  6 +--
 modules/network/variables.tf |  8 ++--
 modules/storage/variables.tf | 10 ++--
 variables.tf                 | 55 ++++++----------------
 9 files changed, 104 insertions(+), 148 deletions(-)

diff --git a/main.tf b/main.tf
index 6a2a487..a84561b 100644
--- a/main.tf
+++ b/main.tf
@@ -12,18 +12,8 @@ provider "azurerm" {
 }
 
 resource "azurerm_resource_group" "main" {
-  name     = var.resource_group_name
-  location = var.location
-}
-
-module "compute" {
-  source              = "./modules/compute"
-  resource_group_name = azurerm_resource_group.main.name
-  vm_name             = var.vm_name
-  location            = azurerm_resource_group.main.location
-  subnet_id           = module.network.subnet_id
-  public_ip_id        = module.network.public_ip_address
-  ssh_key             = var.ssh_key
+  name     = "todolist-terraform-task"
+  location = "West Europe"
 }
 
 module "network" {
@@ -33,6 +23,17 @@ module "network" {
   dns_label_prefix    = var.dns_label
 }
 
+module "compute" {
+  source              = "./modules/compute"
+  location            = azurerm_resource_group.main.location
+  resource_group_name = azurerm_resource_group.main.name
+  vm_name             = var.vm_name
+
+  subnet_id    = module.network.subnet_id
+  public_ip_id = module.network.public_ip_address
+  ssh_key      = var.ssh_key
+}
+
 module "storage" {
   source               = "./modules/storage"
   resource_group_name  = azurerm_resource_group.main.name
diff --git a/modules/compute/main.tf b/modules/compute/main.tf
index d68e281..1cec084 100644
--- a/modules/compute/main.tf
+++ b/modules/compute/main.tf
@@ -1,4 +1,11 @@
-resource "azurerm_network_interface" "main" {
+resource "azurerm_public_ip" "linuxboxpip" {
+  name                = "linuxboxpip"
+  location            = var.location
+  resource_group_name = var.resource_group_name
+  allocation_method   = "Static"
+}
+
+resource "azurerm_network_interface" "vm-nic" {
   name                = "${var.vm_name}-nic"
   location            = var.location
   resource_group_name = var.resource_group_name
@@ -11,73 +18,49 @@ resource "azurerm_network_interface" "main" {
   }
 }
 
-resource "azurerm_public_ip" "linuxboxpip" {
-  name                = "linuxboxpip"
-  location            = var.location
+resource "azurerm_linux_virtual_machine" "matebox" {
+  name                = "matebox"
   resource_group_name = var.resource_group_name
-  allocation_method   = "Static"
-  sku                 = "Standard"
-}
-
-resource "azurerm_virtual_machine" "main" {
-  name                             = "matebox"
-  location                         = var.location
-  resource_group_name              = var.resource_group_name
-  network_interface_ids            = [azurerm_network_interface.main.id]
-  vm_size                          = "Standard_B1s"
-  delete_os_disk_on_termination    = true
-  delete_data_disks_on_termination = true
+  location            = var.location
+  size                = "Standard_B1s"
+  admin_username      = "adminuser"
+  network_interface_ids = [
+    azurerm_network_interface.vm-nic.id,
+  ]
 
-  os_profile {
-    computer_name  = "todoappserver"
-    admin_username = "adminuser"
+  admin_ssh_key {
+    username   = "adminuser"
+    public_key = var.ssh_key
   }
 
-  os_profile_linux_config {
-    disable_password_authentication = true
-
-    ssh_keys {
-    path     = "/home/adminuser/.ssh/authorized_keys"
-    key_data = var.ssh_key
-    }
+  os_disk {
+    caching              = "ReadWrite"
+    storage_account_type = "Standard_LRS"
   }
 
-  storage_image_reference {
+  source_image_reference {
     publisher = "Canonical"
     offer     = "0001-com-ubuntu-server-jammy"
     sku       = "22_04-lts"
     version   = "latest"
   }
-
-  storage_os_disk {
-    name              = "myosdisk1"
-    caching           = "ReadWrite"
-    create_option     = "FromImage"
-    managed_disk_type = "Standard_LRS"
-  }
-
-  tags = {
-    environment = "staging"
-  }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "azurerm_virtual_machine_extension" "CustomScript" {
-  name                       = "CustomScript"
-  virtual_machine_id         = azurerm_virtual_machine.main.id
-  publisher                  = "Microsoft.Azure.Extensions"
-  type                       = "CustomScript"
-  type_handler_version       = "2.0"
-  auto_upgrade_minor_version = true
+  name                 = "CustomScript"
+  virtual_machine_id   = azurerm_linux_virtual_machine.matebox.id
+  publisher            = "Microsoft.Azure.Extensions"
+  type                 = "CustomScript"
+  type_handler_version = "2.0"
 
   settings = <<SETTINGS
-{
-  "fileUris": ["https://lvkzxjncklvjn.blob.core.windows.net/task-artifacts/install-app.sh"],
-  "commandToExecute": "bash install-app.sh",
-  "skipDos2Unix": true
-}
+  {
+    "fileUris": [
+      "https://lvkzxjncklvjn.blob.core.windows.net/task-artifacts/install-app.sh"
+    ],
+    "script": "bash install-app.sh"
+  }
 SETTINGS
+
+  depends_on = [azurerm_linux_virtual_machine.matebox]
 }
diff --git a/modules/compute/outputs.tf b/modules/compute/outputs.tf
index c4ddcaf..8f91de3 100644
--- a/modules/compute/outputs.tf
+++ b/modules/compute/outputs.tf
@@ -1,11 +1,11 @@
 output "network_interface_id" {
   description = "The ID of the network interface."
-  value       = azurerm_network_interface.main.id
+  value       = azurerm_network_interface.vm-nic.id
 }
 
 output "virtual_machine_id" {
   description = "The ID of the virtual machine."
-  value       = azurerm_virtual_machine.main.id
+  value       = azurerm_linux_virtual_machine.matebox.id
 }
 
 output "vm_extension_id" {
diff --git a/modules/compute/variables.tf b/modules/compute/variables.tf
index 96c92f5..ec2d808 100644
--- a/modules/compute/variables.tf
+++ b/modules/compute/variables.tf
@@ -1,3 +1,13 @@
+variable "location" {
+  description = "The location where resources will be created."
+  type        = string
+}
+
+variable "resource_group_name" {
+  description = "The name of the resource group."
+  type        = string
+}
+
 variable "vm_name" {
   description = "The name of the virtual machine."
   type        = string
@@ -17,13 +27,3 @@ variable "ssh_key" {
   description = "The SSH public key for authentication."
   type        = string
 }
-
-variable "resource_group_name" {
-  description = "The name of the resource group."
-  type        = string
-}
-
-variable "location" {
-  description = "The location where resources will be created."
-  type        = string
-}
diff --git a/modules/network/main.tf b/modules/network/main.tf
index f642e79..e823066 100644
--- a/modules/network/main.tf
+++ b/modules/network/main.tf
@@ -1,40 +1,41 @@
-resource "azurerm_virtual_network" "main" {
+resource "azurerm_virtual_network" "vnet" {
   name                = "vnet"
   address_space       = ["10.0.0.0/16"]
   location            = var.location
   resource_group_name = var.resource_group_name
 }
 
-resource "azurerm_subnet" "internal" {
+resource "azurerm_subnet" "default" {
   name                 = "default"
   resource_group_name  = var.resource_group_name
-  virtual_network_name = azurerm_virtual_network.main.name
+  virtual_network_name = azurerm_virtual_network.vnet.name
   address_prefixes     = ["10.0.0.0/24"]
 }
 
-resource "azurerm_network_security_group" "default-nsg" {
-  name                = "default-nsg"
+resource "azurerm_network_security_group" "defaultnsg" {
+  name                = "defaultnsg"
   location            = var.location
   resource_group_name = var.resource_group_name
 
   security_rule {
-      name                       = "TaskRule"
-      priority                   = 100
-      direction                  = "Inbound"
-      access                     = "Allow"
-      protocol                   = "Tcp"
-      source_port_range          = "*"
-      destination_port_range     = "*"
-      source_address_prefix      = "*"
-      destination_address_prefix = "*"
-    }
+    name                       = "test123"
+    priority                   = 100
+    direction                  = "Inbound"
+    access                     = "Allow"
+    protocol                   = "Tcp"
+    source_port_range          = "*"
+    destination_port_range     = "*"
+    source_address_prefix      = "*"
+    destination_address_prefix = "*"
   }
+}
+
 resource "azurerm_public_ip" "linuxboxpip" {
   name                = "linuxboxpip"
   resource_group_name = var.resource_group_name
   location            = var.location
-  allocation_method   = "Dynamic"
-  domain_name_label = "${var.dns_label_prefix}${random_integer.random.result}"
+  allocation_method   = "Static"
+  domain_name_label   = "${var.dns_label_prefix}${random_integer.random.result}"
 }
 
 resource "random_integer" "random" {
diff --git a/modules/network/outputs.tf b/modules/network/outputs.tf
index d0c02a1..da7bf33 100644
--- a/modules/network/outputs.tf
+++ b/modules/network/outputs.tf
@@ -1,11 +1,11 @@
 output "vnet_id" {
   description = "The ID of the virtual network."
-  value       = azurerm_virtual_network.main.id
+  value       = azurerm_virtual_network.vnet.id
 }
 
 output "network_security_group_id" {
   description = "The ID of the network security group."
-  value       = azurerm_network_security_group.default-nsg.id
+  value       = azurerm_network_security_group.defaultnsg.id
 }
 
 output "public_ip_id" {
@@ -25,5 +25,5 @@ output "public_ip_fqdn" {
 
 output "subnet_id" {
   description = "The ID of the subnet."
-  value = azurerm_subnet.internal.id
+  value       = azurerm_subnet.default.id
 }
diff --git a/modules/network/variables.tf b/modules/network/variables.tf
index 0699d9d..6daaee7 100644
--- a/modules/network/variables.tf
+++ b/modules/network/variables.tf
@@ -1,10 +1,10 @@
-variable "resource_group_name" {
-  description = "The name of the resource group."
+variable "location" {
+  description = "The location where resources will be created."
   type        = string
 }
 
-variable "location" {
-  description = "The location where resources will be created."
+variable "resource_group_name" {
+  description = "The name of the resource group."
   type        = string
 }
 
diff --git a/modules/storage/variables.tf b/modules/storage/variables.tf
index 67d1ea0..591bc11 100644
--- a/modules/storage/variables.tf
+++ b/modules/storage/variables.tf
@@ -1,3 +1,8 @@
+variable "location" {
+  description = "The location where resources will be created."
+  type        = string
+}
+
 variable "resource_group_name" {
   description = "The name of the resource group."
   type        = string
@@ -7,8 +12,3 @@ variable "storage_account_name" {
   description = "The name of the storage account."
   type        = string
 }
-
-variable "location" {
-  description = "The location where resources will be created."
-  type        = string
-}
diff --git a/variables.tf b/variables.tf
index 4096d78..ddbe2c7 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,51 +1,22 @@
-variable "location" {
-  default = "uksouth"
-}
-
-variable "resource_group_name" {
-  default = "mate-azure-task-12"
-}
-
-variable "storage_account_name" {
-  default = "tfstate144"
-}
-
-variable "virtual_network_name" {
-  default = "vnet"
-}
-
-variable "vnet_address_prefix" {
-  default = "10.0.0.0/16"
-}
-
-variable "subnet_name" {
-  default = "default"
-}
-
-variable "subnet_address_prefix" {
-  default = "10.0.0.0/24"
-}
-
-variable "network_security_group_name" {
-  default = "defaultnsg"
-}
-
-variable "public_ip_address_name" {
-  default = "linuxboxpip"
-}
-
 variable "vm_name" {
-  default = "matebox"
+  description = "The name of the virtual machine."
+  type        = string
+  default     = "matebox"
 }
 
-variable "vm_size" {
-  default = "Standard_B1s"
+variable "dns_label" {
+  description = "The prefix for the DNS label."
+  type        = string
+  default     = "todolist-terraform-task"
 }
 
 variable "ssh_key" {
-  default     = "~/.ssh/id_rsa.pub"
+  description = "The SSH public key for the VM."
+  type        = string
 }
 
-variable "dns_label" {
-  default = "matetask"
+variable "storage_account_name" {
+  description = "The name of the storage account."
+  type        = string
+  default     = "tfstatekagerou4649"
 }