Skip to content

Commit f29a1a1

Browse files
claudeXeoneid
authored andcommitted
fix(ci): handle both old (flat) and new (nested) project.create response formats
In Dokploy <= ~v0.24, project.create returns a flat object with just projectId at the top level; no environment concept exists yet, so resources (postgres, mongo, apps) are created with projectId. In Dokploy >= ~v0.25, project.create returns nested {project, environment} objects and resources require environmentId. Previous workflow always used .project.projectId and .environment.environmentId, both of which evaluated to null on old versions, causing curl to exit with code 22 (HTTP error) on every subsequent resource-create call. Fix: extract PROJECT_ID with a // fallback, check ENV_ID nullness, and build a SCOPE fragment (either 'environmentId' or 'projectId') used in all resource-creation tRPC calls.
1 parent ade7a79 commit f29a1a1

1 file changed

Lines changed: 23 additions & 7 deletions

File tree

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,34 @@ jobs:
210210
'{"name":"ci-upgrade-test","description":"CI upgrade integration test"}')
211211
echo "project.create → $PROJECT"
212212
213-
PROJECT_ID=$(echo "$PROJECT" | jq -r '.result.data.json.project.projectId')
214-
ENV_ID=$(echo "$PROJECT" | jq -r '.result.data.json.environment.environmentId')
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
218+
PROJECT_ID=$(echo "$PROJECT" | jq -r \
219+
'.result.data.json.project.projectId // .result.data.json.projectId')
220+
ENV_ID=$(echo "$PROJECT" | jq -r \
221+
'.result.data.json.environment.environmentId // empty')
215222
echo "project_id=$PROJECT_ID" >> "$GITHUB_OUTPUT"
216-
echo "env_id=$ENV_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\""
232+
fi
233+
echo "Resource scope: $SCOPE"
217234
218235
# --- PostgreSQL 15 ---
219236
PG=$(trpc_mut postgres.create \
220237
"{\"name\":\"ci-pg\",\"appName\":\"ci-pg-db\",\
221238
\"databaseName\":\"cidb\",\"databaseUser\":\"ciuser\",\
222239
\"databasePassword\":\"CiPg1pass\",\
223-
\"dockerImage\":\"postgres:15\",\"environmentId\":\"$ENV_ID\"}")
240+
\"dockerImage\":\"postgres:15\",$SCOPE}")
224241
PG_ID=$(echo "$PG" | jq -r '.result.data.json.postgresId')
225242
trpc_mut postgres.start "{\"postgresId\":\"$PG_ID\"}" > /dev/null
226243
echo "pg_id=$PG_ID" >> "$GITHUB_OUTPUT"
@@ -230,7 +247,7 @@ jobs:
230247
"{\"name\":\"ci-mongo\",\"appName\":\"ci-mongo-db\",\
231248
\"databaseName\":\"cidb\",\"databaseUser\":\"ciuser\",\
232249
\"databasePassword\":\"CiMg1pass\",\
233-
\"dockerImage\":\"mongo:7.0\",\"environmentId\":\"$ENV_ID\"}")
250+
\"dockerImage\":\"mongo:7.0\",$SCOPE}")
234251
MG_ID=$(echo "$MG" | jq -r '.result.data.json.mongoId')
235252
trpc_mut mongo.start "{\"mongoId\":\"$MG_ID\"}" > /dev/null
236253
echo "mg_id=$MG_ID" >> "$GITHUB_OUTPUT"
@@ -239,8 +256,7 @@ jobs:
239256
make_app() {
240257
local DISP_NAME=$1 APP_NAME=$2 IMAGE=$3
241258
APP=$(trpc_mut application.create \
242-
"{\"name\":\"$DISP_NAME\",\"appName\":\"$APP_NAME\",\
243-
\"environmentId\":\"$ENV_ID\"}")
259+
"{\"name\":\"$DISP_NAME\",\"appName\":\"$APP_NAME\",$SCOPE}")
244260
APP_ID=$(echo "$APP" | jq -r '.result.data.json.applicationId')
245261
trpc_mut application.saveDockerProvider \
246262
"{\"applicationId\":\"$APP_ID\",\"dockerImage\":\"$IMAGE\",\

0 commit comments

Comments
 (0)