Titus: change titus ui links to new ui and remove stack from titus-ss…

…h as this is no longer needed
spinnaker · Mar 16, 2018 · 94e109d · 94e109d
1 parent 5c80b59
commit 94e109d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/instance/details/instance.details.controller.js b/instance/details/instance.details.controller.js
@@ -263,22 +263,14 @@ module.exports = angular.module('spinnaker.instance.detail.titus.controller', [
     let getBastionAddressForAccount = (account, region) => {
       return accountService.getAccountDetails(account).then((details) => {
         this.bastionHost = details.bastionHost || 'unknown';
-        this.apiEndpoint = filter(details.regions, {name: region})[0].endpoint;
 
       const discoveryHealth = $scope.instance.health.find(m => m.type === 'Discovery');
 
       if (discoveryHealth) {
           this.discoveryInfoLink = `http://discoveryreadonly.${$scope.instance.region}.dyn${details.environment}.netflix.net:7001/discovery/v2/apps/${discoveryHealth.application}/${$scope.instance.instanceId}`;
         }
-
-        this.titusUiEndpoint = this.apiEndpoint.replace('titusapi', 'titus-ui').replace('http', 'https').replace('7101', '7001');
-        if (region !== 'us-east-1') {
-          this.bastionStack = '-stack ' + this.apiEndpoint.split('.' + region)[0].replace('http://titusapi.', '');
-        } else {
-          this.bastionStack = '';
-        }
-
-        $scope.sshLink = `ssh -t ${this.bastionHost} 'titus-ssh ${this.bastionStack} -region ${$scope.instance.region} -id ${$scope.instance.id}'`;
+        this.titusUiEndpoint = filter(details.regions, {name: region})[0].endpoint;
+        $scope.sshLink = `ssh -t ${this.bastionHost} 'titus-ssh -region ${$scope.instance.region} -id ${$scope.instance.id}'`;
       });
     };
 

diff --git a/instance/details/instanceDetails.html b/instance/details/instanceDetails.html
@@ -161,7 +161,7 @@ <h3 select-on-dbl-click>
     </collapsible-section>
     <collapsible-section heading="Task Logs">
       <ul>
-        <li><a href="{{ctrl.titusUiEndpoint}}tasklogs.html?tid={{instance.id}}" target="_blank">Task Logs</a></li>
+        <li><a href="{{ctrl.titusUiEndpoint}}jobs/{{instance.jobId}}/task/{{instance.id}}/logs" target="_blank">Task Logs</a></li>
       </ul>
     </collapsible-section>
     <instance-links address="baseIpAddress" application="application" instance="instance"></instance-links>

diff --git a/pipeline/stages/runJob/runJobExecutionDetails.controller.js b/pipeline/stages/runJob/runJobExecutionDetails.controller.js
@@ -25,8 +25,7 @@ module.exports = angular.module('spinnaker.titus.pipeline.stage.runJob.execution
       }
 
       accountService.getAccountDetails($scope.stage.context.credentials).then((details) => {
-        $scope.apiEndpoint = filter(details.regions, {name: $scope.stage.context.cluster.region})[0].endpoint;
-        $scope.titusUiEndpoint = $scope.apiEndpoint.replace('titusapi', 'titus-ui').replace('http', 'https').replace('7101', '7001');
+        $scope.titusUiEndpoint = filter(details.regions, {name: $scope.stage.context.cluster.region})[0].endpoint;
       });
     };
 

diff --git a/pipeline/stages/runJob/runJobExecutionDetails.html b/pipeline/stages/runJob/runJobExecutionDetails.html
@@ -39,7 +39,7 @@ <h5 style="margin-bottom: 0; padding-bottom: 5px;">Property File</h5>
     <div class="row" ng-if="stage.context.jobStatus.completionDetails.taskId">
       <div class="col-md-12">
         <div class="well alert alert-info">
-          <a target="_blank" href="{{titusUiEndpoint}}tasklogs.html?tid={{task}}">
+          <a target="_blank" href="{{titusUiEndpoint}}jobs/{{job}}/task{{task}}/logs">
             View Execution Logs
           </a>
         </div>