Skip to content

Commit fb9c474

Browse files
authored
Add trigger doesn't trigger pipeline. (redhat-developer#643)
* Add trigger doesn't trigger the pipeline.
1 parent e90c2cd commit fb9c474

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

src/tekton/addtrigger.ts

+26-21
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ function newParam(params: Param[]): void {
121121
params.map(val => {
122122
val.value = val.default
123123
delete val.default
124+
delete val?.type
124125
})
125126
}
126127

@@ -145,41 +146,45 @@ export async function getPipelineRunFrom(inputAddTrigger: AddTriggerFormValues,
145146
params: inputAddTrigger.params,
146147
resources: inputAddTrigger.resources,
147148
workspaces: getPipelineRunWorkspaces(inputAddTrigger.workspaces, inputAddTrigger.volumeClaimTemplate),
148-
serviceAccountName: inputAddTrigger.serviceAccount,
149149
},
150150
};
151+
if (inputAddTrigger?.serviceAccount?.trim()) {
152+
pipelineRunData.spec.serviceAccountName = inputAddTrigger.serviceAccount;
153+
}
151154
return await getPipelineRunData(pipelineRunData, options);
152155
}
153156

154157
export function getPipelineRunWorkspaces(workspaces: Workspaces[], volumeClaimTemplate?: VCT[]): Workspace[] {
155158
const newWorkspace = [];
156-
if (workspaces && workspaces.length === 0) return newWorkspace;
157-
workspaces.map((workspaceData: Workspaces) => {
158-
const newWorkspaceObject = {};
159-
const workspaceResourceObject = {};
160-
newWorkspaceObject['name'] = workspaceData.name;
161-
if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.Secret) {
162-
workspaceResourceObject['secretName'] = workspaceData.workspaceName;
163-
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.ConfigMap) {
164-
workspaceResourceObject['name'] = workspaceData.workspaceName;
165-
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.PersistentVolumeClaim) {
166-
workspaceResourceObject['claimName'] = workspaceData.workspaceName;
167-
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.EmptyDirectory) {
168-
workspaceResourceObject['emptyDir']
169-
}
170-
if (workspaceData.item && workspaceData.item.length !== 0) {
171-
workspaceResourceObject['items'] = workspaceData.item;
172-
}
173-
newWorkspaceObject[WorkspaceResource[workspaceData.workspaceType]] = workspaceResourceObject;
174-
newWorkspace.push(newWorkspaceObject);
175-
});
159+
if (workspaces && workspaces.length !== 0) {
160+
workspaces.map((workspaceData: Workspaces) => {
161+
const newWorkspaceObject = {};
162+
const workspaceResourceObject = {};
163+
newWorkspaceObject['name'] = workspaceData.name;
164+
if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.Secret) {
165+
workspaceResourceObject['secretName'] = workspaceData.workspaceName;
166+
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.ConfigMap) {
167+
workspaceResourceObject['name'] = workspaceData.workspaceName;
168+
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.PersistentVolumeClaim) {
169+
workspaceResourceObject['claimName'] = workspaceData.workspaceName;
170+
} else if (WorkspaceResource[workspaceData.workspaceType] === WorkspaceResource.EmptyDirectory) {
171+
workspaceResourceObject['emptyDir']
172+
}
173+
if (workspaceData.item && workspaceData.item.length !== 0) {
174+
workspaceResourceObject['items'] = workspaceData.item;
175+
}
176+
newWorkspaceObject[WorkspaceResource[workspaceData.workspaceType]] = workspaceResourceObject;
177+
newWorkspace.push(newWorkspaceObject);
178+
});
179+
}
176180
if (volumeClaimTemplate && volumeClaimTemplate.length !== 0) {
177181
volumeClaimTemplate.map(value => {
178182
const workspaceObject = {};
179183
workspaceObject['name'] = value.metadata.name,
180184
workspaceObject[value.kind] = {
181185
spec: value.spec
182186
}
187+
workspaceObject[value.kind].spec.volumeMode = 'Filesystem';
183188
newWorkspace.push(workspaceObject);
184189
})
185190
}

src/tekton/triggertype.ts

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export interface Param {
5656
name: string;
5757
default?: string;
5858
value?: string | string[];
59+
type?: string;
5960
}
6061

6162
export interface PipelineParam extends Param {

test/tekton/addtrigger.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ suite('Tekton/Pipeline', () => {
314314
resources: [],
315315
status: null,
316316
workspaces: [],
317-
serviceAccountName: undefined
318317
}
319318
});
320319
});

0 commit comments

Comments
 (0)