Merge branch 'main' of https://github.com/ned1313/terraform-tuesdays

ned1313 · Feb 21, 2024 · 8766f2a · 8766f2a
2 parents d344724 + e1765b7
commit 8766f2a
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 74 deletions.
diff --git a/2020-06-30-ModuleLooping/file-creator/outputs.tf b/2020-06-30-ModuleLooping/file-creator/outputs.tf
@@ -1 +1,4 @@
-# No outputs defined
+# No outputs defined
+output "stuff" {
+ value = local_file.my_file.id
+}
diff --git a/2020-06-30-ModuleLooping/main.tf b/2020-06-30-ModuleLooping/main.tf
@@ -29,4 +29,21 @@ module "files_foreach" {
  content = each.value
  filename = "${each.key}.txt"
 
+}
+
+provider "local" {
+ alias = "alt"
+}
+
+resource "local_file" "test" {
+ for_each = toset(["a", "b", "c"])
+ provider = local.alt
+
+ content = each.key
+ filename = "${each.key}.txt"
+}
+
+output "names" {
+ value = module.files[*].stuff
+
 }
diff --git a/2024-02-20-TestingFramework/.terraform.lock.hcl b/2024-02-20-TestingFramework/.terraform.lock.hcl
diff --git a/testing-framework/index.html → 2024-02-20-TestingFramework/index.html b/testing-framework/index.html → 2024-02-20-TestingFramework/index.html
@@ -2,10 +2,12 @@
 <html>
 <head>
  <meta charset="utf-8">
- <title>I love cats! 😽</title>
+ <title>🐈🌮 I love tacocat! 🌮🐈</title>
 </head>
 <body>
- <h1>Hi! Here's a cat.</h1>
+ <h1>Hi! Here's a taco: 🌮</h1>
+ <p>And here's a cat:</p>
  <img src="https://placekitten.com/200/300" alt="Meow!">
+ <p>TACOCAT!</p>
 </body>
 </html>
diff --git a/testing-framework/main.tf → 2024-02-20-TestingFramework/main.tf b/testing-framework/main.tf → 2024-02-20-TestingFramework/main.tf
diff --git a/testing-framework/outputs.tf → 2024-02-20-TestingFramework/outputs.tf b/testing-framework/outputs.tf → 2024-02-20-TestingFramework/outputs.tf
diff --git a/testing-framework/terraform.tf → 2024-02-20-TestingFramework/terraform.tf b/testing-framework/terraform.tf → 2024-02-20-TestingFramework/terraform.tf
@@ -5,9 +5,5 @@ terraform {
  source = "hashicorp/azurerm"
  version = "~>3.0"
  }
- random = {
- source = "hashicorp/random"
- version = "~>3.0"
- }
  }
 }
diff --git a/...ng-framework/tests/integration.tftest.hcl → ...ingFramework/tests/integration.tftest.hcl b/...ng-framework/tests/integration.tftest.hcl → ...ingFramework/tests/integration.tftest.hcl
@@ -1,4 +1,5 @@
 # Create a random integer for website naming
+/*
 run "random_int_apply" {
  module {
  source = "./tests/setup"
@@ -27,4 +28,5 @@ run "check_site" {
  condition = data.http.main.status_code == 200
  error_message = "Website ${run.execute.homepage_url} returned the status code ${data.http.main.status_code}. Expected 200."
  }
-}
+}
+*/
diff --git a/testing-framework/tests/loader/main.tf → ...-20-TestingFramework/tests/loader/main.tf b/testing-framework/tests/loader/main.tf → ...-20-TestingFramework/tests/loader/main.tf
diff --git a/testing-framework/tests/setup/main.tf → ...2-20-TestingFramework/tests/setup/main.tf b/testing-framework/tests/setup/main.tf → ...2-20-TestingFramework/tests/setup/main.tf
diff --git a/testing-framework/tests/unit.tftest.hcl → ...20-TestingFramework/tests/unit.tftest.hcl b/testing-framework/tests/unit.tftest.hcl → ...20-TestingFramework/tests/unit.tftest.hcl
@@ -11,7 +11,7 @@ run "sa_test_1" {
  error_message = "${var.website_name} did not render properly. Received ${local.storage_account_name}."
  }
 }
-
+/*
 run "sa_test_2" {
  command = plan
 
@@ -38,14 +38,16 @@ run "sa_test_3" {
  }
 }
 
+
 run "sa_test_4" {
  command = plan
 
  variables {
- website_name = "ThisNameIsTOOLONG2Use"
+ website_name = "ThisIsAReallyLongName"
  }
 
  expect_failures = [
  var.website_name,
  ]
-}
+}
+*/
diff --git a/testing-framework/variables.tf → 2024-02-20-TestingFramework/variables.tf b/testing-framework/variables.tf → 2024-02-20-TestingFramework/variables.tf
@@ -5,11 +5,11 @@ variable "location" {
 
 variable "website_name" {
  description = "The website name to use to create related resources in Azure."
- default = "catmandu"
+ default = "tacocat"
 
  validation {
- condition = length(var.website_name) <= 16
- error_message = "Website name must be 16 or less characters. Submitted value was ${length(var.website_name)}"
+ condition = length(var.website_name) <= 17
+ error_message = "The website name must be 17 characters or fewer."
  }
 }
 

diff --git a/testing-framework/.terraform.lock.hcl b/testing-framework/.terraform.lock.hcl