feat(swagger): add doctor api get spec

Author: smothiki

api/swagger-spec/swagger.yml

@@ -55,6 +55,18 @@ paths:
   /v3/doctor/{uuid}:
     parameters:
       - $ref: "#/parameters/UUID"
+    get:
+      operationId: getDoctorInfo
+      summary: "get the specified doctor report as per UUID"
+      responses:
+        200:
+          description: doctor get response
+          schema:
+            $ref: "#/definitions/doctorInfo"
+        default:
+          description: unexpected error
+          schema:
+            $ref: "#/definitions/error"
     post:
       operationId: publishDoctorInfo
       summary: "publish doctor info to Workflow Manager API"

boot.go

@@ -54,7 +54,7 @@ func main() {
 	defer close(ch)
 
 	// Get a new router, with handler functions
-	r := handlers.RegisterRoutes(mux.NewRouter(), secretInterface, rcInterface, availableVersion, apiClient)
+	r := handlers.RegisterRoutes(mux.NewRouter(), secretInterface, rcInterface, availableVersion)
 	// Bind to a port and pass our router in
 	hostStr := fmt.Sprintf(":%s", config.Spec.Port)
 	log.Printf("Serving on %s", hostStr)

data/data.go

@@ -160,10 +160,10 @@ func GetDoctorInfo(
 ) (models.DoctorInfo, error) {
 	cluster, err := GetCluster(c, i, v, secretGetterCreator)
 	if err != nil {
-		return nil, err
+		return models.DoctorInfo{}, err
 	}
 	doctor := models.DoctorInfo{
-		cluster: &cluster,
+		Cluster: &cluster,
 	}
 	return doctor, nil
 }

handlers/handlers.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/arschles/kubeapp/api/rc"
+	"github.com/deis/workflow-manager/config"
 	"github.com/deis/workflow-manager/data"
 	"github.com/deis/workflow-manager/pkg/swagger/client/operations"
 	"github.com/gorilla/mux"
@@ -24,7 +25,6 @@ func RegisterRoutes(
 	secretGetterCreator data.KubeSecretGetterCreator,
 	rcLister rc.Lister,
 	availableVersions data.AvailableVersions,
-	apiClient *apiclient.WorkflowManager,
 ) *mux.Router {
 
 	clusterID := data.NewClusterIDFromPersistentStorage(secretGetterCreator)
@@ -40,8 +40,7 @@ func RegisterRoutes(
 		clusterID,
 		data.NewLatestReleasedComponent(secretGetterCreator, rcLister, availableVersions),
 		secretGetterCreator,
-		apiclient,
-	))
+	)).Methods("POST")
 	return r
 }
 
@@ -70,19 +69,21 @@ func DoctorHandler(
 	i data.ClusterID,
 	v data.AvailableComponentVersion,
 	secretGetterCreator data.KubeSecretGetterCreator,
-	apiClient *apiclient.WorkflowManager,
 ) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		doctor, err := data.GetDoctorInfo(c, i, v, secretGetterCreator)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		_, err = apiClient.Operations.PublishDoctorInfo(&operations.PublishDoctorInfoParams{Body: doctor, UUID: uuid.NewV4().String()})
+		apiClient, err := config.GetSwaggerClient(config.Spec.DoctorAPIURL)
+		uid := uuid.NewV4().String()
+		_, err = apiClient.Operations.PublishDoctorInfo(&operations.PublishDoctorInfoParams{Body: &doctor, UUID: uid})
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
+		writePlainText(uid, w)
 	})
 }
 

pkg/swagger/client/operations/get_doctor_info_parameters.go

