From 2711160b6c02fedb4829481255b0e5e9679704cf Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Fri, 5 Feb 2016 16:40:15 -0500
Subject: [PATCH] Fix log viewer urls

---
 assets/app/scripts/directives/logViewer.js    |  4 +-
 assets/app/scripts/services/data.js           |  4 +-
 assets/app/views/browse/build.html            |  2 +-
 assets/app/views/browse/deployment.html       |  2 +-
 assets/app/views/browse/pod.html              |  2 +-
 .../app/views/logs/chromeless-build-log.html  |  2 +-
 .../views/logs/chromeless-deployment-log.html |  2 +-
 assets/app/views/logs/chromeless-pod-log.html |  2 +-
 assets/test/spec/services/dataServiceSpec.js  |  4 ++
 pkg/assets/bindata.go                         | 60 ++++++++++---------
 10 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/assets/app/scripts/directives/logViewer.js b/assets/app/scripts/directives/logViewer.js
index f49c1824adf0..1e524d1a0008 100644
--- a/assets/app/scripts/directives/logViewer.js
+++ b/assets/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) {
diff --git a/assets/app/scripts/services/data.js b/assets/app/scripts/services/data.js
index a8b2c9e37755..bce8b201e030 100644
--- a/assets/app/scripts/services/data.js
+++ b/assets/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_';
diff --git a/assets/app/views/browse/build.html b/assets/app/views/browse/build.html
index 3b88a4605100..7a2efdcb55a9 100644
--- a/assets/app/views/browse/build.html
+++ b/assets/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"
diff --git a/assets/app/views/browse/deployment.html b/assets/app/views/browse/deployment.html
index 0180a1327bc5..6e556ba31c8e 100644
--- a/assets/app/views/browse/deployment.html
+++ b/assets/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"
diff --git a/assets/app/views/browse/pod.html b/assets/app/views/browse/pod.html
index bd1dec2be7e4..21758c47326f 100644
--- a/assets/app/views/browse/pod.html
+++ b/assets/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"
diff --git a/assets/app/views/logs/chromeless-build-log.html b/assets/app/views/logs/chromeless-build-log.html
index 662e0ef00264..2369ae348d10 100644
--- a/assets/app/views/logs/chromeless-build-log.html
+++ b/assets/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"
diff --git a/assets/app/views/logs/chromeless-deployment-log.html b/assets/app/views/logs/chromeless-deployment-log.html
index 40fb3be26007..880b750f2a63 100644
--- a/assets/app/views/logs/chromeless-deployment-log.html
+++ b/assets/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"
diff --git a/assets/app/views/logs/chromeless-pod-log.html b/assets/app/views/logs/chromeless-pod-log.html
index da76ad32c093..ae5b32903c7e 100644
--- a/assets/app/views/logs/chromeless-pod-log.html
+++ b/assets/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"
diff --git a/assets/test/spec/services/dataServiceSpec.js b/assets/test/spec/services/dataServiceSpec.js
index 129027a3ed46..0d2dedaeca85 100644
--- a/assets/test/spec/services/dataServiceSpec.js
+++ b/assets/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"],
 
 
 
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
index 147359129b71..8a33ec228542 100644
--- a/pkg/assets/bindata.go
+++ b/pkg/assets/bindata.go
@@ -1955,35 +1955,37 @@ config:f
 }
 return k.promise;
 }, k.prototype.createStream = function(a, c, d, e, g) {
-var i, j = this, k = f.toResourceGroupVersion(f.kindToResource(a)), m = g ? "binary.k8s.io" :"base64.binary.k8s.io", n = "stream_", o = {}, p = {}, q = {}, r = {}, s = function() {
-return j._getNamespace(k, d, {}).then(function(a) {
-var f = 0;
+var i = this;
+a = f.toResourceGroupVersion(a);
+var j, k = g ? "binary.k8s.io" :"base64.binary.k8s.io", m = "stream_", n = {}, o = {}, p = {}, q = {}, r = function() {
+return i._getNamespace(a, d, {}).then(function(f) {
+var j = 0;
 return b({
-url:j._urlForResource(k, c, d, !0, _.extend(a, e)),
+url:i._urlForResource(a, c, d, !0, _.extend(f, e)),
 auth:{},
 onopen:function(a) {
-_.each(o, function(b) {
+_.each(n, function(b) {
 b(a);
 });
 },
 onmessage:function(a) {
 if (!_.isString(a.data)) return void h.log("log stream response is not a string", a.data);
 var b;
-g || (b = l(a.data), f += b.length), _.each(p, function(c) {
-g ? c(a.data) :c(b, a.data, f);
+g || (b = l(a.data), j += b.length), _.each(o, function(c) {
+g ? c(a.data) :c(b, a.data, j);
 });
 },
 onclose:function(a) {
-_.each(q, function(b) {
+_.each(p, function(b) {
 b(a);
 });
 },
 onerror:function(a) {
-_.each(r, function(b) {
+_.each(q, function(b) {
 b(a);
 });
 },
-protocols:m
+protocols:k
 }).then(function(a) {
 return h.log("Streaming pod log", a), a;
 });
@@ -1992,36 +1994,36 @@ return h.log("Streaming pod log", a), a;
 return {
 onOpen:function(a) {
 if (_.isFunction(a)) {
-var b = _.uniqueId(n);
-return o[b] = a, b;
+var b = _.uniqueId(m);
+return n[b] = a, b;
 }
 },
 onMessage:function(a) {
 if (_.isFunction(a)) {
-var b = _.uniqueId(n);
-return p[b] = a, b;
+var b = _.uniqueId(m);
+return o[b] = a, b;
 }
 },
 onClose:function(a) {
 if (_.isFunction(a)) {
-var b = _.uniqueId(n);
-return q[b] = a, b;
+var b = _.uniqueId(m);
+return p[b] = a, b;
 }
 },
 onError:function(a) {
 if (_.isFunction(a)) {
-var b = _.uniqueId(n);
-return r[b] = a, b;
+var b = _.uniqueId(m);
+return q[b] = a, b;
 }
 },
 remove:function(a) {
-o[a] && delete o[a], p[a] && delete p[a], q[a] && delete q[a], r[a] && delete r[a];
+n[a] && delete n[a], o[a] && delete o[a], p[a] && delete p[a], q[a] && delete q[a];
 },
 start:function() {
-return i = s();
+return j = r();
 },
 stop:function() {
-i.then(function(a) {
+j.then(function(a) {
 a.close();
 });
 }
@@ -6249,7 +6251,7 @@ templateUrl:"views/directives/logs/_log-viewer.html",
 scope:{
 followAffixTop:"=?",
 followAffixBottom:"=?",
-kind:"@",
+resource:"@",
 name:"=",
 context:"=",
 options:"=?",
@@ -6315,7 +6317,7 @@ follow:!0,
 tailLines:1e3,
 limitBytes:10485760
 }, j.options);
-y = f.createStream(j.kind, j.name, j.context, a);
+y = f.createStream(j.resource, j.name, j.context, a);
 var c = 0, d = function(a) {
 c++, B.appendChild(k(c, a)), C();
 };
@@ -9199,7 +9201,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</uib-tab>\n" +
     "<uib-tab active=\"selectedTab.logs\">\n" +
     "<uib-tab-heading>Logs</uib-tab-heading>\n" +
-    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" kind=\"builds/log\" name=\"build.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"build.status.phase\" start=\"build.status.startTimestamp | date : 'short'\" end=\"build.status.completionTimestamp | date : 'short'\" run=\"logCanRun\">\n" +
+    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" resource=\"builds/log\" name=\"build.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"build.status.phase\" start=\"build.status.startTimestamp | date : 'short'\" end=\"build.status.completionTimestamp | date : 'short'\" run=\"logCanRun\">\n" +
     "</log-viewer>\n" +
     "</uib-tab>\n" +
     "</uib-tabset>\n" +
@@ -9468,7 +9470,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</uib-tab>\n" +
     "<uib-tab ng-if=\"deploymentConfigName && logOptions.version\" active=\"selectedTab.logs\">\n" +
     "<uib-tab-heading>Logs</uib-tab-heading>\n" +
-    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" kind=\"deploymentconfigs/log\" name=\"deploymentConfigName\" context=\"logContext\" options=\"logOptions\" status=\"deployment | deploymentStatus\" start=\"deployment.metadata.creationTimestamp | date : 'short'\" run=\"logCanRun\">\n" +
+    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" resource=\"deploymentconfigs/log\" name=\"deploymentConfigName\" context=\"logContext\" options=\"logOptions\" status=\"deployment | deploymentStatus\" start=\"deployment.metadata.creationTimestamp | date : 'short'\" run=\"logCanRun\">\n" +
     "</log-viewer>\n" +
     "</uib-tab>\n" +
     "</uib-tabset>\n" +
@@ -9768,7 +9770,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</span>\n" +
     "<select id=\"selectLogContainer\" ng-if=\"pod.spec.containers.length > 1\" ng-model=\"logOptions.container\" ng-options=\"container.name as container.name for container in pod.spec.containers\" ng-init=\"logOptions.container = pod.spec.containers[0].name\">\n" +
     "</select>\n" +
-    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" kind=\"pods/log\" name=\"pod.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"pod.status.phase\" start=\"pod.status.startTime | date : 'short'\" run=\"logCanRun\">\n" +
+    "<log-viewer ng-if=\"selectedTab.logs\" follow-affix-top=\"390\" follow-affix-bottom=\"90\" resource=\"pods/log\" name=\"pod.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"pod.status.phase\" start=\"pod.status.startTime | date : 'short'\" run=\"logCanRun\">\n" +
     "</log-viewer>\n" +
     "</uib-tab>\n" +
     "<uib-tab active=\"selectedTab.terminal\" select=\"terminalTabWasSelected = true\" ng-init=\"containers = pod.status.containerStatuses\" ng-if=\"containersRunning(pod.status.containerStatuses) > 0\">\n" +
@@ -12281,7 +12283,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
-    "<log-viewer kind=\"builds/log\" name=\"build.metadata.name\" context=\"logContext\" status=\"build.status.phase\" start=\"build.status.startTimestamp | date : 'short'\" end=\"build.status.completionTimestamp | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
+    "<log-viewer resource=\"builds/log\" name=\"build.metadata.name\" context=\"logContext\" status=\"build.status.phase\" start=\"build.status.startTimestamp | date : 'short'\" end=\"build.status.completionTimestamp | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
     "</log-viewer>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -12306,7 +12308,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
-    "<log-viewer ng-if=\"deploymentConfigName && logOptions.version\" kind=\"deploymentconfigs/log\" name=\"deploymentConfigName\" context=\"logContext\" options=\"logOptions\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
+    "<log-viewer ng-if=\"deploymentConfigName && logOptions.version\" resource=\"deploymentconfigs/log\" name=\"deploymentConfigName\" context=\"logContext\" options=\"logOptions\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
     "</log-viewer>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -12331,7 +12333,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
-    "<log-viewer kind=\"pods/log\" name=\"pod.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"pod.status.phase\" start=\"pod.status.startTime | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
+    "<log-viewer resource=\"pods/log\" name=\"pod.metadata.name\" context=\"logContext\" options=\"logOptions\" status=\"pod.status.phase\" start=\"pod.status.startTime | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
     "</log-viewer>\n" +
     "</div>\n" +
     "</div>\n" +