fix(provider/oracle): add ssh key (#5901)

spinnaker · Nov 1, 2018 · 72e1e8d · 72e1e8d
1 parent 0d938b1
commit 72e1e8d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/app/scripts/modules/oracle/src/helpContents/oracleHelpContents.ts b/app/scripts/modules/oracle/src/helpContents/oracleHelpContents.ts
@@ -43,6 +43,10 @@ const helpContents = [
     key: 'oracle.pipeline.config.bake.account_name',
     value: '<p>The name of Oracle <i>account</i> that will be used during the baking process.</p>',
   },
+  {
+    key: 'oracle.serverGroup.sshAuthorizedKeys',
+    value: '<p>The public SSH key for the default user on the instance.</p>',
+  },
 ];
 
 helpContents.forEach(entry => HelpContentsRegistry.register(entry.key, entry.value));
diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/oracle/src/serverGroup/configure/serverGroupCommandBuilder.service.js
@@ -49,6 +49,7 @@ module.exports = angular
         subnetId: serverGroup.launchConfig.subnetId,
         region: serverGroup.region,
         availabilityDomain: serverGroup.launchConfig.availabilityDomain,
+        sshAuthorizedKeys: serverGroup.launchConfig.sshAuthorizedKeys,
         selectedProvider: oracle,
         capacity: {
           desired: serverGroup.capacity.desired,

diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/cloneServerGroup.controller.js
@@ -30,6 +30,7 @@ module.exports = angular
       instanceType: require('./instanceType/instanceType.html'),
       capacity: require('./capacity/capacity.html'),
       loadBalancers: require('./loadBalancers/loadBalancers.html'),
+      networkSettings: require('./network/networkSettings.html'),
       templateSelection: require('./templateSelection/templateSelection.html'),
     };
 

diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/network/networkSettings.html
@@ -0,0 +1,13 @@
+<!-- SSH Key -->
+<div class="form-group">
+    <div class="col-md-3 sm-label-right">
+        SSH Key
+        <help-field key="oracle.serverGroup.sshAuthorizedKeys"></help-field>
+    </div>
+    <div class="col-md-9">
+        <textarea class="form-control input-sm"
+                  name="sshAuthorizedKeys"
+                  placeholder="Enter the public SSH key for the default user on the instance."
+                  ng-model="command.sshAuthorizedKeys" />
+    </div>
+</div>
diff --git a/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/oracle/src/serverGroup/configure/wizard/serverGroupWizard.html
@@ -19,6 +19,9 @@
       <v2-wizard-page key="loadBalancers" label="Load Balancers" done="true">
         <ng-include src="pages.loadBalancers"></ng-include>
       </v2-wizard-page>
+      <v2-wizard-page key="network" label="Network Settings" done="true">
+        <ng-include src="pages.networkSettings"></ng-include>
+      </v2-wizard-page>
     </v2-modal-wizard>
     <div class="modal-footer" ng-if="state.loaded">
       <button ng-disabled="taskMonitor.submitting" class="btn btn-default btn-cancel" ng-click="ctrl.cancel()">Cancel</button>

diff --git a/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/oracle/src/serverGroup/details/serverGroupDetails.html
@@ -89,6 +89,8 @@ <h4 class="text-center" ng-if="ctrl.serverGroup.isDisabled">[SERVER GROUP IS DIS
         <dd>{{ctrl.serverGroup.network.name}}</dd>
         <dt>Subnet</dt>
         <dd>{{ctrl.serverGroup.subnet.name}}</dd>
+        <dt>SSH Key</dt>
+        <dd>{{ctrl.serverGroup.launchConfig.sshAuthorizedKeys}}</dd>
       </dl>
     </collapsible-section>
   </div>