@@ -0,0 +1,52 @@
+package operations
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-swagger/go-swagger/client"
+	"github.com/go-swagger/go-swagger/errors"
+
+	strfmt "github.com/go-swagger/go-swagger/strfmt"
+)
+
+// NewGetDoctorInfoParams creates a new GetDoctorInfoParams object
+// with the default values initialized.
+func NewGetDoctorInfoParams() *GetDoctorInfoParams {
+	var ()
+	return &GetDoctorInfoParams{}
+}
+
+/*GetDoctorInfoParams contains all the parameters to send to the API endpoint
+for the get doctor info operation typically these are written to a http.Request
+*/
+type GetDoctorInfoParams struct {
+
+	/*UUID
+	  A universal Id to represent a sepcific request or report
+
+	*/
+	UUID string
+}
+
+// WithUUID adds the uuid to the get doctor info params
+func (o *GetDoctorInfoParams) WithUUID(uuid string) *GetDoctorInfoParams {
+	o.UUID = uuid
+	return o
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetDoctorInfoParams) WriteToRequest(r client.Request, reg strfmt.Registry) error {
+
+	var res []error
+
+	// path param uuid
+	if err := r.SetPathParam("uuid", o.UUID); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

pkg/swagger/client/operations/get_doctor_info_responses.go

@@ -0,0 +1,108 @@
+package operations
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-swagger/go-swagger/client"
+	"github.com/go-swagger/go-swagger/httpkit"
+
+	strfmt "github.com/go-swagger/go-swagger/strfmt"
+
+	"github.com/deis/workflow-manager/pkg/swagger/models"
+)
+
+// GetDoctorInfoReader is a Reader for the GetDoctorInfo structure.
+type GetDoctorInfoReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the recieved o.
+func (o *GetDoctorInfoReader) ReadResponse(response client.Response, consumer httpkit.Consumer) (interface{}, error) {
+	switch response.Code() {
+
+	case 200:
+		result := NewGetDoctorInfoOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+
+	default:
+		result := NewGetDoctorInfoDefault(response.Code())
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	}
+}
+
+// NewGetDoctorInfoOK creates a GetDoctorInfoOK with default headers values
+func NewGetDoctorInfoOK() *GetDoctorInfoOK {
+	return &GetDoctorInfoOK{}
+}
+
+/*GetDoctorInfoOK handles this case with default header values.
+
+doctor get response
+*/
+type GetDoctorInfoOK struct {
+	Payload *models.DoctorInfo
+}
+
+func (o *GetDoctorInfoOK) Error() string {
+	return fmt.Sprintf("[GET /v3/doctor/{uuid}][%d] getDoctorInfoOK  %+v", 200, o.Payload)
+}
+
+func (o *GetDoctorInfoOK) readResponse(response client.Response, consumer httpkit.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.DoctorInfo)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetDoctorInfoDefault creates a GetDoctorInfoDefault with default headers values
+func NewGetDoctorInfoDefault(code int) *GetDoctorInfoDefault {
+	return &GetDoctorInfoDefault{
+		_statusCode: code,
+	}
+}
+
+/*GetDoctorInfoDefault handles this case with default header values.
+
+unexpected error
+*/
+type GetDoctorInfoDefault struct {
+	_statusCode int
+
+	Payload *models.Error
+}
+
+// Code gets the status code for the get doctor info default response
+func (o *GetDoctorInfoDefault) Code() int {
+	return o._statusCode
+}
+
+func (o *GetDoctorInfoDefault) Error() string {
+	return fmt.Sprintf("[GET /v3/doctor/{uuid}][%d] getDoctorInfo default  %+v", o._statusCode, o.Payload)
+}
+
+func (o *GetDoctorInfoDefault) readResponse(response client.Response, consumer httpkit.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.Error)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}

pkg/swagger/client/operations/operations_client.go

@@ -247,6 +247,31 @@ func (a *Client) GetComponentsByLatestReleaseForV2(params *GetComponentsByLatest
 	return result.(*GetComponentsByLatestReleaseForV2OK), nil
 }
 
+/*
+GetDoctorInfo gets the specified doctor report as per UUID
+*/
+func (a *Client) GetDoctorInfo(params *GetDoctorInfoParams) (*GetDoctorInfoOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetDoctorInfoParams()
+	}
+
+	result, err := a.transport.Submit(&client.Operation{
+		ID:                 "getDoctorInfo",
+		Method:             "GET",
+		PathPattern:        "/v3/doctor/{uuid}",
+		ProducesMediaTypes: []string{"application/json"},
+		ConsumesMediaTypes: []string{"application/json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetDoctorInfoReader{formats: a.formats},
+	})
+	if err != nil {
+		return nil, err
+	}
+	return result.(*GetDoctorInfoOK), nil
+}
+
 /*
 Ping pings the versions API server
 */