Merge pull request #3232 from nikhiljindal/third_party

hack/build-ui.sh

@@ -33,7 +33,7 @@ fi
 DATAFILE=pkg/ui/datafile.go
 TMP_DATAFILE=/tmp/datafile.go
 
-go-bindata -nocompress -o $DATAFILE -prefix ${PWD} -pkg ui www/...
+go-bindata -nocompress -o $DATAFILE -prefix ${PWD} -pkg ui www/... third_party/swagger-ui/...
 
 cat hooks/boilerplate.go.txt > $TMP_DATAFILE
 echo "// generated by hack/build-ui.sh; DO NOT EDIT

pkg/master/master.go

@@ -419,7 +419,7 @@ func (m *Master) InstallSwaggerAPI() {
 		// TODO: Parameterize the path?
 		ApiPath:         "/swaggerapi/",
 		SwaggerPath:     "/swaggerui/",
-		SwaggerFilePath: "/static/swagger-ui/",
+		SwaggerFilePath: "/swagger-ui/",
 	}
 	swagger.RegisterSwaggerService(swaggerConfig, m.handlerContainer)
 }

pkg/ui/www.go → pkg/ui/installsupport.go

@@ -22,13 +22,18 @@ import (
 	assetfs "github.com/elazarl/go-bindata-assetfs"
 )
 
-const prefix = "/static/"
-
 type MuxInterface interface {
 	Handle(pattern string, handler http.Handler)
 }
 
 func InstallSupport(mux MuxInterface) {
+	// Expose files in www/ on <host>/static/
 	fileServer := http.FileServer(&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "www"})
+	prefix := "/static/"
+	mux.Handle(prefix, http.StripPrefix(prefix, fileServer))
+
+	// Expose files in third_party/swagger-ui/ on <host>/swagger-ui/
+	fileServer = http.FileServer(&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "third_party/swagger-ui"})
+	prefix = "/swagger-ui/"
 	mux.Handle(prefix, http.StripPrefix(prefix, fileServer))
 }

third_party/swagger-ui/LICENSE

+Copyright 2014 Reverb Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

third_party/swagger-ui/README.md

+# Readme
+
+URL: https://github.com/swagger-api/swagger-ui/tree/master/dist
+License: Apache License, Version 2.0
+License File: LICENSE
+
+## Description
+Files from dist folder of https://github.com/swagger-api/swagger-ui.
+These are dependency-free collection of HTML, Javascript, and CSS assets that
+dynamically generate beautiful documentation and sandbox from a
+Swagger-compliant API.
+Instructions on how to use these:
+https://github.com/swagger-api/swagger-ui#how-to-use-it
+
+## Local Modifications
+Updated the url to "../../swaggerapi" as per instructions at:
+https://github.com/swagger-api/swagger-ui#how-to-use-it
+
+LICENSE file has been created for compliance purposes.
+Not included in original distribution.