fixes #1

Author: ocobles

README.md

@@ -58,6 +58,7 @@ Run `terraform init -upgrade` and `terraform apply`.
 
 | Name | Type |
 | :-----: | :------: |
+| [metal_project.this](https://registry.terraform.io/providers/equinix/metal/latest/docs/data-sources/project) | data source |
 | [metal_connection.this](https://registry.terraform.io/providers/equinix/metal/latest/docs/resources/device) | resource |
 | [equinix_ecx_l2_connection.this](https://registry.terraform.io/providers/equinix/equinix/latest/docs/resources/ecx_l2_connection) | resource |
 | [equinix_ecx_l2_sellerprofile.this](https://registry.terraform.io/providers/equinix/equinix/latest/docs/data-sources/ecx_l2_sellerprofile) | data source |

examples/device-redundant-connection/README.md

@@ -1,6 +1,6 @@
 ## Device Redundant Connection Example
 
-This example demonstrates usage of the Equinix terraform-metal-shared-connection module to create a redundant Equinix Fabric connection to interconnect your Equinix Metal resources in Silicon Valley to a single Network Edge device located in Dallas                               
+This example demonstrates usage of the Equinix terraform-metal-shared-connection module to create a redundant Equinix Fabric connection to interconnect your Equinix Metal resources in Silicon Valley to a single Network Edge device located in Dallas.
 
 ```
                                   ┌─────────────────┐
@@ -31,4 +31,3 @@ This example demonstrates usage of the Equinix terraform-metal-shared-connection
 terraform init
 terraform apply
 ```
-

examples/device-redundant-connection/main.tf

@@ -25,19 +25,12 @@ module "connection" {
   source = "../../"
 
   # required variables
-  metal_organization_id                 = var.metal_organization_id
-  metal_project_id                      = var.metal_project_id
-  metal_connection_name                 = "example-metal-conn-side"
-  metal_connection_metro                = "SV"
-  metal_connection_redundancy           = "redundant"
-  fabric_connection_name                = "example-ef-conn-side"
-  fabric_connection_speed               = 50
-  fabric_connection_speed_unit          = "MB"
+  metal_project_name                    = var.metal_project_name
+  metal_connection_name                 = "example-connection"
+  metal_connection_metro                = "FR"
   fabric_connection_notification_users  = ["example@equinix.com"]
 
   # optional variables
-  metal_connection_description          = "Example description"
-  metal_connection_tags                 = ["terraformed"]
+  metal_connection_redundancy           = "redundant"
   fabric_connection_device_id           = var.fabric_device_id
-  fabric_secondary_connection_device_id = var.fabric_device_id
 }

examples/device-redundant-connection/variables.tf

@@ -2,23 +2,20 @@ variable "auth_token" {
   type = string
   description = "This is your Equinix Metal API Auth token."
 }
+
 variable "fabric_client_id" {
   type = string
   description = "API Consumer Key available under 'My Apps' in Equinix developer portal."
 }
+
 variable "fabric_client_secret" {
   type = string
   description = "API Consumer secret available under 'My Apps' in Equinix developer portal."
 }
 
-variable "metal_organization_id" {
-  type        = string
-  description = "ID of the organization responsible for the connection."
-}
-
-variable "metal_project_id" {
+variable "metal_project_name" {
   type        = string
-  description = "ID of the project where the connection is scoped to, must be set for shared connection."
+  description = "Name of the project where the connection is scoped to, must be set for shared connection."
 }
 
 variable "fabric_device_id" {

main.tf

@@ -1,7 +1,12 @@
+
+data "metal_project" "this" {
+    name = var.metal_project_name
+}
+
 resource "metal_connection" "this" {
     name            = var.metal_connection_name
-    organization_id = var.metal_organization_id
-    project_id      = var.metal_project_id
+    organization_id = data.metal_project.this.organization_id
+    project_id      = data.metal_project.this.project_id
     metro           = var.metal_connection_metro
     redundancy      = var.metal_connection_redundancy
     type            = "shared"
@@ -23,8 +28,12 @@ data "equinix_ecx_port" "secondary" {
     name    = var.fabric_secondary_connection_port_name
 }
 
+locals {
+  fabric_connection_name = var.fabric_connection_name != null ? var.fabric_connection_name : var.metal_connection_name
+}
+
 resource "equinix_ecx_l2_connection" "this" {
-    name              = var.fabric_connection_name
+    name              = local.fabric_connection_name
     profile_uuid      = data.equinix_ecx_l2_sellerprofile.this.uuid
     speed             = var.fabric_connection_speed
     speed_unit        = var.fabric_connection_speed_unit
@@ -38,10 +47,10 @@ resource "equinix_ecx_l2_connection" "this" {
     dynamic "secondary_connection" {
         for_each = var.metal_connection_redundancy == "redundant" ? [1] : []
         content {
-            name        = "${var.fabric_connection_name}-sec"
+            name        = "${local.fabric_connection_name}-sec"
             port_uuid   = var.fabric_secondary_connection_port_name != null ? data.equinix_ecx_port.secondary[0].id : null 
             vlan_stag   = var.fabric_secondary_connection_port_name != null ? var.fabric_secondary_connection_vlan_id : null
-            device_uuid = var.fabric_secondary_connection_device_id
+            device_uuid = var.fabric_secondary_connection_device_id != null ? var.fabric_secondary_connection_device_id : var.fabric_connection_device_id
         }
     }
 }

variables.tf

@@ -1,16 +1,11 @@
-variable "metal_organization_id" {
+variable "metal_project_name" {
   type        = string
-  description = "ID of the organization responsible for the connection."
-}
-
-variable "metal_project_id" {
-  type        = string
-  description = "ID of the project where the connection is scoped to, must be set for shared connection."
+  description = "Name of the project where the connection is scoped to."
 }
 
 variable "metal_connection_name" {
   type        = string
-  description = "Name of the connection resource."
+  description = "Name of the connection resource that will be created."
 }
 
 variable "metal_connection_metro" {
@@ -25,6 +20,7 @@ variable "metal_connection_metro" {
 variable "metal_connection_redundancy" {
   type        = string
   description = "Connection redundancy - redundant or primary."
+  default     = "primary"
   validation {
     condition     = contains(["primary", "redundant"], var.metal_connection_redundancy)
     error_message = "Argument 'metal_connection_redundancy' must one of 'primary', or 'redundant'."
@@ -45,17 +41,20 @@ variable "metal_connection_tags" {
 
 variable "fabric_connection_name" {
   type        = string
-  description = "Connection name. An alpha-numeric 24 characters string which can include only hyphens and underscores."
+  description = "Name of the connection resource that will be created in Equinix Fabric side. If it is not defined, it will take the value in 'metal_connection_name' by default."
+  default     = null
 }
 
 variable "fabric_connection_speed" {
   type        = number
   description = "Speed/Bandwidth to be allocated to the connection - (MB or GB). "
+  default     = 50
 }
 
 variable "fabric_connection_speed_unit" {
   type        = string
   description = " Unit of the speed/bandwidth to be allocated to the connection."
+  default     = "MB"
 }
 
 variable "fabric_connection_notification_users" {
@@ -94,7 +93,7 @@ variable "fabric_connection_vlan_id" {
 
 variable "fabric_secondary_connection_device_id" {
   type        = string
-  description = "(Required when metal_connection_redundancy is 'redundant' and fabric_secondary_connection_port_name is not set) Unique identifier of the Network Edge virtual device from which the secondary connection would originate."
+  description = "(Required when metal_connection_redundancy is 'redundant' and fabric_secondary_connection_port_name is not set) Unique identifier of the Network Edge virtual device from which the secondary connection would originate. If it is not defined, it will take the value in 'fabric_connection_device_id' by default."
   default     = null
 }