Revert "Use HTTP for APIs by default (#350)"

This reverts commit 69938bc.

Author: deliahu

cli/cmd/get.go

@@ -464,7 +464,7 @@ func describeAPI(name string, resourcesRes *schema.GetResourcesResponse, flagVer
 	apiEndpoint := urls.Join(resourcesRes.APIsBaseURL, anyAPIStatus.Path)
 
 	out := "\n" + console.Bold("url:  ") + apiEndpoint + "\n"
-	out += fmt.Sprintf("%s curl -X POST -H \"Content-Type: application/json\" %s -d @samples.json\n\n", console.Bold("curl:"), apiEndpoint)
+	out += fmt.Sprintf("%s curl -k -X POST -H \"Content-Type: application/json\" %s -d @samples.json\n\n", console.Bold("curl:"), apiEndpoint)
 	out += fmt.Sprintf(console.Bold("updated at:")+" %s\n", libtime.LocalTimestamp(updatedAt))
 
 	out += "\n"
@@ -554,7 +554,7 @@ func getModelInput(infoAPIPath string) (*schema.ModelInput, error) {
 		return nil, errors.Wrap(err, "unable to request model input")
 	}
 	req.Header.Set("Content-Type", "application/json")
-	response, err := httpsNoVerifyClient.makeRequest(req)
+	response, err := makeRequest(req)
 	if err != nil {
 		return nil, err
 	}

cli/cmd/lib_client.go

@@ -42,31 +42,21 @@ import (
 	"github.com/cortexlabs/cortex/pkg/operator/api/schema"
 )
 
-type cortexClient struct {
-	*http.Client
+var httpTransport = &http.Transport{
+	TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 }
 
-var httpClient = &cortexClient{
-	Client: &http.Client{
-		Timeout: time.Second * 20,
-	},
-}
-
-var httpsNoVerifyClient = &cortexClient{
-	Client: &http.Client{
-		Timeout: time.Second * 20,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-	},
+var httpClient = &http.Client{
+	Timeout:   time.Second * 20,
+	Transport: httpTransport,
 }
 
 func HTTPGet(endpoint string, qParams ...map[string]string) ([]byte, error) {
 	req, err := operatorRequest("GET", endpoint, nil, qParams)
 	if err != nil {
 		return nil, err
 	}
-	return httpsNoVerifyClient.makeRequest(req)
+	return makeRequest(req)
 }
 
 func HTTPPostJSONData(endpoint string, requestData interface{}, qParams ...map[string]string) ([]byte, error) {
@@ -84,7 +74,7 @@ func HTTPPostJSON(endpoint string, jsonRequestData []byte, qParams ...map[string
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/json")
-	return httpsNoVerifyClient.makeRequest(req)
+	return makeRequest(req)
 }
 
 type HTTPUploadInput struct {
@@ -124,7 +114,7 @@ func HTTPUpload(endpoint string, input *HTTPUploadInput, qParams ...map[string]s
 	}
 
 	req.Header.Set("Content-Type", writer.FormDataContentType())
-	return httpsNoVerifyClient.makeRequest(req)
+	return makeRequest(req)
 }
 
 func addFileToMultipart(fileName string, writer *multipart.Writer, reader io.Reader) error {
@@ -264,11 +254,11 @@ func operatorRequest(method string, endpoint string, body io.Reader, qParams []m
 	return req, nil
 }
 
-func (client *cortexClient) makeRequest(request *http.Request) ([]byte, error) {
+func makeRequest(request *http.Request) ([]byte, error) {
 	request.Header.Set("Authorization", authHeader())
 	request.Header.Set("CortexAPIVersion", consts.CortexVersion)
 
-	response, err := client.Do(request)
+	response, err := httpClient.Do(request)
 	if err != nil {
 		cliConfig := getValidCliConfig()
 		return nil, ErrorFailedToConnect(cliConfig.CortexURL)

cli/cmd/predict.go

@@ -169,7 +169,7 @@ func makePredictRequest(apiURL string, samplesJSONPath string) (*PredictResponse
 	}
 
 	req.Header.Set("Content-Type", "application/json")
-	httpResponse, err := httpClient.makeRequest(req)
+	httpResponse, err := makeRequest(req)
 	if err != nil {
 		return nil, err
 	}

docs/cluster/install.md

@@ -60,7 +60,7 @@ cortex get --watch
 cortex get tensorflow
 
 # Classify a sample
-curl -X POST -H "Content-Type: application/json" \
+curl -k -X POST -H "Content-Type: application/json" \
      -d '{ "samples": [ { "sepal_length": 5.2, "sepal_width": 3.6, "petal_length": 1.4, "petal_width": 0.3 } ] }' \
      <API endpoint>
 ```

docs/deployments/tutorial.md

@@ -46,7 +46,7 @@ $ cortex get --watch
 $ cortex get classifier
 
 # Test the API
-$ curl -X POST -H "Content-Type: application/json" \
+$ curl -k -X POST -H "Content-Type: application/json" \
        -d '{ "samples": [ { "sepal_length": 5.2, "sepal_width": 3.6, "petal_length": 1.4, "petal_width": 0.3 } ] }' \
        <API endpoint>
 ```

docs/pipelines/tutorial.md

@@ -111,7 +111,8 @@ $ cortex get api iris-type
 Use cURL to test the API:
 
 ```text
-$ curl -X POST \
+$ curl -k \
+     -X POST \
      -H "Content-Type: application/json" \
      -d '{ "samples": [ { "sepal_length": 5.2, "sepal_width": 3.6, "petal_length": 1.4, "petal_width": 0.3 } ] }' \
      <API endpoint>

pkg/operator/workloads/api_workload.go

@@ -573,7 +573,7 @@ func APIsBaseURL() (string, error) {
 	if len(service.Status.LoadBalancer.Ingress) == 0 {
 		return "", ErrorLoadBalancerInitializing()
 	}
-	return "http://" + service.Status.LoadBalancer.Ingress[0].Hostname, nil
+	return "https://" + service.Status.LoadBalancer.Ingress[0].Hostname, nil
 }
 
 func APIPodComputeID(containers []kcore.Container) string {