Skip to content

Commit f720f65

Browse files
feat: [KSBP-101776] - Update emoji
1 parent ddbab05 commit f720f65

File tree

5 files changed

+13
-24
lines changed

5 files changed

+13
-24
lines changed

k8s-deployer/src/dependency-resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,15 @@ export const printDependencyGraph = (components: Array<Schema.DeployableComponen
221221
console.log("Dependency Graph")
222222
console.log(sep)
223223
levels.forEach((level, idx) =>
224-
console.log(` Stage ${idx + 1}${level.map(c => c.parallel ? `${c.id} ` : c.id).join(" ")}`)
224+
console.log(` Stage ${idx + 1}${level.map(c => c.parallel ? `${c.id} 🔀` : c.id).join(" ")}`)
225225
)
226226
if (edges.length > 0) {
227227
console.log(sep)
228228
edges.forEach(e => console.log(e))
229229
}
230230
if (components.some(c => c.parallel)) {
231231
console.log(sep)
232-
console.log(" = deployed concurrently within stage")
232+
console.log(" 🔀 = concurrent deployment")
233233
}
234234
console.log(sep)
235235
}

k8s-deployer/src/pitfile/schema-v1.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ export class DeployableComponent {
6767
export class Graph {
6868
testApp: DeployableComponent
6969
components: Array<DeployableComponent>
70-
/**
71-
* When true, the test app is deployed concurrently with the component chain.
72-
* Only enable this if the test app can start independently of the components.
73-
* Defaults to false (sequential: test app starts after all components are ready).
74-
*/
75-
parallelTestApp?: boolean
7670
}
7771

7872
export class Deployment {

k8s-deployer/src/test-suite-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const deployGraph = async (config: Config, workspace: string, testSuiteId
107107
const params = [ testSuiteId ]
108108

109109
let testAppDeployedComponent: DeployedComponent
110-
if (graph.parallelTestApp === true) {
110+
if (graph.testApp.parallel === true) {
111111
// Deploy test app concurrently with the component levels (opt-in).
112112
// Only use this when the test app can start independently of the components.
113113
const deployTestAppPromise = Deployer.deployComponent(config, workspace, graph.testApp, namespace, params)

k8s-deployer/test/dependency-resolver.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ describe("Dependency Resolver", () => {
444444
expect(logOutput).to.include(" b ──▶ c")
445445
})
446446

447-
it("annotates parallel components with and prints a legend", () => {
447+
it("annotates parallel components with 🔀 and prints a legend", () => {
448448
const components: Array<Schema.DeployableComponent> = [
449449
{ name: "A", id: "a", location: { type: Schema.LocationType.Local }, deploy: { command: "deploy.sh" }, undeploy: { command: "undeploy.sh" } },
450450
{ name: "B", id: "b", location: { type: Schema.LocationType.Local }, deploy: { command: "deploy.sh" }, undeploy: { command: "undeploy.sh" }, dependsOn: ["a"], parallel: true },
@@ -453,10 +453,10 @@ describe("Dependency Resolver", () => {
453453
printDependencyGraph(components)
454454
expect(logOutput[0]).to.equal("Dependency Graph")
455455
expect(logOutput).to.include(" Stage 1 │ a")
456-
expect(logOutput).to.include(" Stage 2 │ b c ")
456+
expect(logOutput).to.include(" Stage 2 │ b 🔀 c 🔀")
457457
expect(logOutput).to.include(" a ──▶ b")
458458
expect(logOutput).to.include(" a ──▶ c")
459-
expect(logOutput).to.include(" = deployed concurrently within stage")
459+
expect(logOutput).to.include(" 🔀 = concurrent deployment")
460460
})
461461
})
462462
})

k8s-deployer/test/test-suite-handler.spec.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ describe("Deployment happy path", async () => {
5757
location: { type: LocationType.Local },
5858
deployment: {
5959
graph: {
60-
parallelTestApp: true,
6160
testApp: {
6261
name: "comp-1-test-app-name",
6362
id: "comp-1-test-app",
@@ -68,7 +67,8 @@ describe("Deployment happy path", async () => {
6867
},
6968
logTailing: {
7069
enabled: true
71-
}
70+
},
71+
parallel: true
7272
},
7373
components: [
7474
{
@@ -499,8 +499,7 @@ describe("deployGraph - deployment ordering and concurrency", async () => {
499499
const deployStub = sinon.stub().callsFake(async (_cfg, _ws, spec) => `sha-${spec.id}`)
500500
const SuiteHandler = await loadWithStub(deployStub)
501501
const graph = {
502-
parallelTestApp: true,
503-
testApp: makeSpec("test-app"),
502+
testApp: makeSpec("test-app", { parallel: true }),
504503
components: [makeSpec("comp-a"), makeSpec("comp-b")]
505504
}
506505
const result = await SuiteHandler.deployGraph(config, workspace, testSuiteId, graph, namespace)
@@ -522,8 +521,7 @@ describe("deployGraph - deployment ordering and concurrency", async () => {
522521
})
523522
const SuiteHandler = await loadWithStub(deployStub)
524523
const graph = {
525-
parallelTestApp: true,
526-
testApp: makeSpec("testApp"),
524+
testApp: makeSpec("testApp", { parallel: true }),
527525
components: [makeSpec("B", { parallel: true }), makeSpec("C", { parallel: true })]
528526
}
529527
const deployPromise = SuiteHandler.deployGraph(config, workspace, testSuiteId, graph, namespace)
@@ -552,8 +550,7 @@ describe("deployGraph - deployment ordering and concurrency", async () => {
552550
const SuiteHandler = await loadWithStub(deployStub)
553551
// B is parallel:true, C has no parallel flag — same dependency level, so neither waits on the other
554552
const graph = {
555-
parallelTestApp: true,
556-
testApp: makeSpec("testApp"),
553+
testApp: makeSpec("testApp", { parallel: true }),
557554
components: [makeSpec("B", { parallel: true }), makeSpec("C")]
558555
}
559556
const deployPromise = SuiteHandler.deployGraph(config, workspace, testSuiteId, graph, namespace)
@@ -583,8 +580,7 @@ describe("deployGraph - deployment ordering and concurrency", async () => {
583580
})
584581
const SuiteHandler = await loadWithStub(deployStub)
585582
const graph = {
586-
parallelTestApp: true,
587-
testApp: makeSpec("testApp"),
583+
testApp: makeSpec("testApp", { parallel: true }),
588584
components: [
589585
makeSpec("A"),
590586
makeSpec("B", { parallel: true, dependsOn: ["A"] }),
@@ -629,8 +625,7 @@ describe("deployGraph - deployment ordering and concurrency", async () => {
629625
})
630626
const SuiteHandler = await loadWithStub(deployStub)
631627
const graph = {
632-
parallelTestApp: true,
633-
testApp: makeSpec("testApp"),
628+
testApp: makeSpec("testApp", { parallel: true }),
634629
components: [makeSpec("A")]
635630
}
636631
const deployPromise = SuiteHandler.deployGraph(config, workspace, testSuiteId, graph, namespace)

0 commit comments

Comments
 (0)