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

gabriel-samfira · web-flow · commit 893c93ef1c84 · 2023-12-18T17:49:20.000+02:00
Account for trailing slash
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"
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ fi`
`43`	`43`
`44`	`44`	`function call() {`
`45`	`45`	`PAYLOAD="$1"`
`46`		`- [[ $CALLBACK_URL =~ ^(.*)/status$ ]] \|\| CALLBACK_URL="${CALLBACK_URL}/status"`
	`46`	`+ [[ $CALLBACK_URL =~ ^(.*)/status(/)?$ ]] \|\| CALLBACK_URL="${CALLBACK_URL}/status"`
`47`	`47`	`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 ($?)"`
`48`	`48`	`}`
`49`	`49`
`@@ -386,7 +386,7 @@ $GHRunnerGroup = "{{.GitHubRunnerGroup}}"`
`386`	`386`
`387`	`387`	`function Install-Runner() {`
`388`	`388`	`$CallbackURL="{{.CallbackURL}}"`
`389`		`- if (!$CallbackURL.EndsWith("/status")) {`
	`389`	`+ if (!($CallbackURL -match "^(.*)/status(/)?$")) {`
`390`	`390`	`$CallbackURL = "$CallbackURL/status"`
`391`	`391`	`}`
`392`	`392`