Skip to content

Commit

Permalink
review comments
Browse files Browse the repository at this point in the history 
Signed-off-by: vviveksharma <[email protected]>
  • Loading branch information
@vviveksharma
vviveksharma committed Jul 23, 2024
1 parent a7385f2 commit e24182e
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 46 deletions.
24 changes: 12 additions & 12 deletions clients/omnitruck/platform_services.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ func (r *PlatformServices) PlatformVersionsAll(req *RequestParams, serverMode in
}
requestParams := ValidateRequest(req, flags)
if !requestParams.Ok {
r.Logger.Error("", requestParams.Message)
r.Logger.Error(validating_log, requestParams.Message)
return productVersions, fiber.NewError(requestParams.Code, requestParams.Message)
}
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE {
productVersions = append(productVersions, "latest")
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE_PRODUCT {
productVersions = append(productVersions, constants.LATEST)
return productVersions, nil
}
return productVersions, fiber.NewError(fiber.StatusBadRequest, constants.PLATFORM_ERROR)
Expand All @@ -39,11 +39,11 @@ func (r *PlatformServices) PlatformVersionLatest(req *RequestParams, serverMode
}
requestParams := ValidateRequest(req, flags)
if !requestParams.Ok {
r.Logger.Error("", requestParams.Message)
r.Logger.Error(validating_log, requestParams.Message)
return "", fiber.NewError(requestParams.Code, requestParams.Message)
}
if serverMode == 2 {
return "latest", nil
return constants.LATEST, nil
}
return "", fiber.NewError(fiber.StatusBadRequest, constants.PLATFORM_ERROR)
}
Expand All @@ -54,10 +54,10 @@ func (r *PlatformServices) PlatformMetadata(req *RequestParams, serverMode int)
}
requestParams := ValidateRequest(req, flags)
if !requestParams.Ok {
r.Logger.Error("", requestParams.Message)
r.Logger.Error(validating_log, requestParams.Message)
return PackageMetadata{}, fiber.NewError(requestParams.Code, requestParams.Message)
}
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE {
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE_PRODUCT {
return PackageMetadata{
Sha1: "",
Sha256: "",
Expand All @@ -75,13 +75,13 @@ func (r *PlatformServices) PlatformPackages(req *RequestParams, serverMode int)
}
requestParams := ValidateRequest(req, flags)
if !requestParams.Ok {
r.Logger.Error("", requestParams.Message)
r.Logger.Error(validating_log, requestParams.Message)
return PackageList{}, fiber.NewError(requestParams.Code, requestParams.Message)
}
if req.Version == "" {
req.Version = "latest"
req.Version = constants.LATEST
}
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE {
if serverMode == 2 && req.Product == constants.PLATFORM_SERVICE_PRODUCT {
packageList["linux"] = PlatformVersionList{}
packageList["linux"]["pv"] = ArchList{}
packageList["linux"]["pv"]["amd64"] = PackageMetadata{
Expand All @@ -101,11 +101,11 @@ func (r *PlatformServices) PlatformFilename(req *RequestParams, serverMode int)
}
requestParams := ValidateRequest(req, flags)
if !requestParams.Ok {
r.Logger.Error("", requestParams.Message)
r.Logger.Error(validating_log, requestParams.Message)
return "", fiber.NewError(requestParams.Code, requestParams.Message)
}
if serverMode == 2 {
return constants.PLATFORM_SERVICE + ".zip", nil
return constants.PLATFORM_SERVICE_PRODUCT + ".zip", nil
}
return "", fiber.NewError(fiber.StatusBadRequest, constants.PLATFORM_ERROR)
}
20 changes: 10 additions & 10 deletions constants/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package constants

const (
SKU_PARTITION_KEY = "bom"
PRODUCT_PARTITION_KEY = "product"
PRODUCT_SORT_KEY = "version"
AUTOMATE_PRODUCT = "automate"
HABITAT_PRODUCT = "habitat"
LATEST = "latest"
PLATFORM_SERVICE = "chef-360"
PLATFORM_ERROR = "chef-360 not available for the trial and opensource "
SKU_PARTITION_KEY = "bom"
PRODUCT_PARTITION_KEY = "product"
PRODUCT_SORT_KEY = "version"
AUTOMATE_PRODUCT = "automate"
HABITAT_PRODUCT = "habitat"
LATEST = "latest"
PLATFORM_SERVICE_PRODUCT = "chef-360"
PLATFORM_ERROR = "chef-360 not available for the trial and opensource"
)

const (
UNMARSHAL_ERR_MSG = "error on unmarshal.\n[ERROR] -"
SuccessResponseFromFilenameLog = "Returning success response from fileName API for "
UNMARSHAL_ERR_MSG = "error on unmarshal.\n[ERROR] -"
SUCCESS_RESPONSE_FROM_FILENAME_MSG = "Returning success response from fileName API for "
)
48 changes: 24 additions & 24 deletions services/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (server *ApiService) productsHandler(c *fiber.Ctx) error {
}

if server.Mode == Commercial {
data = append(data, constants.PLATFORM_SERVICE)
data = append(data, constants.PLATFORM_SERVICE_PRODUCT)
}

if request.Ok {
Expand Down Expand Up @@ -188,7 +188,7 @@ func (server *ApiService) fetchLatestVersion(params *omnitruck.RequestParams, c
request.Success()
return data, &request
}
} else if params.Product == constants.PLATFORM_SERVICE {
} else if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
request := clients.Request{}
data, err := server.PlatformServices(c).PlatformVersionLatest(params, int(server.Mode))
if err != nil {
Expand All @@ -210,7 +210,7 @@ func (server *ApiService) fetchLatestVersion(params *omnitruck.RequestParams, c
// Then we can return the latest OS version
func (server *ApiService) fetchLatestOSVersion(params *omnitruck.RequestParams, c *fiber.Ctx) (omnitruck.ProductVersion, *clients.Request) {
var data []omnitruck.ProductVersion
if params.Product == constants.PLATFORM_SERVICE {
if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
request := clients.Request{}
data, err := server.PlatformServices(c).PlatformVersionLatest(params, int(server.Mode))
if err != nil {
Expand Down Expand Up @@ -273,7 +273,7 @@ func (server *ApiService) productVersionsHandler(c *fiber.Ctx) error {

if params.Product == constants.AUTOMATE_PRODUCT || params.Product == constants.HABITAT_PRODUCT {
return server.createDynamoServiceResponse(params, c)
} else if params.Product == constants.PLATFORM_SERVICE {
} else if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
versions, err := server.PlatformServices(c).PlatformVersionsAll(params, int(server.Mode))
if err != nil {
code, msg := getErrorCodeAndMsg(err)
Expand Down Expand Up @@ -316,23 +316,23 @@ func (server *ApiService) productVersionsHandler(c *fiber.Ctx) error {

func (server *ApiService) createDynamoServiceResponse(params *omnitruck.RequestParams, c *fiber.Ctx) error {
data, err := server.DynamoServices(server.DatabaseService, c).VersionAll(params)
if err != nil {
code, msg := getErrorCodeAndMsg(err)
return server.SendErrorResponse(c, code, msg)
}
if err != nil {
code, msg := getErrorCodeAndMsg(err)
return server.SendErrorResponse(c, code, msg)
}

if params.Product == "habitat" && server.Mode == Opensource {
data = omnitruck.FilterList(data, func(v omnitruck.ProductVersion) bool {
return !omnitruck.OsProductVersion(params.Product, v)
})
}
if server.Mode == Trial {
data = []omnitruck.ProductVersion{
data[len(data)-1],
}
if params.Product == "habitat" && server.Mode == Opensource {
data = omnitruck.FilterList(data, func(v omnitruck.ProductVersion) bool {
return !omnitruck.OsProductVersion(params.Product, v)
})
}
if server.Mode == Trial {
data = []omnitruck.ProductVersion{
data[len(data)-1],
}
}

return server.SendResponse(c, &data)
return server.SendResponse(c, &data)
}

// @description Get the full list of all packages for a particular channel and product combination.
Expand All @@ -354,7 +354,7 @@ func (server *ApiService) productPackagesHandler(c *fiber.Ctx) error {
return err
}

if params.Product == constants.PLATFORM_SERVICE {
if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
data, err = server.PlatformServices(c).PlatformPackages(params, int(server.Mode))
if err != nil {
code, msg := getErrorCodeAndMsg(err)
Expand Down Expand Up @@ -441,7 +441,7 @@ func (server *ApiService) productMetadataHandler(c *fiber.Ctx) error {
return err
}

if params.Product == constants.PLATFORM_SERVICE {
if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
request = &clients.Request{}
data, err = server.PlatformServices(c).PlatformMetadata(params, int(server.Mode))
if err != nil {
Expand Down Expand Up @@ -597,7 +597,7 @@ func (server *ApiService) fileNameHandler(c *fiber.Ctx) error {
return err
}

if params.Product == constants.PLATFORM_SERVICE {
if params.Product == constants.PLATFORM_SERVICE_PRODUCT {
fileName, err := server.PlatformServices(c).PlatformFilename(params, int(server.Mode))
if err != nil {
code, msg := getErrorCodeAndMsg(err)
Expand All @@ -607,7 +607,7 @@ func (server *ApiService) fileNameHandler(c *fiber.Ctx) error {
response := map[string]interface{}{
"fileName": fileName,
}
server.logCtx(c).Info(constants.SuccessResponseFromFilenameLog + params.Product)
server.logCtx(c).Info(constants.SUCCESS_RESPONSE_FROM_FILENAME_MSG + params.Product)
return server.SendResponse(c, response)
}

Expand All @@ -630,7 +630,7 @@ func (server *ApiService) fileNameHandler(c *fiber.Ctx) error {
response := map[string]interface{}{
"fileName": fileName,
}
server.logCtx(c).Info(constants.SuccessResponseFromFilenameLog + params.Product)
server.logCtx(c).Info(constants.SUCCESS_RESPONSE_FROM_FILENAME_MSG + params.Product)
return server.SendResponse(c, response)

} else {
Expand All @@ -643,7 +643,7 @@ func (server *ApiService) fileNameHandler(c *fiber.Ctx) error {
response := map[string]interface{}{
"fileName": fileName,
}
server.logCtx(c).Info(constants.SuccessResponseFromFilenameLog + params.Product)
server.logCtx(c).Info(constants.SUCCESS_RESPONSE_FROM_FILENAME_MSG + params.Product)
return server.SendResponse(c, response)
} else {
return server.SendError(c, request)
Expand Down

0 comments on commit e24182e

Please sign in to comment.