Skip to content

Commit 60bd1bd

Browse files
MarkDeMariaMark DeMaria
MarkDeMaria
authored and
Mark DeMaria
committed
Allow editing of build hooks on build configuration page
-Single-select tag for Command, Script, and Args, Command+Args, Script+Args -Whatever option is currently-selected upon hitting 'Save' will overwrite anything else. For example, if post commit has a command in it, and you hit save on the Args page, the command will be deleted and the args saved. -Checkbox shows/hides the build hook editor. Leaving it unchcked and selecting "Save" with anything saved in the post commit section of the YAML will be deleted, as the user has indicated they do not wish to have any build hooks
1 parent 32c3a25 commit 60bd1bd

File tree

5 files changed

+268
-36
lines changed

5 files changed

+268
-36
lines changed

‎app/scripts/constants.js

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ window.OPENSHIFT_CONSTANTS = {
5151
"builds": "architecture/core_concepts/builds_and_image_streams.html#builds",
5252
"image-streams": "architecture/core_concepts/builds_and_image_streams.html#image-streams",
5353
"storage": "architecture/additional_concepts/storage.html",
54+
"build-hooks": "https://docs.openshift.org/latest/dev_guide/builds.html#build-hooks",
5455
// default should remain last, add new links above
5556
"default": "welcome/index.html"
5657
},

‎app/scripts/controllers/edit/buildConfig.js

