testing

johnstcn · johnstcn · commit 4b33861aaad4 · 2025-07-22T22:58:43.000+01:00
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -29,9 +29,11 @@ import (
 // These cookies are Coder-specific. If a new one is added or changed, the name
 // shouldn't be likely to conflict with any user-application set cookies.
 // Be sure to strip additional cookies in httpapi.StripCoderCookies!
+// SessionTokenCookie represents the name of the cookie or query parameter the API key is stored in.
+// NOTE: This is declared as a var so that we can override it in `develop.sh` if required.
+var SessionTokenCookie = "coder_session_token"
+
 const (
-	// SessionTokenCookie represents the name of the cookie or query parameter the API key is stored in.
-	SessionTokenCookie = "coder_session_token"
 	// SessionTokenHeader is the custom header to use for authentication.
 	SessionTokenHeader = "Coder-Session-Token"
 	// OAuth2StateCookie is the name of the cookie that stores the oauth2 state.
diff --git a/scripts/build_go.sh b/scripts/build_go.sh
@@ -49,6 +49,7 @@ boringcrypto=${CODER_BUILD_BORINGCRYPTO:-0}
 dylib=0
 windows_resources="${CODER_WINDOWS_RESOURCES:-0}"
 debug=0
+develop_in_coder="${DEVELOP_IN_CODER:-0}"
 
 bin_ident="com.coder.cli"
 
@@ -149,6 +150,13 @@ if [[ "$debug" == 0 ]]; then
 	ldflags+=(-s -w)
 fi
 
+if [[ "$develop_in_coder" == 1 ]]; then
+	echo "INFO : Overriding codersdk.SessionTokenCookie as we are developing inside a Coder workspace."
+	ldflags+=(
+		-X "'github.com/coder/coder/v2/codersdk.SessionTokenCookie=dev_coder_session_token'"
+	)
+fi
+
 # We use ts_omit_aws here because on Linux it prevents Tailscale from importing
 # github.com/aws/aws-sdk-go-v2/aws, which adds 7 MB to the binary.
 TS_EXTRA_SMALL="ts_omit_aws,ts_omit_bird,ts_omit_tap,ts_omit_kube"
diff --git a/scripts/coder-dev.sh b/scripts/coder-dev.sh
@@ -10,6 +10,8 @@ source "${SCRIPT_DIR}/lib.sh"
 
 GOOS="$(go env GOOS)"
 GOARCH="$(go env GOARCH)"
+CODER_AGENT_URL="${CODER_AGENT_URL:-}"
+DEVELOP_IN_CODER=0
 DEBUG_DELVE="${DEBUG_DELVE:-0}"
 BINARY_TYPE=coder-slim
 if [[ ${1:-} == server ]]; then
@@ -35,16 +37,20 @@ CODER_DEV_DIR="$(realpath ./.coderv2)"
 CODER_DELVE_DEBUG_BIN=$(realpath "./build/coder_debug_${GOOS}_${GOARCH}")
 popd
 
+if [[ ! -z "${CODER_AGENT_URL}" ]]; then
+	DEVELOP_IN_CODER=1
+fi
+
 case $BINARY_TYPE in
 coder-slim)
 	# Ensure the coder slim binary is always up-to-date with local
 	# changes, this simplifies usage of this script for development.
 	# NOTE: we send all output of `make` to /dev/null so that we do not break
 	# scripts that read the output of this command.
 	if [[ -t 1 ]]; then
-		make -j "${RELATIVE_BINARY_PATH}"
+		DEVELOP_IN_CODER="${DEVELOP_IN_CODER}" make -j "${RELATIVE_BINARY_PATH}"
 	else
-		make -j "${RELATIVE_BINARY_PATH}" >/dev/null 2>&1
+		DEVELOP_IN_CODER="${DEVELOP_IN_CODER}" make -j "${RELATIVE_BINARY_PATH}" >/dev/null 2>&1
 	fi
 	;;
 coder)
diff --git a/scripts/develop.sh b/scripts/develop.sh
@@ -14,7 +14,6 @@ source "${SCRIPT_DIR}/lib.sh"
 set -euo pipefail
 
 CODER_DEV_ACCESS_URL="${CODER_DEV_ACCESS_URL:-http://127.0.0.1:3000}"
-CODER_DEV_SESSION_TOKEN_COOKIE_PREFIX="${CODER_DEV_SESSION_TOKEN_COOKIE_PREFIX:-dev}"
 debug=0
 DEFAULT_PASSWORD="SomeSecurePassword!"
 password="${CODER_DEV_ADMIN_PASSWORD:-${DEFAULT_PASSWORD}}"
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
