Update REST for exposeui flag as a string

radanalyticsio · Sep 26, 2017 · 418b999 · 418b999
1 parent 740978f
commit 418b999
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/rest/api/swagger.yaml b/rest/api/swagger.yaml
@@ -140,8 +140,7 @@ definitions:
           exposeWebUI:
             description: |-
               If true (which is the default), cluster create will also expose the Spark Web UI
-            type: boolean
-            default: true
+            type: string
           metrics:
             description: |-
               Enable spark metrics, true or false (default is false)

diff --git a/rest/client/oshinko_rest_client.go b/rest/client/oshinko_rest_client.go
@@ -21,7 +21,7 @@ func NewHTTPClient(formats strfmt.Registry) *OshinkoRest {
 	if formats == nil {
 		formats = strfmt.Default
 	}
-	transport := httptransport.New("localhost", "/", []string{"https", "http"})
+	transport := httptransport.New("localhost", "/", []string{"http", "https"})
 	return New(transport, formats)
 }
 

diff --git a/rest/handlers/clusters.go b/rest/handlers/clusters.go
@@ -89,7 +89,7 @@ func singleClusterResponse(sc coreclusters.SparkCluster) *models.SingleCluster {
 		MasterCount: int64ptr(sc.Config.MasterCount),
 		WorkerCount: int64ptr(sc.Config.WorkerCount),
 		Name: sc.Config.Name,
-		ExposeWebUI: boolptr(sc.Config.ExposeWebUI),
+		ExposeWebUI: sc.Config.ExposeWebUI,
 		Metrics: sc.Config.Metrics,
 	}
 	return cluster
@@ -120,7 +120,7 @@ func assignConfig(config *models.NewClusterConfig) *coreclusters.ClusterConfig {
 		SparkMasterConfig: config.SparkMasterConfig,
 		SparkWorkerConfig: config.SparkWorkerConfig,
 		SparkImage: config.SparkImage,
-		ExposeWebUI: getBoolVal(config.ExposeWebUI),
+		ExposeWebUI: config.ExposeWebUI,
 		Metrics: config.Metrics,
 	}
 	return result

diff --git a/rest/models/new_cluster.go b/rest/models/new_cluster.go
@@ -81,7 +81,7 @@ type NewClusterConfig struct {
 
 	/* If true (which is the default), cluster create will also expose the Spark Web UI
 	 */
-	ExposeWebUI *bool `json:"exposeWebUI,omitempty"`
+	ExposeWebUI string `json:"exposeWebUI,omitempty"`
 
 	/* The count of master nodes requested in the cluster (must be > 0)
 	 */

diff --git a/rest/restapi/embedded_spec.go b/rest/restapi/embedded_spec.go
diff --git a/rest/tests/unit/clusterconfigs_test.go b/rest/tests/unit/clusterconfigs_test.go
@@ -34,7 +34,7 @@ var nonIntMaster clusters.ClusterConfig = clusters.ClusterConfig{Name: "cow"}
 var nonIntWorker clusters.ClusterConfig = clusters.ClusterConfig{Name: "pig"}
 var userDefault = clusters.ClusterConfig{MasterCount: 3, WorkerCount: 3,
 	SparkMasterConfig: "master-default", SparkWorkerConfig: "worker-default", Name: "default-oshinko-cluster-config",
-        ExposeWebUI: true, Metrics: "true" }
+        ExposeWebUI: "false", Metrics: "true" }
 
 func makeConfigMap(cfg clusters.ClusterConfig) *api.ConfigMap {
 	var res api.ConfigMap = api.ConfigMap{Data: map[string]string{}}
@@ -50,11 +50,12 @@ func makeConfigMap(cfg clusters.ClusterConfig) *api.ConfigMap {
 	if cfg.WorkerCount != 0 {
 		res.Data["workercount"] = strconv.Itoa(cfg.WorkerCount)
 	}
-	// Needs clusterconfigs to respect exposeui from configmap before this works
-	// res.Data["exposeui"] = strconv.FormatBool(cfg.ExposeWebUI)
 	if cfg.Metrics != "" {
 		res.Data["metrics"] = cfg.Metrics
 	}
+	if cfg.ExposeWebUI != "" {
+		res.Data["exposeui"] = cfg.ExposeWebUI
+	}
 	res.Name = cfg.Name
 	return &res
 }