From 78cbe1561e0d5961d15b5dae4c437686de355089 Mon Sep 17 00:00:00 2001
From: caseyhebebrand <chebebrand@netflix.com>
Date: Mon, 21 Oct 2019 14:09:37 -0700
Subject: [PATCH] feat(core/jenkins): Refer to Jenkins controller instead of
 master (#7531)

* Update jenkins master to controller

* Update terminaology for remaining triggers

* Update wercker stage
---
 .../stages/concourse/ConcourseExecutionDetails.tsx     |  2 +-
 .../config/stages/concourse/ConcourseStageConfig.tsx   | 10 +++++-----
 .../config/stages/jenkins/jenkinsExecutionDetails.html |  2 +-
 .../pipeline/config/stages/jenkins/jenkinsStage.html   |  6 +++---
 .../config/stages/travis/travisExecutionDetails.html   |  2 +-
 .../src/pipeline/config/stages/travis/travisStage.html |  6 +++---
 .../config/stages/wercker/werckerExecutionDetails.html |  2 +-
 .../pipeline/config/stages/wercker/werckerStage.html   |  6 +++---
 .../config/triggers/baseBuild/BaseBuildTrigger.tsx     |  6 ++++--
 .../config/triggers/concourse/ConcourseTrigger.tsx     |  4 ++--
 .../config/triggers/wercker/WerckerTrigger.tsx         |  4 ++--
 11 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseExecutionDetails.tsx b/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseExecutionDetails.tsx
index 3e4850829dc..64c72ed9ff5 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseExecutionDetails.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseExecutionDetails.tsx
@@ -18,7 +18,7 @@ export function ConcourseExecutionDetails(props: IExecutionDetailsSectionProps)
   return (
     <ExecutionDetailsSection name={name} current={current}>
       <dl className="dl-narrow dl-horizontal">
-        <dt>Master</dt>
+        <dt>Build Service</dt>
         <dd>{context.master}</dd>
         <dt>Team</dt>
         <dd>{context.teamName}</dd>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseStageConfig.tsx b/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseStageConfig.tsx
index db5536e7f9f..e63a9a0c48c 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseStageConfig.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/stages/concourse/ConcourseStageConfig.tsx
@@ -46,17 +46,17 @@ export class ConcourseStageConfig extends React.Component<IStageConfigProps, ICo
 
     return (
       <>
-        <StageConfigField label="Master">
+        <StageConfigField label="Build Service">
           <Select
             value={master}
-            placeholder="Select a master..."
+            placeholder="Select a build service..."
             onChange={this.onMasterChanged}
             options={masters.map((name: string) => ({ label: name, value: name }))}
             clearable={false}
           />
         </StageConfigField>
         <StageConfigField label="Team">
-          {!master && <p className="form-control-static">(Select a master)</p>}
+          {!master && <p className="form-control-static">(Select a build service)</p>}
           {master && (
             <Select
               value={teamName}
@@ -68,7 +68,7 @@ export class ConcourseStageConfig extends React.Component<IStageConfigProps, ICo
           )}
         </StageConfigField>
         <StageConfigField label="Pipeline">
-          {!teamName && <p className="form-control-static">(Select a master and team)</p>}
+          {!teamName && <p className="form-control-static">(Select a build service and team)</p>}
           {teamName && (
             <Select
               value={pipelineName}
@@ -80,7 +80,7 @@ export class ConcourseStageConfig extends React.Component<IStageConfigProps, ICo
           )}
         </StageConfigField>
         <StageConfigField label="Resource Name">
-          {!pipelineName && <p className="form-control-static">(Select a master, team, and pipeline)</p>}
+          {!pipelineName && <p className="form-control-static">(Select a build service, team, and pipeline)</p>}
           {pipelineName && (
             <Select
               value={resourceName}
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.html
index c8c928b41a9..44c079d8f9a 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsExecutionDetails.html
@@ -5,7 +5,7 @@
       <div class="col-md-{{stage.context.buildInfo.testResults ? 6 : 12}}">
         <h5>Jenkins Stage Configuration</h5>
         <dl class="dl-narrow dl-horizontal">
-          <dt>Master</dt>
+          <dt>Controller</dt>
           <dd>{{stage.context.master}}</dd>
           <dt>Job</dt>
           <dd>{{stage.context.job}}</dd>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html
index 4b28706ffa9..afe662d62a1 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/jenkins/jenkinsStage.html
@@ -1,10 +1,10 @@
 <div class="form-horizontal">
   <div class="form-group">
-    <label class="col-md-2 col-md-offset-1 sm-label-right">Master</label>
+    <label class="col-md-2 col-md-offset-1 sm-label-right">Controller</label>
     <div class="col-md-6">
       <p class="form-control-static" ng-if="viewState.masterIsParameterized">{{stage.master}}</p>
       <ui-select class="form-control input-sm" ng-if="!viewState.masterIsParameterized" ng-model="stage.master">
-        <ui-select-match placeholder="Select a master...">{{$select.selected}}</ui-select-match>
+        <ui-select-match placeholder="Select a controller...">{{$select.selected}}</ui-select-match>
         <ui-select-choices repeat="master in masters | filter: $select.search">
           <span ng-bind-html="master | highlight: $select.search"></span>
         </ui-select-choices>
@@ -24,7 +24,7 @@
   <div class="form-group">
     <label class="col-md-2 col-md-offset-1 sm-label-right">Job</label>
     <div class="col-md-6">
-      <p class="form-control-static" ng-if="!stage.master">(Select a master)</p>
+      <p class="form-control-static" ng-if="!stage.master">(Select a controller)</p>
       <p class="form-control-static" ng-if="viewState.masterIsParameterized || viewState.jobIsParameterized">
         {{stage.job}}
       </p>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html
index c67872dfa8e..cb268fd6d8e 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisExecutionDetails.html
@@ -5,7 +5,7 @@
       <div class="col-md-{{ctrl.stage.context.buildInfo.testResults ? 6 : 12}}">
         <h5>Travis Stage Configuration</h5>
         <dl class="dl-narrow dl-horizontal">
-          <dt>Master</dt>
+          <dt>Build Service</dt>
           <dd>{{ctrl.stage.context.master}}</dd>
           <dt>Job</dt>
           <dd>{{ctrl.stage.context.job}}</dd>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html
index e574d814310..fa0fa2525f1 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/travis/travisStage.html
@@ -1,6 +1,6 @@
 <div class="form-horizontal">
   <div class="form-group">
-    <label class="col-md-2 col-md-offset-1 sm-label-right">Master</label>
+    <label class="col-md-2 col-md-offset-1 sm-label-right">Build Service</label>
     <div class="col-md-6">
       <p class="form-control-static" ng-if="$ctrl.viewState.masterIsParameterized">{{$ctrl.stage.master}}</p>
       <ui-select
@@ -8,7 +8,7 @@
         ng-if="!$ctrl.viewState.masterIsParameterized"
         ng-model="$ctrl.stage.master"
       >
-        <ui-select-match placeholder="Select a master...">{{$select.selected}}</ui-select-match>
+        <ui-select-match placeholder="Select a build service...">{{$select.selected}}</ui-select-match>
         <ui-select-choices repeat="master in $ctrl.masters | filter: $select.search">
           <span ng-bind-html="master | highlight: $select.search"></span>
         </ui-select-choices>
@@ -30,7 +30,7 @@
       >Job<help-field key="pipeline.config.travis.job.isFiltered" ng-if="$ctrl.shouldFilter()"></help-field
     ></label>
     <div class="col-md-6">
-      <p class="form-control-static" ng-if="!$ctrl.stage.master">(Select a master)</p>
+      <p class="form-control-static" ng-if="!$ctrl.stage.master">(Select a build service)</p>
       <p
         class="form-control-static"
         ng-if="$ctrl.viewState.masterIsParameterized || $ctrl.viewState.jobIsParameterized"
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html
index 38a7bfa3ea3..646cb8f8170 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerExecutionDetails.html
@@ -5,7 +5,7 @@
       <div class="col-md-{{stage.context.buildInfo.testResults ? 6 : 12}}">
         <h5>Wercker Stage Configuration</h5>
         <dl class="dl-narrow dl-horizontal">
-          <dt>Master</dt>
+          <dt>Build Service</dt>
           <dd>{{stage.context.master}}</dd>
           <dt>Job</dt>
           <dd>{{stage.context.job}}</dd>
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html
index d68aa45bb21..ade6c079705 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/wercker/werckerStage.html
@@ -1,6 +1,6 @@
 <div class="form-horizontal">
   <div class="form-group">
-    <label class="col-md-2 col-md-offset-1 sm-label-right">Master</label>
+    <label class="col-md-2 col-md-offset-1 sm-label-right">Build Service</label>
     <div class="col-md-6">
       <p class="form-control-static" ng-if="$ctrl.viewState.masterIsParameterized">{{$ctrl.stage.master}}</p>
       <ui-select
@@ -8,7 +8,7 @@
         ng-if="!$ctrl.viewState.masterIsParameterized"
         ng-model="$ctrl.stage.master"
       >
-        <ui-select-match placeholder="Select a Wercker Master...">{{$select.selected}}</ui-select-match>
+        <ui-select-match placeholder="Select a Wercker build service...">{{$select.selected}}</ui-select-match>
         <ui-select-choices repeat="master in $ctrl.masters | filter: $select.search">
           <span ng-bind-html="master | highlight: $select.search"></span>
         </ui-select-choices>
@@ -29,7 +29,7 @@
   <div class="form-group">
     <label class="col-md-2 col-md-offset-1 sm-label-right">Application</label>
     <div class="col-md-6">
-      <p class="form-control-static" ng-if="!$ctrl.stage.master">(Select a master)</p>
+      <p class="form-control-static" ng-if="!$ctrl.stage.master">(Select a build service)</p>
       <p
         class="form-control-static"
         ng-if="$ctrl.viewState.masterIsParameterized || $ctrl.viewState.appIsParameterized"
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
index 58ff2c9f7da..da690d01b7a 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
@@ -34,11 +34,13 @@ export function BaseBuildTrigger(buildTriggerProps: IBaseBuildTriggerConfigProps
     }
   }, [fetchJobs.result]);
 
+  const label = buildTriggerType === 'jenkins' ? 'Controller' : 'Build Service';
+
   return (
     <>
       <FormikFormField
         name="master"
-        label="Master"
+        label={label}
         fastField={false}
         input={props => (
           <RefreshableReactSelectInput
@@ -48,7 +50,7 @@ export function BaseBuildTrigger(buildTriggerProps: IBaseBuildTriggerConfigProps
             isLoading={fetchMasters.status === 'PENDING'}
             onRefreshClicked={() => fetchMasters.refresh()}
             refreshButtonTooltipText={fetchMasters.status === 'PENDING' ? 'Masters refreshing' : 'Refresh masters list'}
-            placeholder="Select a master..."
+            placeholder={`Select a ${label.toLowerCase()}`}
           />
         )}
       />
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
index bae6d4bd95a..98c960a0901 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
@@ -52,7 +52,7 @@ export function ConcourseTrigger({ formik, trigger }: IConcourseTriggerConfigPro
     <>
       <FormikFormField
         name="master"
-        label="Master"
+        label="Build Service"
         fastField={false}
         input={props => (
           <ReactSelectInput
@@ -61,7 +61,7 @@ export function ConcourseTrigger({ formik, trigger }: IConcourseTriggerConfigPro
             disabled={fetchMasters.status === 'PENDING'}
             isLoading={fetchMasters.status === 'PENDING'}
             stringOptions={fetchMasters.result}
-            placeholder="Select a master..."
+            placeholder="Select a build service..."
           />
         )}
       />
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
index 42808d5c70b..a60b3649dcb 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
@@ -75,13 +75,13 @@ export function WerckerTrigger(werckerTriggerProps: IWerckerTriggerConfigProps)
     <>
       <FormikFormField
         name="master"
-        label="Master"
+        label="Build Service"
         fastField={false}
         input={props => (
           <RefreshableReactSelectInput
             {...props}
             stringOptions={fetchMasters.result}
-            placeholder={'Select a master...'}
+            placeholder={'Select a build service...'}
             disabled={!mastersLoaded}
             isLoading={mastersLoading}
             onRefreshClicked={() => fetchMasters.refresh()}