From 59281b38fc541e2edf46214e379c53ce1eb8bf7e Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Wed, 30 Jun 2021 12:49:53 +0200
Subject: [PATCH] tests: gcs: force dependency between deploy and verify

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 stdlib/gcp/gcs/tests/gcs.cue    | 24 +++++++++++++++++-------
 stdlib/gcp/gcs/tests/verify.cue |  8 +++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/stdlib/gcp/gcs/tests/gcs.cue b/stdlib/gcp/gcs/tests/gcs.cue
index 83abc367..22530ce2 100644
--- a/stdlib/gcp/gcs/tests/gcs.cue
+++ b/stdlib/gcp/gcs/tests/gcs.cue
@@ -3,31 +3,41 @@ package gcs
 import (
 	"alpha.dagger.io/dagger"
 	"alpha.dagger.io/gcp"
+	"alpha.dagger.io/random"
 )
 
-TestConfig: gcpConfig: gcp.#Config
-
-bucket: "dagger-ci"
+TestConfig: {
+	gcpConfig: gcp.#Config
+	bucket:    string @dagger(input)
+}
 
 TestDirectory: dagger.#Artifact
 
 TestGCSObject: {
+	suffix: random.#String & {
+		seed: "gcs"
+	}
+
+	target: "gs://\(TestConfig.bucket)/\(suffix.out)/"
+
 	deploy: #Object & {
-		always: true
-		config: TestConfig.gcpConfig
-		source: TestDirectory
-		target: "gs://\(bucket)/"
+		always:   true
+		config:   TestConfig.gcpConfig
+		source:   TestDirectory
+		"target": target
 	}
 
 	verifyFile: #VerifyGCS & {
 		config: TestConfig.gcpConfig
 		target: deploy.target
+		url:    deploy.url
 		file:   "dirFile.txt"
 	}
 
 	verifyDir: #VerifyGCS & {
 		config: TestConfig.gcpConfig
 		target: deploy.target
+		url:    deploy.url
 		file:   "foo.txt"
 	}
 }
diff --git a/stdlib/gcp/gcs/tests/verify.cue b/stdlib/gcp/gcs/tests/verify.cue
index 52dfd15d..4ad06e84 100644
--- a/stdlib/gcp/gcs/tests/verify.cue
+++ b/stdlib/gcp/gcs/tests/verify.cue
@@ -11,7 +11,10 @@ import (
 	config: gcp.#Config
 
 	// Target GCP URL (e.g. gs://<bucket-name>/<path>/<sub-path>)
-	target?: string
+	target: string
+
+	// URL: dummy URL, used to force a dependency
+	url: string
 
 	contents: {
 		string
@@ -35,6 +38,7 @@ import (
 					gsutil ls -r \#(target) > /contents
 					"""#,
 				]
+				env: URL: url
 			},
 
 			op.#Export & {
@@ -49,10 +53,12 @@ import (
 	file:   string
 	config: gcp.#Config
 	target: string
+	url:    string
 
 	lists: #List & {
 		"config": config
 		"target": target
+		"url":    url
 	}
 
 	test: #up: [