AMBARI-23949. Accessing Swagger API when Ambari Server is configured for HTTPS. (jaimin) (#1375)

ambari-server/pom.xml

@@ -433,7 +433,7 @@
               <swaggerApiReader>org.apache.ambari.swagger.AmbariSwaggerReader</swaggerApiReader>
               <springmvc>false</springmvc>
               <locations>org.apache.ambari.server.api.services</locations>
-              <schemes>http,https</schemes>
+              <schemes></schemes>
               <basePath>/api/v1</basePath>
               <info>
                 <title>Swagger spec for Ambari REST API</title>

ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java

@@ -135,8 +135,7 @@ public class ClusterService extends BaseService {
   @ApiOperation(value = "Returns all clusters",
     response = ClusterResponseWrapper.class, responseContainer = RESPONSE_CONTAINER_LIST)
   @ApiImplicitParams({
-    @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION, dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY,
-      defaultValue = ClusterResourceProvider.CLUSTER_NAME),
+    @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION, dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
     @ApiImplicitParam(name = QUERY_SORT, value = QUERY_SORT_DESCRIPTION, dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
     @ApiImplicitParam(name = QUERY_PAGE_SIZE, value = QUERY_PAGE_SIZE_DESCRIPTION, defaultValue = DEFAULT_PAGE_SIZE, dataType = DATA_TYPE_INT, paramType = PARAM_TYPE_QUERY),
     @ApiImplicitParam(name = QUERY_FROM, value = QUERY_FROM_DESCRIPTION, allowableValues = QUERY_FROM_VALUES, defaultValue = DEFAULT_FROM, dataType = DATA_TYPE_INT, paramType = PARAM_TYPE_QUERY),

ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java

@@ -121,10 +121,10 @@ public class ServiceService extends BaseService {
       responseContainer = RESPONSE_CONTAINER_LIST)
   @ApiImplicitParams({
       @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
-          defaultValue = "ServiceInfo/service_name, ServiceInfo/cluster_name",
+          defaultValue = "ServiceInfo/service_name,ServiceInfo/cluster_name",
           dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
       @ApiImplicitParam(name = QUERY_SORT, value = QUERY_SORT_DESCRIPTION,
-          defaultValue = "ServiceInfo/service_name.asc, ServiceInfo/cluster_name.asc",
+          defaultValue = "ServiceInfo/service_name.asc,ServiceInfo/cluster_name.asc",
           dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
       @ApiImplicitParam(name = QUERY_PAGE_SIZE, value = QUERY_PAGE_SIZE_DESCRIPTION, defaultValue = DEFAULT_PAGE_SIZE, dataType = DATA_TYPE_INT, paramType = PARAM_TYPE_QUERY),
       @ApiImplicitParam(name = QUERY_FROM, value = QUERY_FROM_DESCRIPTION, defaultValue = DEFAULT_FROM, dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),

ambari-web/api-docs/css/api-explorer.css

@@ -806,50 +806,6 @@
     margin-left: 5px
 }
 
-.swagger-section .token-generator .scope-selector {
-    padding: 15px 0
-}
-
-.swagger-section .token-generator .scope-selector:after {
-    clear: both
-}
-
-.swagger-section .token-generator .scope-selector:after, .swagger-section .token-generator .scope-selector:before {
-    content: "";
-    display: table
-}
-
-.swagger-section .token-generator .scope-selector > .area {
-    float: left
-}
-
-.swagger-section .token-generator .scope-selector label {
-    display: none
-}
-
-@media (min-width: 992px) {
-    .swagger-section .token-generator .scope-selector label {
-        display: block
-    }
-}
-
-.swagger-section .token-generator .scope-selector .controls {
-    width: calc(100% - 55px)
-}
-
-.swagger-section .token-generator .scope-selector .cta {
-    width: 55px
-}
-
-.swagger-section .token-generator .scope-selector .cta:after {
-    clear: both
-}
-
-.swagger-section .token-generator .scope-selector .cta:after, .swagger-section .token-generator .scope-selector .cta:before {
-    content: "";
-    display: table
-}
-
 .swagger-section .token-generator label {
     text-transform: uppercase;
     letter-spacing: .08em;

ambari-web/api-docs/swagger-ui.js

@@ -176,7 +176,7 @@ this["Handlebars"]["templates"]["main"] = Handlebars.template({"1":function(dept
     + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1), depth0))
     + "\n";
 },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div id=\"swagger_sidebar\">\n    <div class=\"sticky-nav-placeholder\">\n        <div class=\"sticky-nav fixed\">\n            <div class=\"mobile-nav\">\n                <span class=\"select-label\">API Reference: </span><span data-selected-value></span>\n            </div>\n\n            <div class=\"token-generator hide\">\n                <span data-close class=\"icon-budicon-471\"></span>\n                <label for=\"input-api-token\">Url</label>\n                <input type=\"text\" autocorrect=\"off\" class=\"ui-form-control\" id=\"input_baseUrl\"\n                       placeholder=\"http://example.com/api\">\n\n                <div class=\"scope-selector\">\n                    <label for=\"scopes\">Token</label>\n\n                    <div class=\"area controls\">\n                        <input type=\"text\" autocorrect=\"off\" class=\"ui-form-control\" id=\"input_apiKey\"\n                               placeholder=\"Enter api key or token\">\n                    </div>\n\n                    <div class=\"area cta\">\n                        <div data-add-scope id=\"explore\" class=\"btn\"><span class=\"icon-budicon-519\"></span>\n                        </div>\n                    </div>\n                </div>\n\n            </div>\n            <div data-navigator>\n                <div data-resource=\"\" label=\"Tools\">\n                    <div class=\"item\" data-tg-switch=\"\">Swagger resource <span class=\"status\"></span></div>\n                </div>\n                <div id=\"resources_nav\">\n                </div>\n            </div>\n\n            <p class=\"changes-disclaimer\">\n                <span class='info' id='api_info'>\n";
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div id=\"swagger_sidebar\">\n    <div class=\"sticky-nav-placeholder\">\n        <div class=\"sticky-nav fixed\">\n            <div class=\"mobile-nav\">\n                <span class=\"select-label\">API Reference: </span><span data-selected-value></span>\n            </div>\n\n            <div class=\"token-generator hide\">\n                <span data-close class=\"icon-budicon-471\"></span>\n                <label for=\"input-api-token\">Url</label>\n                <input type=\"text\" autocorrect=\"off\" class=\"ui-form-control\" id=\"input_baseUrl\"\n                       placeholder=\"http://ambari.apache.org:8080/api-docs/swagger.json\">\n                <div class=\"scope-selector\" style=\"display: none;\">\n                    <label for=\"scopes\">Token</label>\n\n                    <div class=\"area controls\">\n                        <input type=\"text\" autocorrect=\"off\" class=\"ui-form-control\" id=\"input_apiKey\"\n                               placeholder=\"Enter api key or token\">\n                    </div>\n\n                    <div class=\"area cta\">\n                        <div data-add-scope id=\"explore\" class=\"btn\"><span class=\"icon-budicon-519\"></span>\n                        </div>\n                    </div>\n                </div>\n\n            </div>\n            <div data-navigator>\n                <div data-resource=\"\" label=\"Tools\">\n                    <div class=\"item\" data-tg-switch=\"\">Swagger resource <span class=\"status\"></span></div>\n                </div>\n                <div id=\"resources_nav\">\n                </div>\n            </div>\n\n            <p class=\"changes-disclaimer\">\n                <span class='info' id='api_info'>\n";
   stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.info : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
   if (stack1 != null) { buffer += stack1; }
   buffer += "\n                </span>\n\n                <span class='info' id='api_info'>\n";
@@ -3124,11 +3124,10 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     this.client = parent.options.client || null;
     this.responseInterceptor = parent.options.responseInterceptor || null;
   }
-
   this.authorizations = args.security;
   this.basePath = parent.basePath || '/';
   this.clientAuthorizations = clientAuthorizations;
-  this.consumes = args.consumes || parent.consumes || ['text/plain'];
+  this.consumes = args.consumes || parent.consumes || ['application/json'];
   this.produces = args.produces || parent.produces || ['application/json'];
   this.deprecated = args.deprecated;
   this.description = args.description;
@@ -22641,4 +22640,4 @@ SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
     }
     return this;
   }
-});}).call(this);
+});}).call(this);