Skip to content

Commit 4736fb5

Browse files
author
Keerthan Mala
committed
change the server stubs after deleting get latest component API endpoint
1 parent 1ddd600 commit 4736fb5

9 files changed

+24
-300
lines changed

pkg/handlers/get_latest_component_train_version.go

-30
This file was deleted.

pkg/handlers/handlers.go

+12-5
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,23 @@ func GetVersion(params operations.GetComponentByReleaseParams, db *gorm.DB) midd
5353
train := params.Train
5454
component := params.Component
5555
version := params.Release
56-
componentVersion := models.ComponentVersion{
57-
Component: &models.Component{Name: component},
58-
Version: &models.Version{Train: train, Version: version},
56+
var cv models.ComponentVersion
57+
var err error
58+
if version == "latest" {
59+
cv, err = data.GetLatestVersion(db, train, component)
60+
} else {
61+
componentVersion := models.ComponentVersion{
62+
Component: &models.Component{Name: component},
63+
Version: &models.Version{Train: train, Version: version},
64+
}
65+
cv, err = data.GetVersion(db, componentVersion)
5966
}
60-
componentVersion, err := data.GetVersion(db, componentVersion)
67+
6168
if err != nil {
6269
log.Printf("data.GetVersion error (%s)", err)
6370
return operations.NewGetComponentByReleaseDefault(http.StatusNotFound).WithPayload(&models.Error{Code: http.StatusNotFound, Message: "404 release not found"})
6471
}
65-
return operations.NewGetComponentByReleaseOK().WithPayload(&componentVersion)
72+
return operations.NewGetComponentByReleaseOK().WithPayload(&cv)
6673
}
6774

6875
// GetComponentTrainVersions route handler

pkg/swagger/restapi/configure_workflow_manager.go

-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ func configureAPI(api *operations.WorkflowManagerAPI) http.Handler {
6464
api.GetClustersCountHandler = operations.GetClustersCountHandlerFunc(func() middleware.Responder {
6565
return handlers.ClustersCount(rdsDB)
6666
})
67-
api.GetComponentByLatestReleaseHandler = operations.GetComponentByLatestReleaseHandlerFunc(func(params operations.GetComponentByLatestReleaseParams) middleware.Responder {
68-
return handlers.GetLatestComponentTrainVersion(params, rdsDB)
69-
})
7067
api.GetComponentByNameHandler = operations.GetComponentByNameHandlerFunc(func(params operations.GetComponentByNameParams) middleware.Responder {
7168
return handlers.GetComponentTrainVersions(params, rdsDB)
7269
})

pkg/swagger/restapi/embedded_spec.go

+1-1
Large diffs are not rendered by default.

pkg/swagger/restapi/operations/get_component_by_latest_release.go

-53
This file was deleted.

pkg/swagger/restapi/operations/get_component_by_latest_release_parameters.go

-80
This file was deleted.

pkg/swagger/restapi/operations/get_component_by_latest_release_responses.go

-104
This file was deleted.

pkg/swagger/restapi/operations/workflow_manager_api.go

-11
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ type WorkflowManagerAPI struct {
5151
GetClustersByAgeHandler GetClustersByAgeHandler
5252
// GetClustersCountHandler sets the operation handler for the get clusters count operation
5353
GetClustersCountHandler GetClustersCountHandler
54-
// GetComponentByLatestReleaseHandler sets the operation handler for the get component by latest release operation
55-
GetComponentByLatestReleaseHandler GetComponentByLatestReleaseHandler
5654
// GetComponentByNameHandler sets the operation handler for the get component by name operation
5755
GetComponentByNameHandler GetComponentByNameHandler
5856
// GetComponentByReleaseHandler sets the operation handler for the get component by release operation
@@ -132,10 +130,6 @@ func (o *WorkflowManagerAPI) Validate() error {
132130
unregistered = append(unregistered, "GetClustersCountHandler")
133131
}
134132

135-
if o.GetComponentByLatestReleaseHandler == nil {
136-
unregistered = append(unregistered, "GetComponentByLatestReleaseHandler")
137-
}
138-
139133
if o.GetComponentByNameHandler == nil {
140134
unregistered = append(unregistered, "GetComponentByNameHandler")
141135
}
@@ -245,11 +239,6 @@ func (o *WorkflowManagerAPI) initHandlerCache() {
245239
}
246240
o.handlers["GET"]["/clusters/count"] = NewGetClustersCount(o.context, o.GetClustersCountHandler)
247241

248-
if o.handlers["GET"] == nil {
249-
o.handlers[strings.ToUpper("GET")] = make(map[string]http.Handler)
250-
}
251-
o.handlers["GET"]["/versions/{train}/{component}/latest"] = NewGetComponentByLatestRelease(o.context, o.GetComponentByLatestReleaseHandler)
252-
253242
if o.handlers["GET"] == nil {
254243
o.handlers[strings.ToUpper("GET")] = make(map[string]http.Handler)
255244
}

0 commit comments

Comments
 (0)