+76-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ angular.module('openshiftConsole')
5555
"title": "Inline"
5656
}];
5757
$scope.view = {
58-
advancedOptions: false
58+
advancedOptions: false,
59+
hasHooks: false
5960
};
6061
$scope.breadcrumbs = [
6162
{
@@ -117,6 +118,76 @@ angular.module('openshiftConsole')
117118
"SerialLatestOnly"
118119
];
119120

121+
$scope.buildHookTypes = [{
122+
"id": "script",
123+
"label": "Shell Script"
124+
}, {
125+
"id": "command",
126+
"label": "Command"
127+
}, {
128+
"id": "args",
129+
"label": "Arguments to Default Image Entry Point"
130+
}, {
131+
"id": "scriptArgs",
132+
"label": "Shell Script with Arguments"
133+
}, {
134+
"id": "commandArgs",
135+
"label": "Command with Arguments"
136+
}];
137+
138+
$scope.buildHookSelection = {
139+
"type": {}
140+
};
141+
142+
var getInitialBuildHookSelection = function() {
143+
$scope.view.hasHooks = (_.size($scope.buildConfig.spec.postCommit.args) ||
144+
_.size($scope.buildConfig.spec.postCommit.command) ||
145+
$scope.buildConfig.spec.postCommit.script) ? true : false;
146+
147+
if (_.size($scope.buildConfig.spec.postCommit.args) && _.size($scope.buildConfig.spec.postCommit.command)) {
148+
$scope.buildHookSelection.type.id = "commandArgs";
149+
} else if ($scope.buildConfig.spec.postCommit.script && _.size($scope.buildConfig.spec.postCommit.args)) {
150+
$scope.buildHookSelection.type.id = "scriptArgs";
151+
} else if (_.size($scope.buildConfig.spec.postCommit.args)) {
152+
$scope.buildHookSelection.type.id = "args";
153+
} else if ($scope.buildConfig.spec.postCommit.script) {
154+
$scope.buildHookSelection.type.id = "script";
155+
} else {
156+
$scope.buildHookSelection.type.id = "command";
157+
}
158+
159+
$scope.buildHookSelection.type.label = _.find($scope.buildHookTypes, {'id': $scope.buildHookSelection.type.id}).label;
160+
};
161+
162+
var clearIncompatibleBuildHookFields = function(selectedBuildHookID) {
163+
if ($scope.view.hasHooks) {
164+
switch (selectedBuildHookID) {
165+
case "script":
166+
$scope.updatedBuildConfig.spec.postCommit.command = [];
167+
$scope.updatedBuildConfig.spec.postCommit.args = [];
168+
break;
169+
case "command":
170+
$scope.updatedBuildConfig.spec.postCommit.script = "";
171+
$scope.updatedBuildConfig.spec.postCommit.args = [];
172+
break;
173+
case "args":
174+
$scope.updatedBuildConfig.spec.postCommit.script = "";
175+
$scope.updatedBuildConfig.spec.postCommit.command = [];
176+
break;
177+
case "scriptArgs":
178+
$scope.updatedBuildConfig.spec.postCommit.command = [];
179+
break;
180+
case "commandArgs":
181+
$scope.updatedBuildConfig.spec.postCommit.script = "";
182+
break;
183+
}
184+
} else {
185+
$scope.updatedBuildConfig.spec.postCommit.command = [];
186+
$scope.updatedBuildConfig.spec.postCommit.args = [];
187+
$scope.updatedBuildConfig.spec.postCommit.script = "";
188+
}
189+
};
190+
120191
AlertMessageService.getAlerts().forEach(function(alert) {
121192
$scope.alerts[alert.name] = alert.data;
122193
});
@@ -143,6 +214,8 @@ angular.module('openshiftConsole')
143214
// success
144215
function(buildConfig) {
145216
$scope.buildConfig = buildConfig;
217+
getInitialBuildHookSelection();
218+
146219
$scope.updatedBuildConfig = angular.copy($scope.buildConfig);
147220
$scope.buildStrategy = buildStrategy($scope.updatedBuildConfig);
148221
$scope.strategyType = $scope.buildConfig.spec.strategy.type;
@@ -180,7 +253,7 @@ angular.module('openshiftConsole')
180253
}
181254

182255
if (imageOptions.type === "ImageStreamImage") {
183-
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
256+
isimage = (imageData.namespace || buildConfig.metadata.namespace) + "/" + imageData.name;
184257
} else {
185258
isimage = "";
186259
}
@@ -414,6 +487,7 @@ angular.module('openshiftConsole')
414487

415488
$scope.save = function() {
416489
$scope.disableInputs = true;
490+
clearIncompatibleBuildHookFields($scope.buildHookSelection.type.id);
417491
// Update Configuration
418492
buildStrategy($scope.updatedBuildConfig).forcePull = $scope.options.forcePull;
419493

‎app/views/edit/build-config.html

+67-7
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ <h3>Source Configuration</h3>
109109
<div ui-ace="{
110110
mode: 'dockerfile',
111111
theme: 'dreamweaver',
112-
onLoad: aceLoaded,
113112
rendererOptions: {
114113
fadeFoldWidgets: true,
115114
showPrintMargin: false
@@ -270,7 +269,6 @@ <h3 ng-class="{ 'with-divider': !sources.none }">Jenkins Pipeline Configuration<
270269
<div ui-ace="{
271270
mode: 'groovy',
272271
theme: 'eclipse',
273-
onLoad: aceLoaded,
274272
rendererOptions: {
275273
fadeFoldWidgets: true,
276274
showPrintMargin: false
@@ -411,8 +409,6 @@ <h3 class="with-divider">Image Configuration</h3>
411409
</dl>
412410
</div>
413411

414-
415-
416412
<div ng-if="!(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
417413
<h3 class="with-divider">Environment Variables<span class="help action-inline">
418414
<a href="">
@@ -518,8 +514,8 @@ <h3 class="with-divider">Run Policy
518514
{{type | sentenceCase}}
519515
</ui-select-choices>
520516
</ui-select>
521-
522517
</div>
518+
523519
<div ng-switch="updatedBuildConfig.spec.runPolicy">
524520
<div class="help-block" ng-switch-when="Serial">Builds triggered from this Build Configuration will run one at the time, in the order they have been triggered.</div>
525521
<div class="help-block" ng-switch-when="Parallel">Builds triggered from this Build Configuration will run all at the same time. The order in which they will finish is not guaranteed.</div>
@@ -528,8 +524,72 @@ <h3 class="with-divider">Run Policy
528524
</div>
529525
</div>
530526

531-
<div>
532-
<a href="" ng-click="view.advancedOptions = !view.advancedOptions" role="button">{{view.advancedOptions ? 'Hide' : 'Show'}} Advanced Options</a>
527+
<div ng-if="view.advancedOptions && !(updatedBuildConfig | isJenkinsPipelineStrategy)" class="section">
528+
<h3 class="with-divider">Build Hooks
529+
<span class="help action-inline">
530+
<a href="{{'build-hooks' | helpLink}}" aria-hidden="true" target="_blank"><span class="learn-more-inline">Learn more&nbsp;<i class="fa fa-external-link"></i></span></a>
531+
</span>
532+
</h3>
533+
534+
<div class="checkbox">
535+
<label>
536+
<input type="checkbox" ng-model="view.hasHooks" id="enable-build-hooks">
537+
Run build hooks after image is built
538+
</label>
539+
<div class="help-block">
540+
Build hooks allow you to run commands at the end of the build to verify the image.
541+
</div>
542+
</div>
543+
544+
<div ng-show="view.hasHooks">
545+
<div class="form-group">
546+
<h4>Hook Types</h4>
547+
<ui-select
548+
ng-model="buildHookSelection.type"
549+
title="Choose a type of build hook">
550+
<ui-select-match>{{$select.selected.label}}</ui-select-match>
551+
<ui-select-choices repeat="type in buildHookTypes">
552+
{{type.label}}
553+
</ui-select-choices>
554+
</ui-select>
555+
</div>
556+
557+
<fieldset>
558+
<div ng-show="buildHookSelection.type.id === 'script' || buildHookSelection.type.id === 'scriptArgs'">
559+
<h4>Script</h4>
560+
<div
561+
ui-ace="{
562+
mode: 'sh',
563+
theme: 'eclipse',
564+
rendererOptions: {
565+
fadeFoldWidgets: true,
566+
showPrintMargin: false
567+
}
568+
}"
569+
ng-model="updatedBuildConfig.spec.postCommit.script"
570+
class="ace-bordered ace-inline mar-top-md">
571+
</div>
572+
</div>
573+
574+
<div ng-show="buildHookSelection.type.id === 'command' || buildHookSelection.type.id === 'commandArgs'">
575+
<h4>Command</h4>
576+
<edit-command
577+
args="updatedBuildConfig.spec.postCommit.command">
578+
</edit-command>
579+
</div>
580+
581+
<div ng-show="buildHookSelection.type.id === 'args' || buildHookSelection.type.id === 'commandArgs' || buildHookSelection.type.id === 'scriptArgs' ">
582+
<h4>Arguments</h4>
583+
<edit-command
584+
args="updatedBuildConfig.spec.postCommit.args">
585+
</edit-command>
586+
</div>
587+
</fieldset>
588+
</div>
589+
</div>
590+
591+
<div class="gutter-top">
592+
<a href="" ng-click="view.advancedOptions = !view.advancedOptions" role="button">{{view.advancedOptions ? 'Hide' : 'Show'}} advanced options</a>
533593
</div>
534594
<div class="buttons gutter-top-bottom">
535595
<button

0 commit comments

Comments
 (0)