From 7e5a75398473b767cd45051c8011c131bed30971 Mon Sep 17 00:00:00 2001 From: husky Date: Mon, 23 Jan 2023 18:58:05 -0500 Subject: [PATCH] fixing warning --- aws-lab/.terraform.lock.hcl | 82 +++++++++++++++++++++++++++++++++++++ aws-lab/network.tf | 4 +- aws-lab/shared-variables.tf | 5 +++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 aws-lab/.terraform.lock.hcl diff --git a/aws-lab/.terraform.lock.hcl b/aws-lab/.terraform.lock.hcl new file mode 100644 index 0000000..3129d9e --- /dev/null +++ b/aws-lab/.terraform.lock.hcl @@ -0,0 +1,82 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "4.39.0" + constraints = "4.39.0" + hashes = [ + "h1:tM2mSfH03Ert/Qd+EUMIavtwjPCM/no91VBH/8vobCE=", + "zh:08e3d453bbeaccda3f4ab7ae45f81d515ab49a765ce2d43f060842bb2e653846", + "zh:238a460231e9e6ca786b2cb2088a98edfc48f0e36c433edd7d65a250980f7566", + "zh:4d5663c2cf521e91caddd5508b13759110bc21b2e9543ff6a9f8cf8d02af1aeb", + "zh:5b397e46aac6db155b4b9162ac168010473d6309ae363301f0335184c1f50be6", + "zh:7178536cfebc6423336798aead72fe774f4d8118ae19ffe6a6a1108fe60608d7", + "zh:867c5269cea2fe15f7ea837507ad0fe97e8913be4348868b284c12217d689457", + "zh:88db4bb188f68011cb05eefb3ea7e5741da1d9acdb3c7bd517e715dfc8c0cfc3", + "zh:95b4da4bdbb2eb02333e52c2ced0c5f133d854f730e3744c0c239268c21feee6", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:9bbe67eaa03bfb293913431b39879385e42473bdb61be842fd78b3c89333f1ba", + "zh:a06b9b5fbe8c84a0da431a22d9dd583143406846c1d8febe06f62fc89aeccd1d", + "zh:cb925338b164e916f289e717f8ecaacf5fd5df56790ec6296158e76d6131b914", + "zh:d9dbf68b0defc220085eda1348f439f724ce83a0636bec18dc83aa73fe2385d5", + "zh:eb59e6234e73bd0d48fe372201155802c9b920711a1da078e5b07508271312ee", + "zh:f68b2685ee86bcf314d74a20e97b5cbe0c63741827143f7a4ba7ec56555329dc", + ] +} + +provider "registry.terraform.io/hashicorp/external" { + version = "2.2.3" + hashes = [ + "h1:uvOYRWcVIqOZSl8YjjaB18yZFz1AWIt2CnK7O45rckg=", + "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9", + "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c", + "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4", + "zh:4b92ae44c6baef4c4952c47be00541055cb5280dd3bc8031dba5a1b2ee982387", + "zh:5641694d5daf3893d7ea90be03b6fa575211a08814ffe70998d5adb8b59cdc0a", + "zh:5bd55a2be8a1c20d732ac9c604b839e1cadc8c49006315dffa4d709b6874df32", + "zh:6e0ef5d11e1597202424b7d69b9da7b881494c9b13a3d4026fc47012dc651c79", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9e19f89fa25004d3b926a8d15ea630b4bde62f1fa4ed5e11a3d27aabddb77353", + "zh:b763efdd69fd097616b4a4c89cf333b4cee9699ac6432d73d2756f8335d1213f", + "zh:e3b561efdee510b2b445f76a52a902c52bee8e13095e7f4bed7c80f10f8d294a", + "zh:fe660bb8781ee043a093b9a20e53069974475dcaa5791a1f45fd03c61a26478a", + ] +} + +provider "registry.terraform.io/hashicorp/http" { + version = "3.2.1" + hashes = [ + "h1:DfxMa1zM/0NCFWN5PAxivSHJMNkOAFZvDYQkO72ZQmw=", + "zh:088b3b3128034485e11dff8da16e857d316fbefeaaf5bef24cceda34c6980641", + "zh:09ed1f2462ea4590b112e048c4af556f0b6eafc7cf2c75bb2ac21cd87ca59377", + "zh:39c6b0b4d3f0f65e783c467d3f634e2394820b8aef907fcc24493f21dcf73ca3", + "zh:47aab45327daecd33158a36c1a36004180a518bf1620cdd5cfc5e1fe77d5a86f", + "zh:4d70a990aa48116ab6f194eef393082c21cf58bece933b63575c63c1d2b66818", + "zh:65470c43fda950c7e9ac89417303c470146de984201fff6ef84299ea29e02d30", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:842b4dd63e438f5cd5fdfba1c09b8fdf268e8766e6690988ee24e8b25bfd9e8d", + "zh:a167a057f7e2d80c78d4b4057538588131fceb983d5c93b07675ad9eb1aa5790", + "zh:d0ba69b62b6db788cfe3cf8f7dc6e9a0eabe2927dc119d7fe3fe6573ee559e66", + "zh:e28d24c1d5ff24b1d1cc6f0074a1f41a6974f473f4ff7a37e55c7b6dca68308a", + "zh:fde8a50554960e5366fd0e1ca330a7c1d24ae6bbb2888137a5c83d83ce14fd18", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.9.1" + hashes = [ + "h1:NUv/YtEytDQncBQ2mTxnUZEy/rmDlPYmE9h2iokR0vk=", + "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", + "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", + "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8c8094689a2bed4bb597d24a418bbbf846e15507f08be447d0a5acea67c2265a", + "zh:a6d9206e95d5681229429b406bc7a9ba4b2d9b67470bda7df88fa161508ace57", + "zh:aa299ec058f23ebe68976c7581017de50da6204883950de228ed9246f309e7f1", + "zh:b129f00f45fba1991db0aa954a6ba48d90f64a738629119bfb8e9a844b66e80b", + "zh:ef6cecf5f50cda971c1b215847938ced4cb4a30a18095509c068643b14030b00", + "zh:f1f46a4f6c65886d2dd27b66d92632232adc64f92145bf8403fe64d5ffa5caea", + "zh:f79d6155cda7d559c60d74883a24879a01c4d5f6fd7e8d1e3250f3cd215fb904", + "zh:fd59fa73074805c3575f08cd627eef7acda14ab6dac2c135a66e7a38d262201c", + ] +} diff --git a/aws-lab/network.tf b/aws-lab/network.tf index cfaf953..f325d40 100644 --- a/aws-lab/network.tf +++ b/aws-lab/network.tf @@ -21,7 +21,7 @@ resource "aws_internet_gateway" "lab_ig" { resource "aws_subnet" "lab_public_subnet" { vpc_id = aws_vpc.lab_vpc.id cidr_block = "10.0.0.0/24" - availability_zone = "us-east-1a" + availability_zone = var.availability_zone map_public_ip_on_launch = true tags = { @@ -178,7 +178,7 @@ resource "aws_security_group" "security_group_guacamole" { from_port = 443 to_port = 443 protocol = "tcp" - cidr_blocks = ["${chomp(data.http.myip.body)}/32"] + cidr_blocks = ["${chomp(data.http.myip.response_body)}/32"] } egress { diff --git a/aws-lab/shared-variables.tf b/aws-lab/shared-variables.tf index bfd37a6..61e819a 100644 --- a/aws-lab/shared-variables.tf +++ b/aws-lab/shared-variables.tf @@ -23,6 +23,11 @@ variable "region" { default = "us-east-1" } +variable "availability_zone" { + description = "The best AWS availability zone for your location" + default = "us-east-1a" +} + variable "enable_guacamole" { description = "Whether to enable the Guacamole server for remote access to the instances (If enabled the FlareVM will have not Internet)" default = true