initital workshop modules setup fixes

dcallao · dcallao · commit 624b2df14297 · 2023-03-17T12:34:40.000-07:00
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/examples/k8s-addons/main.tf b/examples/k8s-addons/main.tf
@@ -1,3 +1,3 @@
 terraform {
   required_version = ">= 1.3"
-}
+}
diff --git a/main.tf b/main.tf
@@ -20,4 +20,3 @@ terraform {
 provider "equinix" {
   auth_token = var.metal_auth_token
 }
-
diff --git a/modules/README.md b/modules/README.md
@@ -1,3 +1,3 @@
 # Equinix Labs Modules
 
-These are the Equinix Labs Modules
+These are the Equinix Labs Modules
diff --git a/modules/collaborator-project/terraform.tfvars.example b/modules/collaborator-project/terraform.tfvars.example
@@ -1,2 +1,2 @@
 metal_api_token="your_token_here" #This must be a user API token
-organization_id="your_organization_id"
+organization_id="your_organization_id"
diff --git a/modules/collaborator-project/variables.tf b/modules/collaborator-project/variables.tf
@@ -13,8 +13,3 @@ variable "send_invites" {
   description = "Wether Collaborator invitations should be sent. This could be toggled after a successful provision to prevent sending invitations to a project that could be deleted during a reprovision"
   default     = true
 }
-
-variable "metal_api_token" {
-  description = "Equinix Metal user api token"
-  type        = string
-}
diff --git a/modules/invite-from-csv/README.md b/modules/invite-from-csv/README.md
@@ -11,4 +11,4 @@ terraform apply
 
 <!-- BEGIN_TF_DOCS -->
 
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->
diff --git a/modules/invite-from-csv/main.tf b/modules/invite-from-csv/main.tf
@@ -17,10 +17,10 @@ data "equinix_metal_organization" "org" {
   organization_id = var.organization_id
 }
 
-module "project-invite-setup" {
+module "project_invite_setup" {
   for_each        = { for user in local.users : trimspace(user.email) => user }
   source          = "../collaborator-project"
   organization_id = data.equinix_metal_organization.org.id
   collaborator    = each.value.email
-  metal_api_token = var.metal_api_token
+  send_invites    = var.send_invites
 }
diff --git a/modules/invite-from-csv/terraform.tfvars.example b/modules/invite-from-csv/terraform.tfvars.example
@@ -1,2 +1,2 @@
 metal_api_token="your_token_here" #This must be a user API token
-organization_id="your_organization_id"
+organization_id="your_organization_id"
diff --git a/modules/invite-from-csv/users.csv.example b/modules/invite-from-csv/users.csv.example
@@ -1,4 +1,4 @@
 email,metro,plan
 may@example.com,da,m3.small.x86
 chris@example.com,da,m3.small.x86
-oscar@example.com,da,m3.small.x86
+oscar@example.com,da,m3.small.x86
diff --git a/modules/invite-from-csv/variables.tf b/modules/invite-from-csv/variables.tf
@@ -1,9 +1,3 @@
-variable "metal_api_token" {
-  description = "Equinix Metal user api token."
-  type        = string
-  sensitive   = true
-}
-
 variable "organization_id" {
   type        = string
   description = "Equinix Metal organization id"
@@ -19,4 +13,4 @@ variable "csv_file" {
   type        = string
   description = "Path to a CSV file containing a list of projects to provision: email,metro,plan. Email address is used as the project name and the collaborator. Metro and plan are used to provision the project."
   default     = "users.csv"
-}
+}
diff --git a/modules/workshop/examples/welcome/main.tf b/modules/workshop/examples/welcome/main.tf
@@ -1,10 +1,21 @@
 terraform {
   required_version = ">= 1.3"
+
+  required_providers {
+    equinix = {
+      source  = "equinix/equinix"
+      version = ">= 1.10.0"
+    }
+  }
+}
+
+provider "equinix" {
+  auth_token = var.workshop_metal_api_token
 }
 
-module "welcome-workshop" {
-  source          = "../../"
+module "welcome_workshop" {
+  source                   = "../../"
   workshop_organization_id = var.workshop_organization_id
-  workshop_metal_api_token = var.workshop_metal_api_token
   workshop_csv_file        = var.workshop_csv_file
+  workshop_send_invites    = var.workshop_send_invites
 }
diff --git a/modules/workshop/examples/welcome/outputs.tf b/modules/workshop/examples/welcome/outputs.tf
@@ -2,5 +2,5 @@
 output "workshop_outpus" {
   description = "Outputs of the workshop"
 
-  value = { for k, v in module.welcome-workshop : k => v }
-}
+  value = { for k, v in module.welcome_workshop : k => v }
+}
diff --git a/modules/workshop/examples/welcome/terraform.tfvars.example b/modules/workshop/examples/welcome/terraform.tfvars.example
@@ -1,2 +1,2 @@
 metal_api_token="your_token_here" #This must be a user API token
-organization_id="your_organization_id"
+organization_id="your_organization_id"
diff --git a/modules/workshop/examples/welcome/users.csv.example b/modules/workshop/examples/welcome/users.csv.example
@@ -1,4 +1,4 @@
 email,metro,plan
 may@example.com,da,m3.small.x86
 chris@example.com,da,m3.small.x86
-oscar@example.com,da,m3.small.x86
+oscar@example.com,da,m3.small.x86
diff --git a/modules/workshop/examples/welcome/variables.tf b/modules/workshop/examples/welcome/variables.tf
@@ -13,4 +13,10 @@ variable "workshop_csv_file" {
   type        = string
   description = "Path to a CSV file containing a list of projects to provision: email,metro,plan. Email address is used as the project name and the collaborator. Metro and plan are used to provision the project."
   default     = "users.csv"
-}
+}
+
+variable "workshop_send_invites" {
+  type        = bool
+  description = "Wether Collaborator invitations should be sent. This could be toggled after a successful provision to prevent sending invitations to a project that could be deleted during a reprovision"
+  default     = true
+}
diff --git a/modules/workshop/main.tf b/modules/workshop/main.tf
@@ -1,17 +1,10 @@
 terraform {
   required_version = ">= 1.3"
-
-  required_providers {
-    equinix = {
-      source  = "equinix/equinix"
-      version = ">= 1.10.0"
-    }
-  }
 }
 
-module "project-setup" {
+module "project_setup" {
   source          = "../invite-from-csv"
   organization_id = var.workshop_organization_id
-  metal_api_token = var.workshop_metal_api_token
   csv_file        = var.workshop_csv_file
+  send_invites    = var.workshop_send_invites
 }
diff --git a/modules/workshop/outputs.tf b/modules/workshop/outputs.tf
@@ -2,5 +2,5 @@
 output "workshop_outpus" {
   description = "Outputs of the workshop"
 
-  value = { for k, v in module.project-setup : k => v }
-}
+  value = { for k, v in module.project_setup : k => v }
+}
diff --git a/modules/workshop/users.csv.example b/modules/workshop/users.csv.example
@@ -1,4 +1,4 @@
 email,metro,plan
 may@example.com,da,m3.small.x86
 chris@example.com,da,m3.small.x86
-oscar@example.com,da,m3.small.x86
+oscar@example.com,da,m3.small.x86
diff --git a/modules/workshop/variables.tf b/modules/workshop/variables.tf
@@ -1,9 +1,3 @@
-variable "workshop_metal_api_token" {
-  description = "Equinix Metal user api token."
-  type        = string
-  sensitive   = true
-}
-
 variable "workshop_organization_id" {
   type        = string
   description = "Equinix Metal organization id"
@@ -13,4 +7,10 @@ variable "workshop_csv_file" {
   type        = string
   description = "Path to a CSV file containing a list of projects to provision: email,metro,plan. Email address is used as the project name and the collaborator. Metro and plan are used to provision the project."
   default     = "users.csv"
-}
+}
+
+variable "workshop_send_invites" {
+  type        = bool
+  description = "Wether Collaborator invitations should be sent. This could be toggled after a successful provision to prevent sending invitations to a project that could be deleted during a reprovision"
+  default     = true
+}
diff --git a/variables.tf b/variables.tf
@@ -1,13 +0,0 @@
-# TEMPLATE: Replace sample variable described below with your own.
-variable "metal_project_id" {
-  type        = string
-  description = "The example project id value defines what will be included in the example resource in main.tf. This example is descriptive."
-  sensitive   = false
-}
-
-# TEMPLATE: Replace sample variable described below with your own.
-variable "metal_auth_token" {
-  type        = string
-  description = "The example auth token value defines what will be included in the example resource in main.tf. This example is descriptive."
-  sensitive   = true
-}

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 terraform {
   required_version = ">= 1.3"
 -}
 +}
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,3 @@ terraform {`
`20`	`20`	`provider "equinix" {`
`21`	`21`	`auth_token = var.metal_auth_token`
`22`	`22`	`}`
`23`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Equinix Labs Modules`
`2`	`2`
`3`		`-These are the Equinix Labs Modules`
	`3`	`+These are the Equinix Labs Modules`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`metal_api_token="your_token_here" #This must be a user API token`
`2`		`-organization_id="your_organization_id"`
	`2`	`+organization_id="your_organization_id"`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,3 @@ variable "send_invites" {`
`13`	`13`	`description = "Wether Collaborator invitations should be sent. This could be toggled after a successful provision to prevent sending invitations to a project that could be deleted during a reprovision"`
`14`	`14`	`default = true`
`15`	`15`	`}`
`16`		`-`
`17`		`-variable "metal_api_token" {`
`18`		`- description = "Equinix Metal user api token"`
`19`		`- type = string`
`20`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ terraform apply`
`11`	`11`
`12`	`12`	`<!-- BEGIN_TF_DOCS -->`
`13`	`13`
`14`		`-<!-- END_TF_DOCS -->`
	`14`	`+<!-- END_TF_DOCS -->`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ data "equinix_metal_organization" "org" {`
`17`	`17`	`organization_id = var.organization_id`
`18`	`18`	`}`
`19`	`19`
`20`		`-module "project-invite-setup" {`
	`20`	`+module "project_invite_setup" {`
`21`	`21`	`for_each = { for user in local.users : trimspace(user.email) => user }`
`22`	`22`	`source = "../collaborator-project"`
`23`	`23`	`organization_id = data.equinix_metal_organization.org.id`
`24`	`24`	`collaborator = each.value.email`
`25`		`- metal_api_token = var.metal_api_token`
	`25`	`+ send_invites = var.send_invites`
`26`	`26`	`}`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 email,metro,plan
 [email protected],da,m3.small.x86
 [email protected],da,m3.small.x86
 -[email protected],da,m3.small.x86
 +[email protected],da,m3.small.x86