Fix yamllint issues for test mesh definitions and fix Makefile depend… (#1122)

thom-at-redhat · web-flow · commit 06b70d862c6a · 2024-08-09T11:10:53.000-04:00
diff --git a/Makefile b/Makefile
@@ -164,7 +164,7 @@ test: receptor
 	PATH="${PWD}:${PATH}" \
 	$(GO) test ./... $(TESTCMD) -count=1 -race -timeout 5m
 
-receptorctl-test: receptorctl/.VERSION
+receptorctl-test: receptorctl/.VERSION receptor
 	@cd receptorctl && nox -s tests
 
 testloop: receptor
diff --git a/receptorctl/tests/mesh-definitions/access_control/node1.yaml b/receptorctl/tests/mesh-definitions/access_control/node1.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node1
 
@@ -9,7 +10,7 @@
 - control-service:
     filename: /tmp/receptorctltest/access_control/node1.sock
 
-- work-signing: 
+- work-signing:
     privatekey: /tmp/receptorctltest/access_control/signwork_key
     tokenexpiration: 10h30m
 
@@ -26,3 +27,4 @@
     workType: unsigned-echo
     command: bash
     params: "-c \"for w in {1..4}; do echo ${line^^}; sleep 1; done\""
+...
diff --git a/receptorctl/tests/mesh-definitions/access_control/node2.yaml b/receptorctl/tests/mesh-definitions/access_control/node2.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node2
 
@@ -11,3 +12,4 @@
 
 - control-service:
     filename: /tmp/receptorctltest/access_control/node2.sock
+...
diff --git a/receptorctl/tests/mesh-definitions/access_control/node3.yaml b/receptorctl/tests/mesh-definitions/access_control/node3.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node3
 
@@ -8,3 +9,4 @@
 
 - control-service:
     filename: /tmp/receptorctltest/access_control/node3.sock
+...
diff --git a/receptorctl/tests/mesh-definitions/mesh1/node1.yaml b/receptorctl/tests/mesh-definitions/mesh1/node1.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node1
 
@@ -23,3 +24,4 @@
     service: ctltls
     tcplisten: 11113
     tcptls: tlsserver
+...
diff --git a/receptorctl/tests/mesh-definitions/mesh1/node2.yaml b/receptorctl/tests/mesh-definitions/mesh1/node2.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node2
 
@@ -9,3 +10,4 @@
 
 - control-service:
     filename: /tmp/receptorctltest/mesh1/node2.sock
+...
diff --git a/receptorctl/tests/mesh-definitions/mesh1/node3.yaml b/receptorctl/tests/mesh-definitions/mesh1/node3.yaml
@@ -1,3 +1,4 @@
+---
 - node:
     id: node3
 
@@ -17,3 +18,4 @@
     workType: echo-uppercase
     command: bash
     params: "-c \"read PAYLOAD; echo ${PAYLOAD^^}\""
+...
