From 045627502980a46cbb2e386b585f72432c31ff50 Mon Sep 17 00:00:00 2001 From: sivakumar subraani Date: Mon, 18 Nov 2024 08:54:55 +0000 Subject: [PATCH] Review comment --- pkg/apis/v1/api.pb.go | 25 ++++++------ pkg/apis/v1/api.pb.gw.go | 2 +- pkg/apis/v1/api.proto | 2 +- pkg/apis/v1/api.swagger.json | 74 ++++++++++++++++++------------------ 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/pkg/apis/v1/api.pb.go b/pkg/apis/v1/api.pb.go index 65dc1565..c6cd5a80 100644 --- a/pkg/apis/v1/api.pb.go +++ b/pkg/apis/v1/api.pb.go @@ -17431,7 +17431,7 @@ func init() { func init() { proto.RegisterFile("pkg/apis/v1/api.proto", fileDescriptor_9943feda3d652502) } var fileDescriptor_9943feda3d652502 = []byte{ - // 12063 bytes of a gzipped FileDescriptorProto + // 12065 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x5b, 0x6c, 0x24, 0x57, 0x76, 0xd8, 0xf4, 0x83, 0x64, 0xf7, 0xe9, 0x26, 0xd9, 0xbc, 0x64, 0x93, 0x3d, 0x35, 0x7c, 0x4d, 0x49, 0xf3, 0xd6, 0xd4, 0x48, 0x94, 0x46, 0x9a, 0x1d, 0x69, 0xb5, 0x4b, 0x72, 0x66, 0x34, 0x94, @@ -18175,17 +18175,18 @@ var fileDescriptor_9943feda3d652502 = []byte{ 0x88, 0xb6, 0x9b, 0x4a, 0x59, 0xa5, 0x13, 0xcb, 0x55, 0x9c, 0x58, 0xee, 0x80, 0x13, 0x8b, 0x0d, 0x5e, 0x22, 0xfe, 0xae, 0x82, 0xf8, 0xbb, 0x03, 0x88, 0x7f, 0x3a, 0x88, 0xf7, 0x25, 0x5b, 0xa2, 0x59, 0x43, 0x69, 0x24, 0x85, 0x59, 0x41, 0xa5, 0x8d, 0x93, 0x5e, 0x21, 0xdd, 0x00, 0x0a, 0xc1, - 0x5d, 0xf9, 0x08, 0xa6, 0xa2, 0x10, 0xb3, 0x2d, 0x1a, 0xc9, 0x0f, 0x6d, 0x91, 0xb8, 0xb1, 0x42, - 0xdc, 0xa5, 0x19, 0x43, 0x61, 0x41, 0xa2, 0x55, 0x0d, 0x95, 0xf1, 0x87, 0x7c, 0x39, 0xb0, 0x43, - 0xce, 0x82, 0xb0, 0x50, 0x38, 0xac, 0xb5, 0x1f, 0x64, 0x7e, 0x79, 0xd5, 0xf9, 0xe0, 0x7d, 0x78, - 0x0f, 0x46, 0xb7, 0x6c, 0xcb, 0xb3, 0x3d, 0x74, 0xb7, 0x90, 0x45, 0xd7, 0x56, 0xa5, 0xb7, 0x90, - 0x96, 0x89, 0xa7, 0xc7, 0x0b, 0xcb, 0x5d, 0xcf, 0xde, 0x76, 0x9e, 0xd8, 0xcd, 0xe5, 0xad, 0xfd, - 0xe5, 0x35, 0x52, 0xfa, 0x3a, 0xfb, 0x5d, 0x7e, 0x83, 0x14, 0x79, 0x53, 0x1b, 0xc7, 0x35, 0x5d, - 0x8f, 0xb1, 0x35, 0xcb, 0xd9, 0xad, 0x32, 0x40, 0xd8, 0xf4, 0x89, 0xbf, 0xf8, 0xe3, 0xc5, 0xcc, - 0x3f, 0xf8, 0x6c, 0x31, 0xf3, 0x2f, 0x3e, 0x5b, 0xcc, 0xfc, 0xfb, 0xcf, 0x16, 0x33, 0xbf, 0xff, - 0xd9, 0x62, 0xe6, 0x8f, 0x3e, 0x5b, 0xcc, 0x7c, 0xff, 0x4f, 0x16, 0x4f, 0xfc, 0xfe, 0x9f, 0x2c, - 0x9e, 0xf8, 0xc3, 0x3f, 0x59, 0x3c, 0xf1, 0x41, 0xce, 0xea, 0x3a, 0x5b, 0xa3, 0xc4, 0xc2, 0xe7, - 0xe5, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x77, 0xf6, 0xb9, 0x59, 0xd3, 0x00, 0x00, + 0x5d, 0x09, 0x60, 0x2a, 0x0a, 0x31, 0xdb, 0xa2, 0x91, 0xfc, 0x50, 0x9d, 0xc4, 0x8d, 0x15, 0xe2, + 0x2e, 0xcd, 0x18, 0x0a, 0x0b, 0x12, 0xad, 0x6a, 0xa8, 0x8c, 0x3f, 0xf4, 0xd3, 0xa4, 0x93, 0x53, + 0xe8, 0x24, 0x43, 0xbe, 0xb0, 0x44, 0x38, 0xa6, 0xb5, 0x1f, 0x64, 0x7e, 0x79, 0xd5, 0xf9, 0xe0, + 0x7d, 0x78, 0x0f, 0x46, 0xb7, 0x6c, 0xcb, 0xb3, 0x3d, 0x74, 0xb7, 0x90, 0x45, 0xd7, 0x56, 0xa5, + 0x87, 0x90, 0x96, 0x89, 0x9b, 0xc7, 0x0b, 0xcb, 0x5d, 0xcf, 0xde, 0x76, 0x9e, 0xd8, 0xcd, 0xe5, + 0xad, 0xfd, 0xe5, 0x35, 0x52, 0xfa, 0x3a, 0xfb, 0x5d, 0x7e, 0x83, 0x14, 0x79, 0x53, 0x1b, 0xc7, + 0x35, 0x5d, 0x8f, 0xf1, 0x34, 0xcb, 0xd9, 0xad, 0x32, 0x40, 0xd8, 0xf4, 0x89, 0xbf, 0xf8, 0xe3, + 0xc5, 0xcc, 0x3f, 0xf8, 0x6c, 0x31, 0xf3, 0x2f, 0x3e, 0x5b, 0xcc, 0xfc, 0xfb, 0xcf, 0x16, 0x33, + 0xbf, 0xff, 0xd9, 0x62, 0xe6, 0x8f, 0x3e, 0x5b, 0xcc, 0x7c, 0xff, 0x4f, 0x16, 0x4f, 0xfc, 0xfe, + 0x9f, 0x2c, 0x9e, 0xf8, 0xc3, 0x3f, 0x59, 0x3c, 0xf1, 0x41, 0xce, 0xea, 0x3a, 0x5b, 0xa3, 0xc4, + 0xbc, 0xe7, 0xe5, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf2, 0x92, 0x33, 0x56, 0xd3, 0x00, + 0x00, } func (this *OrganizationObject) Equal(that interface{}) bool { diff --git a/pkg/apis/v1/api.pb.gw.go b/pkg/apis/v1/api.pb.gw.go index 51a95442..657c0d8a 100644 --- a/pkg/apis/v1/api.pb.gw.go +++ b/pkg/apis/v1/api.pb.gw.go @@ -5355,7 +5355,7 @@ func RegisterResourceCollectorHandlerClient(ctx context.Context, mux *runtime.Se } var ( - pattern_ResourceCollector_ResourceTypes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "getResourceType", "org_id"}, "")) + pattern_ResourceCollector_ResourceTypes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "resourceType", "org_id"}, "")) ) var ( diff --git a/pkg/apis/v1/api.proto b/pkg/apis/v1/api.proto index d114a2fa..0d9c1993 100644 --- a/pkg/apis/v1/api.proto +++ b/pkg/apis/v1/api.proto @@ -2982,7 +2982,7 @@ service ResourceCollector { // ResourceTypes api will return the list of ResourceTypes are support by px-backup for backup. rpc ResourceTypes(ResourceTypeRequest) returns (ResourceTypeResponse) { option (google.api.http) = { - get : "/v1/getResourceType/{org_id}" + get : "/v1/resourceType/{org_id}" }; } } diff --git a/pkg/apis/v1/api.swagger.json b/pkg/apis/v1/api.swagger.json index 9b8b07fe..313b4bb2 100644 --- a/pkg/apis/v1/api.swagger.json +++ b/pkg/apis/v1/api.swagger.json @@ -1245,43 +1245,6 @@ ] } }, - "/v1/getResourceType/{org_id}": { - "get": { - "summary": "ResourceTypes api will return the list of ResourceTypes are support by px-backup for backup.", - "operationId": "ResourceTypes", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/ResourceTypeResponse" - } - } - }, - "parameters": [ - { - "name": "org_id", - "in": "path", - "required": true, - "type": "string" - }, - { - "name": "cluster_ref.name", - "in": "query", - "required": false, - "type": "string" - }, - { - "name": "cluster_ref.uid", - "in": "query", - "required": false, - "type": "string" - } - ], - "tags": [ - "ResourceCollector" - ] - } - }, "/v1/health": { "get": { "summary": "Status checks the health of the server", @@ -2025,6 +1988,43 @@ ] } }, + "/v1/resourceType/{org_id}": { + "get": { + "summary": "ResourceTypes api will return the list of ResourceTypes are support by px-backup for backup.", + "operationId": "ResourceTypes", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/ResourceTypeResponse" + } + } + }, + "parameters": [ + { + "name": "org_id", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "cluster_ref.name", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "cluster_ref.uid", + "in": "query", + "required": false, + "type": "string" + } + ], + "tags": [ + "ResourceCollector" + ] + } + }, "/v1/restore": { "post": { "summary": "Creates new restore object in datastore\nIt will also trigger a restore operation on the target cluster",