chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,256 @@
|
||||
/**
|
||||
* @vitest-environment node
|
||||
*/
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import type {
|
||||
ForkCopyableLabel,
|
||||
ForkCopyableSourceResource,
|
||||
} from '@/ee/workspace-forking/lib/mapping/resources'
|
||||
import {
|
||||
assembleForkCopyableUnmapped,
|
||||
buildPromoteWorkflowIdMap,
|
||||
collectForkCopyableIdsByKind,
|
||||
collectForkUnreferencedCopyables,
|
||||
} from '@/ee/workspace-forking/lib/promote/promote-plan'
|
||||
import type { ForkReference } from '@/ee/workspace-forking/lib/remap/remap-references'
|
||||
|
||||
const ref = (kind: ForkReference['kind'], sourceId: string): ForkReference => ({
|
||||
kind,
|
||||
sourceId,
|
||||
subBlockKey: 'sb',
|
||||
required: false,
|
||||
})
|
||||
|
||||
/**
|
||||
* `buildPromoteWorkflowIdMap` decides which cross-workflow references survive a
|
||||
* promote: the resulting map is handed to `remapWorkflowReferencesInSubBlocks`,
|
||||
* where a hit repoints the reference and a miss (with `clearUnmapped`) blanks it.
|
||||
* These cases lock in the seed/overlay matrix so the "mapped sibling not in this
|
||||
* push" repoint and the "deleted / archived / never-mapped" clears can't drift.
|
||||
*/
|
||||
describe('buildPromoteWorkflowIdMap', () => {
|
||||
it("overlays this push's items (replace + create)", () => {
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map(),
|
||||
existingSourceIds: new Set(),
|
||||
targetActiveIds: new Set(),
|
||||
items: [
|
||||
{ sourceWorkflowId: 'a-src', targetWorkflowId: 'a-tgt' },
|
||||
{ sourceWorkflowId: 'b-src', targetWorkflowId: 'b-new' },
|
||||
],
|
||||
})
|
||||
expect(map.get('a-src')).toBe('a-tgt')
|
||||
expect(map.get('b-src')).toBe('b-new')
|
||||
expect(map.size).toBe(2)
|
||||
})
|
||||
|
||||
it('repoints a mapped sibling that is not in this push when source exists and target is active', () => {
|
||||
// B is mapped + still deployed in the target but undeployed in the source, so it
|
||||
// is not an item this push. A references B and must keep pointing at target-B.
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map([['b-src', 'b-tgt']]),
|
||||
existingSourceIds: new Set(['b-src']),
|
||||
targetActiveIds: new Set(['b-tgt']),
|
||||
items: [{ sourceWorkflowId: 'a-src', targetWorkflowId: 'a-tgt' }],
|
||||
})
|
||||
expect(map.get('b-src')).toBe('b-tgt')
|
||||
expect(map.get('a-src')).toBe('a-tgt')
|
||||
})
|
||||
|
||||
it('does not seed a mapped pair whose source was deleted (reference clears)', () => {
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map([['b-src', 'b-tgt']]),
|
||||
existingSourceIds: new Set(), // b-src deleted in the source
|
||||
targetActiveIds: new Set(['b-tgt']),
|
||||
items: [],
|
||||
})
|
||||
expect(map.has('b-src')).toBe(false)
|
||||
})
|
||||
|
||||
it('does not seed a mapped pair whose target was archived (reference clears)', () => {
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map([['b-src', 'b-tgt']]),
|
||||
existingSourceIds: new Set(['b-src']),
|
||||
targetActiveIds: new Set(), // b-tgt archived by a prior push
|
||||
items: [],
|
||||
})
|
||||
expect(map.has('b-src')).toBe(false)
|
||||
})
|
||||
|
||||
it('does not map a workflow that was never mapped (reference clears)', () => {
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map([['b-src', 'b-tgt']]),
|
||||
existingSourceIds: new Set(['b-src', 'c-src']),
|
||||
targetActiveIds: new Set(['b-tgt']),
|
||||
items: [],
|
||||
})
|
||||
expect(map.has('c-src')).toBe(false)
|
||||
})
|
||||
|
||||
it('lets this push override a stale identity mapping (re-created target wins)', () => {
|
||||
const map = buildPromoteWorkflowIdMap({
|
||||
identityMap: new Map([['s', 't-old']]),
|
||||
existingSourceIds: new Set(['s']),
|
||||
targetActiveIds: new Set(['t-old']),
|
||||
items: [{ sourceWorkflowId: 's', targetWorkflowId: 't-new' }],
|
||||
})
|
||||
expect(map.get('s')).toBe('t-new')
|
||||
})
|
||||
})
|
||||
|
||||
describe('collectForkCopyableIdsByKind', () => {
|
||||
it('groups copyable kinds and ignores non-copyable kinds (credential / env-var)', () => {
|
||||
const byKind = collectForkCopyableIdsByKind([
|
||||
ref('knowledge-base', 'kb-1'),
|
||||
ref('knowledge-base', 'kb-2'),
|
||||
ref('table', 'tbl-1'),
|
||||
ref('credential', 'cred-1'),
|
||||
ref('env-var', 'API_KEY'),
|
||||
ref('custom-tool', 'ct-1'),
|
||||
ref('skill', 'sk-1'),
|
||||
ref('file', 'fk-1'),
|
||||
])
|
||||
expect(byKind).toEqual({
|
||||
'knowledge-base': ['kb-1', 'kb-2'],
|
||||
table: ['tbl-1'],
|
||||
'custom-tool': ['ct-1'],
|
||||
skill: ['sk-1'],
|
||||
file: ['fk-1'],
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('assembleForkCopyableUnmapped', () => {
|
||||
const flat = (label: string): ForkCopyableLabel => ({ label, parentId: null, parentLabel: null })
|
||||
|
||||
it('emits a candidate per copyable ref whose label resolved, carrying its labels', () => {
|
||||
const labels = new Map<string, ForkCopyableLabel>([
|
||||
['knowledge-base:kb-1', flat('Docs KB')],
|
||||
['file:fk-1', { label: 'a.png', parentId: 'fld-1', parentLabel: 'Folder' }],
|
||||
])
|
||||
const result = assembleForkCopyableUnmapped(
|
||||
[ref('knowledge-base', 'kb-1'), ref('file', 'fk-1'), ref('credential', 'cred-1')],
|
||||
labels
|
||||
)
|
||||
expect(result).toEqual([
|
||||
{
|
||||
kind: 'knowledge-base',
|
||||
sourceId: 'kb-1',
|
||||
label: 'Docs KB',
|
||||
parentId: null,
|
||||
parentLabel: null,
|
||||
referenced: true,
|
||||
},
|
||||
{
|
||||
kind: 'file',
|
||||
sourceId: 'fk-1',
|
||||
label: 'a.png',
|
||||
parentId: 'fld-1',
|
||||
parentLabel: 'Folder',
|
||||
referenced: true,
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
it('drops a copyable ref whose label is missing (no longer exists in the source)', () => {
|
||||
expect(assembleForkCopyableUnmapped([ref('knowledge-base', 'kb-gone')], new Map())).toEqual([])
|
||||
})
|
||||
|
||||
it('ignores non-copyable kinds entirely (credential / env-var)', () => {
|
||||
const result = assembleForkCopyableUnmapped(
|
||||
[ref('credential', 'cred-1'), ref('env-var', 'API_KEY')],
|
||||
new Map([['credential:cred-1', flat('X')]])
|
||||
)
|
||||
expect(result).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe('collectForkUnreferencedCopyables', () => {
|
||||
const source = (
|
||||
kind: ForkCopyableSourceResource['kind'],
|
||||
sourceId: string,
|
||||
label = sourceId
|
||||
): ForkCopyableSourceResource => ({ kind, sourceId, label, parentId: null, parentLabel: null })
|
||||
|
||||
const referencedCandidate = (kind: ForkCopyableSourceResource['kind'], sourceId: string) => ({
|
||||
kind,
|
||||
sourceId,
|
||||
label: sourceId,
|
||||
parentId: null,
|
||||
parentLabel: null,
|
||||
referenced: true,
|
||||
})
|
||||
|
||||
it('emits an unmapped source resource no synced workflow references, flagged referenced: false', () => {
|
||||
const result = collectForkUnreferencedCopyables(
|
||||
[source('table', 'tbl-new', 'Scratch table')],
|
||||
[],
|
||||
() => null
|
||||
)
|
||||
expect(result).toEqual([
|
||||
{
|
||||
kind: 'table',
|
||||
sourceId: 'tbl-new',
|
||||
label: 'Scratch table',
|
||||
parentId: null,
|
||||
parentLabel: null,
|
||||
referenced: false,
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
it('dedupes against the referenced candidate set (a referenced resource is never double-listed)', () => {
|
||||
const result = collectForkUnreferencedCopyables(
|
||||
[source('knowledge-base', 'kb-1'), source('knowledge-base', 'kb-new')],
|
||||
[referencedCandidate('knowledge-base', 'kb-1')],
|
||||
() => null
|
||||
)
|
||||
expect(result.map((candidate) => candidate.sourceId)).toEqual(['kb-new'])
|
||||
})
|
||||
|
||||
it('excludes a resource with a persisted mapping (idempotency: a prior copy is never re-offered)', () => {
|
||||
// A resource copied by a prior sync resolves through its workspace_fork_resource_map row.
|
||||
const result = collectForkUnreferencedCopyables(
|
||||
[source('skill', 'sk-copied'), source('skill', 'sk-new')],
|
||||
[],
|
||||
(kind, sourceId) => (kind === 'skill' && sourceId === 'sk-copied' ? 'sk-target' : null)
|
||||
)
|
||||
expect(result.map((candidate) => candidate.sourceId)).toEqual(['sk-new'])
|
||||
})
|
||||
|
||||
it('does not confuse the same id across kinds when deduping or resolving', () => {
|
||||
const result = collectForkUnreferencedCopyables(
|
||||
[source('table', 'shared-id'), source('skill', 'shared-id')],
|
||||
[referencedCandidate('table', 'shared-id')],
|
||||
() => null
|
||||
)
|
||||
expect(result).toHaveLength(1)
|
||||
expect(result[0]).toMatchObject({ kind: 'skill', sourceId: 'shared-id', referenced: false })
|
||||
})
|
||||
|
||||
it('carries a file candidate keyed by storage key with its folder grouping', () => {
|
||||
const result = collectForkUnreferencedCopyables(
|
||||
[
|
||||
{
|
||||
kind: 'file',
|
||||
sourceId: 'workspace/SRC/new.png',
|
||||
label: 'new.png',
|
||||
parentId: 'fld-1',
|
||||
parentLabel: 'Images',
|
||||
},
|
||||
],
|
||||
[],
|
||||
() => null
|
||||
)
|
||||
expect(result).toEqual([
|
||||
{
|
||||
kind: 'file',
|
||||
sourceId: 'workspace/SRC/new.png',
|
||||
label: 'new.png',
|
||||
parentId: 'fld-1',
|
||||
parentLabel: 'Images',
|
||||
referenced: false,
|
||||
},
|
||||
])
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user