From fbdfe2710387f713d9eb099d90ff0a6a92b95c0f Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Thu, 18 Mar 2021 17:37:54 -0700
Subject: [PATCH] stdlib: netlify: export the deployUrl and logsUrl

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 stdlib/netlify/netlify.cue       | 100 +++++++++++++++++--------------
 tests/stdlib/netlify/netlify.cue |   2 +-
 2 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue
index 04a9fe26..6d1c45a0 100644
--- a/stdlib/netlify/netlify.cue
+++ b/stdlib/netlify/netlify.cue
@@ -33,52 +33,56 @@ import (
 	// Create the Netlify site if it doesn't exist?
 	create: bool | *true
 
-	// Deployment url
-	url: {
-		string
+	// Website url
+	url: string
 
-		#compute: [
-			llb.#Load & {
-				from: alpine.#Image & {
-					package: bash: "=~5.1"
-					package: jq:   "=~1.6"
-					package: curl: "=~7.74"
-					package: yarn: "=~1.22"
+	// Unique Deploy URL
+	deployUrl: string
+
+	// Logs URL for this deployment
+	logsUrl: string
+
+	#compute: [
+		llb.#Load & {
+			from: alpine.#Image & {
+				package: bash: "=~5.1"
+				package: jq:   "=~1.6"
+				package: curl: "=~7.74"
+				package: yarn: "=~1.22"
+			}
+		},
+		llb.#Exec & {
+			args: ["yarn", "global", "add", "netlify-cli@2.47.0"]
+		},
+		llb.#Exec & {
+			args: [
+				"/bin/bash",
+				"--noprofile",
+				"--norc",
+				"-eo",
+				"pipefail",
+				"-c",
+				code,
+			]
+			env: {
+				NETLIFY_SITE_NAME: name
+				if (create) {
+					NETLIFY_SITE_CREATE: "1"
 				}
-			},
-			llb.#Exec & {
-				args: ["yarn", "global", "add", "netlify-cli@2.47.0"]
-			},
-			llb.#Exec & {
-				args: [
-					"/bin/bash",
-					"--noprofile",
-					"--norc",
-					"-eo",
-					"pipefail",
-					"-c",
-					code,
-				]
-				env: {
-					NETLIFY_SITE_NAME: name
-					if (create) {
-						NETLIFY_SITE_CREATE: "1"
-					}
-					if customDomain != _|_ {
-						NETLIFY_DOMAIN: customDomain
-					}
-					NETLIFY_ACCOUNT:    account.name
-					NETLIFY_AUTH_TOKEN: account.token
+				if customDomain != _|_ {
+					NETLIFY_DOMAIN: customDomain
 				}
-				dir: "/src"
-				mount: "/src": from: contents
-			},
-			llb.#Export & {
-				source: "/url"
-				format: "string"
-			},
-		]
-	}
+				NETLIFY_ACCOUNT:    account.name
+				NETLIFY_AUTH_TOKEN: account.token
+			}
+			dir: "/src"
+			mount: "/src": from: contents
+		},
+		llb.#Export & {
+			source: "/output.json"
+			format: "json"
+		},
+	]
 }
 
 // FIXME: this should be outside
@@ -119,5 +123,13 @@ let code = #"""
 	    --prod \
 	| tee /tmp/stdout
 
-	</tmp/stdout sed -n -e 's/^Website URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n' > /url
+	url=$(</tmp/stdout sed -n -e 's/^Website URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
+	deployUrl=$(</tmp/stdout sed -n -e 's/^Unique Deploy URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
+	logsUrl=$(</tmp/stdout sed -n -e 's/^Logs:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
+
+	jq -n \
+		--arg url "$url" \
+		--arg deployUrl "$deployUrl" \
+		--arg logsUrl "$logsUrl" \
+		'{url: $url, deployUrl: $deployUrl, logsUrl: $logsUrl}' > /output.json
 	"""#
diff --git a/tests/stdlib/netlify/netlify.cue b/tests/stdlib/netlify/netlify.cue
index afaf3918..60cdef78 100644
--- a/tests/stdlib/netlify/netlify.cue
+++ b/tests/stdlib/netlify/netlify.cue
@@ -52,7 +52,7 @@ TestNetlify: {
 				"pipefail",
 				"-c",
 				#"""
-                test "$(curl \#(deploy.url))" = "\#(random)"
+                test "$(curl \#(deploy.deployUrl))" = "\#(random)"
                 """#,
 			]
 		},