Updated documentation and tests

Author: rschmied

docs/resources/lab.md

@@ -14,8 +14,8 @@ A lab resource represents a CML lab. At create time, a lab title, lab descriptio
 
 ```terraform
 # This shows the use of a lab with nodes and links the links are explicitly
-# specified with slots Nothing will be started, just basic create, read update /
-# delete.
+# specified with slots Nothing will be started, just basic create, read update
+# and delete.
 
 resource "cml2_lab" "twonode" {
   title       = "two node lab"

docs/resources/lifecycle.md

@@ -105,18 +105,17 @@ resource "cml2_link" "l4" {
 
 resource "cml2_lifecycle" "top" {
   lab_id = cml2_lab.this.id
-  # the elements list has the dependencies
-  elements = [
-    cml2_node.ext.id,
-    cml2_node.ums1.id,
-    cml2_node.r1.id,
-    cml2_node.r2.id,
-    cml2_node.r3.id,
-    cml2_link.l0.id,
-    cml2_link.l1.id,
-    cml2_link.l2.id,
-    cml2_link.l3.id,
-    cml2_link.l4.id,
+  depends_on = [
+    cml2_node.ext,
+    cml2_node.ums1,
+    cml2_node.r1,
+    cml2_node.r2,
+    cml2_node.r3,
+    cml2_link.l0,
+    cml2_link.l1,
+    cml2_link.l2,
+    cml2_link.l3,
+    cml2_link.l4,
   ]
   staging = {
     stages          = ["infra", "group1"]

examples/resources/cml2_lab/resource.tf

@@ -1,6 +1,6 @@
 # This shows the use of a lab with nodes and links the links are explicitly
-# specified with slots Nothing will be started, just basic create, read update /
-# delete.
+# specified with slots Nothing will be started, just basic create, read update
+# and delete.
 
 resource "cml2_lab" "twonode" {
   title       = "two node lab"

examples/resources/cml2_lifecycle/eleven-nodes.tf

@@ -199,34 +199,34 @@ resource "cml2_link" "l10" {
 
 resource "cml2_lifecycle" "top" {
   lab_id = cml2_lab.this.id
-  elements = [
+  depends_on = [
     # Note that referencing all elements is not strictly
     # required. As an alternative, a single "sentinel"
     # node could be used which is started at the very end
     # based on its tag. In particular, links could be ommited.
-    cml2_node.ext.id,
-    cml2_node.ums1.id,
-    cml2_node.ios.id,
-    cml2_node.r1.id,
-    cml2_node.r3.id,
-    cml2_node.r4.id,
-    cml2_node.r5.id,
-    cml2_node.r6.id,
-    cml2_node.r7.id,
-    cml2_node.r8.id,
-    cml2_node.r9.id,
-
-    cml2_link.l0.id,
-    cml2_link.l1.id,
-    cml2_link.l2.id,
-    cml2_link.l3.id,
-    cml2_link.l4.id,
-    cml2_link.l5.id,
-    cml2_link.l6.id,
-    cml2_link.l7.id,
-    cml2_link.l8.id,
-    cml2_link.l9.id,
-    cml2_link.l10.id
+    cml2_node.ext,
+    cml2_node.ums1,
+    cml2_node.ios,
+    cml2_node.r1,
+    cml2_node.r3,
+    cml2_node.r4,
+    cml2_node.r5,
+    cml2_node.r6,
+    cml2_node.r7,
+    cml2_node.r8,
+    cml2_node.r9,
+
+    cml2_link.l0,
+    cml2_link.l1,
+    cml2_link.l2,
+    cml2_link.l3,
+    cml2_link.l4,
+    cml2_link.l5,
+    cml2_link.l6,
+    cml2_link.l7,
+    cml2_link.l8,
+    cml2_link.l9,
+    cml2_link.l10
   ]
   configs = {
     "R1" : "hostname injected-hostname"

examples/resources/cml2_lifecycle/resource.tf

@@ -90,18 +90,17 @@ resource "cml2_link" "l4" {
 
 resource "cml2_lifecycle" "top" {
   lab_id = cml2_lab.this.id
-  # the elements list has the dependencies
-  elements = [
-    cml2_node.ext.id,
-    cml2_node.ums1.id,
-    cml2_node.r1.id,
-    cml2_node.r2.id,
-    cml2_node.r3.id,
-    cml2_link.l0.id,
-    cml2_link.l1.id,
-    cml2_link.l2.id,
-    cml2_link.l3.id,
-    cml2_link.l4.id,
+  depends_on = [
+    cml2_node.ext,
+    cml2_node.ums1,
+    cml2_node.r1,
+    cml2_node.r2,
+    cml2_node.r3,
+    cml2_link.l0,
+    cml2_link.l1,
+    cml2_link.l2,
+    cml2_link.l3,
+    cml2_link.l4,
   ]
   staging = {
     stages          = ["infra", "group1"]

internal/provider/resource/lifecycle/lifecycle_test.go

@@ -308,10 +308,10 @@ resource "cml2_link" "l1" {
 
 resource "cml2_lifecycle" "top" {
 	lab_id = cml2_lab.this.id
-	elements = [
-		cml2_node.r1.id,
-		cml2_node.r2.id,
-		cml2_link.l1.id,
+	depends_on = [
+		cml2_node.r1,
+		cml2_node.r2,
+		cml2_link.l1,
 	]
 }
 `, cfg)
@@ -380,13 +380,13 @@ resource "cml2_link" "l2" {
 
 resource "cml2_lifecycle" "top" {
 	lab_id = cml2_lab.this.id
-	elements = [
-		cml2_node.ext.id,
-		cml2_node.ums.id,
-		cml2_node.r1.id,
-		cml2_node.r2.id,
-		cml2_link.l1.id,
-		cml2_link.l2.id,
+	depends_on = [
+		cml2_node.ext,
+		cml2_node.ums,
+		cml2_node.r1,
+		cml2_node.r2,
+		cml2_link.l1,
+		cml2_link.l2,
 	]
 	staging = {
 		stages = [ "bla" ]
@@ -404,7 +404,7 @@ resource "cml2_lab" "this" {
 }
 resource "cml2_lifecycle" "top" {
 	lab_id = cml2_lab.this.id
-	elements = []
+	depends_on = []
 	state = %[2]q
 }
 `, cfg, state)
@@ -526,7 +526,7 @@ resource "cml2_link" "l2" {
 
 resource "cml2_lifecycle" "top" {
 	lab_id = cml2_lab.this.id
-	elements = [
+	depends_on = [
 		cml2_node.ext.id,
 		cml2_node.ums.id,
 		cml2_node.r1.id,
@@ -601,7 +601,7 @@ resource "cml2_link" "l3" {
 
 resource "cml2_lifecycle" "top" {
 	lab_id = cml2_lab.this.id
-	elements = [
+	depends_on = [
 		cml2_node.ext.id,
 		cml2_node.ums.id,
 		cml2_node.r1.id,