Fix log viewer urls

Author: liggitt

app/scripts/directives/logViewer.js

@@ -36,7 +36,7 @@ angular.module('openshiftConsole')
         scope: {
           followAffixTop: '=?',
           followAffixBottom: '=?',
-          kind: '@',
+          resource: '@',
           name: '=',
           context: '=',
           options: '=?',
@@ -234,7 +234,7 @@ angular.module('openshiftConsole')
                 tailLines: 1000,
                 limitBytes: 10 * 1024 * 1024 // Limit log size to 10 MiB
               }, $scope.options);
-              streamer = DataService.createStream($scope.kind, $scope.name, $scope.context, options);
+              streamer = DataService.createStream($scope.resource, $scope.name, $scope.context, options);
 
               var lastLineNumber = 0;
               var addLine = function(text) {

app/scripts/services/data.js

@@ -366,9 +366,9 @@ function b64_to_utf8( str ) {
 }
 
 // TODO (bpeterse): Create a new Streamer service & get this out of DataService.
-DataService.prototype.createStream = function(kind, name, context, opts, isRaw) {
+DataService.prototype.createStream = function(resource, name, context, opts, isRaw) {
   var self = this;
-  var resource = APIService.toResourceGroupVersion(APIService.kindToResource(kind));
+  resource = APIService.toResourceGroupVersion(resource);
 
   var protocols = isRaw ? 'binary.k8s.io' : 'base64.binary.k8s.io';
   var identifier = 'stream_';

app/views/browse/build.html

@@ -90,7 +90,7 @@ <h1>
                         ng-if="selectedTab.logs"
                         follow-affix-top="390"
                         follow-affix-bottom="90"
-                        kind="builds/log"
+                        resource="builds/log"
                         name="build.metadata.name"
                         context="logContext"
                         options="logOptions"

app/views/browse/deployment.html

@@ -77,7 +77,7 @@ <h3>Container {{container.name}}</h3>
                       ng-if="selectedTab.logs"
                       follow-affix-top="390"
                       follow-affix-bottom="90"
-                      kind="deploymentconfigs/log"
+                      resource="deploymentconfigs/log"
                       name="deploymentConfigName"
                       context="logContext"
                       options="logOptions"

app/views/browse/pod.html

@@ -90,7 +90,7 @@ <h3>Container {{container.name}}</h3>
                         ng-if="selectedTab.logs"
                         follow-affix-top="390"
                         follow-affix-bottom="90"
-                        kind="pods/log"
+                        resource="pods/log"
                         name="pod.metadata.name"
                         context="logContext"
                         options="logOptions"

app/views/logs/chromeless-build-log.html

@@ -13,7 +13,7 @@
         </div>
         <div class="middle-content"><!-- flex item (fill the parent) -->
           <log-viewer
-            kind="builds/log"
+            resource="builds/log"
             name="build.metadata.name"
             context="logContext"
             status="build.status.phase"

app/views/logs/chromeless-deployment-log.html

@@ -14,7 +14,7 @@
         <div class="middle-content">
           <log-viewer
             ng-if="deploymentConfigName && logOptions.version"
-            kind="deploymentconfigs/log"
+            resource="deploymentconfigs/log"
             name="deploymentConfigName"
             context="logContext"
             options="logOptions"

app/views/logs/chromeless-pod-log.html

@@ -13,7 +13,7 @@
         </div>
         <div class="middle-content">
           <log-viewer
-            kind="pods/log"
+            resource="pods/log"
             name="pod.metadata.name"
             context="logContext"
             options="logOptions"

test/spec/services/dataServiceSpec.js

@@ -63,8 +63,12 @@ describe("DataService", function(){
       [{resource:'pods', namespace:"foo", isWebsocket:true, watch: true, resourceVersion:"5"  }, "ws://localhost:8443/api/v1/namespaces/foo/pods?watch=true&resourceVersion=5"],
 
       // Follow log
+      // subresource is ignored without a resource name
       [{resource:'pods/log', namespace:"foo", isWebsocket:true, follow: true                       }, "ws://localhost:8443/api/v1/namespaces/foo/pods?follow=true"],
       [{resource:'builds/log', namespace:"foo", isWebsocket:true, follow: true                     }, "ws://localhost:8443/oapi/v1/namespaces/foo/builds?follow=true"],
+      // subresource is honored with a resource name
+      [{resource:'pods/log',   name:"p", namespace:"foo", isWebsocket:true, follow: true           }, "ws://localhost:8443/api/v1/namespaces/foo/pods/p/log?follow=true"],
+      [{resource:'builds/log', name:"b", namespace:"foo", isWebsocket:true, follow: true           }, "ws://localhost:8443/oapi/v1/namespaces/foo/builds/b/log?follow=true"],