Merge pull request #19 from gabriel-samfira/account-for-trailing-slash

Account for trailing slash
cloudbase · Dec 18, 2023 · 893c93e · 893c93e
2 parents 4900179 + db259dd
commit 893c93e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cloudconfig/templates.go b/cloudconfig/templates.go
@@ -43,7 +43,7 @@ fi
 
 function call() {
 	PAYLOAD="$1"
-	[[ $CALLBACK_URL =~ ^(.*)/status$ ]] || CALLBACK_URL="${CALLBACK_URL}/status"
+	[[ $CALLBACK_URL =~ ^(.*)/status(/)?$ ]] || CALLBACK_URL="${CALLBACK_URL}/status"
 	curl --retry 5 --retry-delay 5 --retry-connrefused --fail -s -X POST -d "${PAYLOAD}" -H 'Accept: application/json' -H "Authorization: Bearer ${BEARER_TOKEN}" "${CALLBACK_URL}" || echo "failed to call home: exit code ($?)"
 }
 
@@ -386,7 +386,7 @@ $GHRunnerGroup = "{{.GitHubRunnerGroup}}"
 
 function Install-Runner() {
 	$CallbackURL="{{.CallbackURL}}"
-	if (!$CallbackURL.EndsWith("/status")) {
+	if (!($CallbackURL -match "^(.*)/status(/)?$")) {
 		$CallbackURL = "$CallbackURL/status"
 	}