Skip to content

Commit b03f0c7

Browse files
authored
fix(release): run pinned async versions on their own variables, map CLI key-creation errors, show GitLab tokens as the current block (#9862)
1 parent e1a8ea0 commit b03f0c7

4 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎apps/sim/app/api/cli/auth/poll/route.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
33
import { pollCliAuthContract } from '@/lib/api/contracts'
44
import { parseRequest } from '@/lib/api/server'
55
import {
6+
apiKeyCreationErrorStatus,
67
performCreatePersonalApiKey,
78
performCreateWorkspaceApiKey,
89
} from '@/lib/api-key/orchestration'
@@ -83,7 +84,7 @@ async function mintForGrant(
8384
if (!result.success || !result.key) {
8485
return {
8586
ok: false,
86-
status: result.errorCode === 'conflict' ? 409 : 500,
87+
status: apiKeyCreationErrorStatus(result.errorCode),
8788
message: result.error ?? 'Failed to generate API key',
8889
}
8990
}

‎apps/sim/background/workflow-execution.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,8 @@ export async function executeWorkflowJob(
286286
/**
287287
* The version this run executes, loaded once: the core runs this same version's
288288
* blocks, so a deploy landing mid-setup cannot pair one version's variables with
289-
* another's graph.
289+
* another's graph. A pinned version runs with only its own snapshot, as a sync run
290+
* of it does, never the editor's current variables.
290291
*/
291292
const pinnedDeploymentVersionId = payload.pinnedDeploymentVersionId
292293
const deployedState = await withDatabaseReadRetry(
@@ -328,7 +329,9 @@ export async function executeWorkflowJob(
328329
metadata,
329330
workflow,
330331
payload.input,
331-
resolveDeployedRunVariables(deployedState, workflow.variables),
332+
pinnedDeploymentVersionId
333+
? (deployedState.variables ?? {})
334+
: resolveDeployedRunVariables(deployedState, workflow.variables),
332335
[]
333336
)
334337

‎apps/sim/lib/integrations/credential-display.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { CANONICAL_SERVICE_ACCOUNT_SLUGS } from '@/lib/integrations/oauth-servic
2222
import { OAUTH_PROVIDERS } from '@/lib/oauth/oauth'
2323
import type { OAuthProvider, OAuthServiceConfig } from '@/lib/oauth/types'
2424
import { getServiceConfigByProviderId, parseProvider } from '@/lib/oauth/utils'
25+
import { resolveAccessControlBlockType } from '@/lib/permission-groups/integration-allowlist'
2526

2627
/**
2728
* Above this many covered integrations the subtitle states a count instead of
@@ -226,7 +227,7 @@ export function resolveCredentialDisplay(credential: DisplayableCredential): Cre
226227
return {
227228
service: null,
228229
integration,
229-
blockType: 'gitlab',
230+
blockType: resolveAccessControlBlockType('gitlab'),
230231
icon: GitlabIcon,
231232
familyName: null,
232233
coveredIntegrations: integration ? [integration] : [],

‎docker/pii.Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ COPY --chown=pii:pii --chmod=755 docker/pii-entrypoint.sh ./
4747
# copies the image's /tmp into a bind volume mounted at a VOLUME path. The
4848
# VOLUME line stays below the model download, which stages wheels in /tmp.
4949
# tldextract (pulled in by Presidio) caches the Public Suffix List under
50-
# $HOME/.cache by default; point it at /tmp so it caches instead of
51-
# refetching the list on every start.
50+
# $HOME/.cache by default, which the read-only root cannot write; point it at
51+
# the writable /tmp volume. That volume is per task, so each task fetches the
52+
# list once.
5253
ENV PYTHONDONTWRITEBYTECODE=1 \
5354
TLDEXTRACT_CACHE=/tmp/tldextract
5455
RUN chmod 1777 /tmp

0 commit comments

Comments
 (0)