Skip to content

Commit f59f114

Browse files
claudeXeoneid
authored andcommitted
fix(ci): raise floor to v0.29.4, require environmentId from project.create
v0.20.x used a completely different postgres/mongo/app API schema — projectId fallback returned boolean false, not the expected resource object. Since the goal is testing v0.29.4+, drop the old-API compatibility shim and fail fast with a clear message if environmentId is missing. Also: default floor_version changed from v0.20.0 to v0.29.4 to reduce the number of matrix jobs and focus on the stable modern API surface.
1 parent f29a1a1 commit f59f114

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

‎.github/workflows/upgrade-integration-test.yml‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
workflow_dispatch:
1616
inputs:
1717
floor_version:
18-
description: 'Oldest version tag to include in auto pairs (e.g. v0.20.0)'
18+
description: 'Oldest version tag to include in auto pairs (e.g. v0.29.4)'
1919
required: false
20-
default: 'v0.20.0'
20+
default: 'v0.29.4'
2121
extra_pairs:
2222
description: 'Extra pairs as JSON, e.g. [{"from":"v0.25.2","to":"v0.26.0"}]'
2323
required: false
@@ -210,34 +210,34 @@ jobs:
210210
'{"name":"ci-upgrade-test","description":"CI upgrade integration test"}')
211211
echo "project.create → $PROJECT"
212212
213-
# Support both API eras:
214-
# Old (pre-environments, ≤ ~v0.24): project.create returns a flat
215-
# object → .result.data.json.projectId
216-
# New (environments feature, ≥ ~v0.25): returns nested objects
217-
# → .result.data.json.project.projectId + .environment.environmentId
213+
# project.create in v0.29+ returns nested {project:{projectId}, environment:{environmentId}}
218214
PROJECT_ID=$(echo "$PROJECT" | jq -r \
219-
'.result.data.json.project.projectId // .result.data.json.projectId')
215+
'.result.data.json.project.projectId // .result.data.json.projectId // empty')
220216
ENV_ID=$(echo "$PROJECT" | jq -r \
221217
'.result.data.json.environment.environmentId // empty')
222-
echo "project_id=$PROJECT_ID" >> "$GITHUB_OUTPUT"
223-
echo "env_id=${ENV_ID:-none}" >> "$GITHUB_OUTPUT"
224-
echo "Detected PROJECT_ID=$PROJECT_ID ENV_ID=${ENV_ID:-<none, using projectId>}"
225-
226-
# Build the JSON scope fragment used in every resource-create call.
227-
# Old API uses projectId; new API uses environmentId.
228-
if [ -n "$ENV_ID" ] && [ "$ENV_ID" != "null" ]; then
229-
SCOPE="\"environmentId\":\"$ENV_ID\""
230-
else
231-
SCOPE="\"projectId\":\"$PROJECT_ID\""
218+
219+
if [ -z "$PROJECT_ID" ] || [ "$PROJECT_ID" = "null" ]; then
220+
echo "❌ Could not extract projectId from project.create response:"
221+
echo "$PROJECT" | jq .
222+
exit 1
232223
fi
233-
echo "Resource scope: $SCOPE"
224+
if [ -z "$ENV_ID" ] || [ "$ENV_ID" = "null" ]; then
225+
echo "❌ Could not extract environmentId — this version may not support environments."
226+
echo " project.create response: $PROJECT"
227+
exit 1
228+
fi
229+
230+
echo "project_id=$PROJECT_ID" >> "$GITHUB_OUTPUT"
231+
echo "env_id=$ENV_ID" >> "$GITHUB_OUTPUT"
232+
echo "Detected PROJECT_ID=$PROJECT_ID ENV_ID=$ENV_ID"
234233
235234
# --- PostgreSQL 15 ---
236235
PG=$(trpc_mut postgres.create \
237236
"{\"name\":\"ci-pg\",\"appName\":\"ci-pg-db\",\
238237
\"databaseName\":\"cidb\",\"databaseUser\":\"ciuser\",\
239238
\"databasePassword\":\"CiPg1pass\",\
240-
\"dockerImage\":\"postgres:15\",$SCOPE}")
239+
\"dockerImage\":\"postgres:15\",\"environmentId\":\"$ENV_ID\"}")
240+
echo "postgres.create → $PG"
241241
PG_ID=$(echo "$PG" | jq -r '.result.data.json.postgresId')
242242
trpc_mut postgres.start "{\"postgresId\":\"$PG_ID\"}" > /dev/null
243243
echo "pg_id=$PG_ID" >> "$GITHUB_OUTPUT"
@@ -247,7 +247,8 @@ jobs:
247247
"{\"name\":\"ci-mongo\",\"appName\":\"ci-mongo-db\",\
248248
\"databaseName\":\"cidb\",\"databaseUser\":\"ciuser\",\
249249
\"databasePassword\":\"CiMg1pass\",\
250-
\"dockerImage\":\"mongo:7.0\",$SCOPE}")
250+
\"dockerImage\":\"mongo:7.0\",\"environmentId\":\"$ENV_ID\"}")
251+
echo "mongo.create → $MG"
251252
MG_ID=$(echo "$MG" | jq -r '.result.data.json.mongoId')
252253
trpc_mut mongo.start "{\"mongoId\":\"$MG_ID\"}" > /dev/null
253254
echo "mg_id=$MG_ID" >> "$GITHUB_OUTPUT"
@@ -256,7 +257,7 @@ jobs:
256257
make_app() {
257258
local DISP_NAME=$1 APP_NAME=$2 IMAGE=$3
258259
APP=$(trpc_mut application.create \
259-
"{\"name\":\"$DISP_NAME\",\"appName\":\"$APP_NAME\",$SCOPE}")
260+
"{\"name\":\"$DISP_NAME\",\"appName\":\"$APP_NAME\",\"environmentId\":\"$ENV_ID\"}")
260261
APP_ID=$(echo "$APP" | jq -r '.result.data.json.applicationId')
261262
trpc_mut application.saveDockerProvider \
262263
"{\"applicationId\":\"$APP_ID\",\"dockerImage\":\"$IMAGE\",\

0 commit comments

Comments
 (0)