diff --git a/clients/http/utils/common.go b/clients/http/utils/common.go index 5f2a155f..a43d8eb6 100644 --- a/clients/http/utils/common.go +++ b/clients/http/utils/common.go @@ -1,5 +1,5 @@ // -// Copyright (C) 2020-2021 IOTech Ltd +// Copyright (C) 2020-2022 IOTech Ltd // // SPDX-License-Identifier: Apache-2.0 @@ -15,6 +15,7 @@ import ( "mime/multipart" "net/http" "net/url" + "path" "path/filepath" "github.com/edgexfoundry/go-mod-core-contracts/v2/common" @@ -70,7 +71,7 @@ func createRequest(ctx context.Context, httpMethod string, baseUrl string, reque if err != nil { return nil, errors.NewCommonEdgeX(errors.KindServerError, "fail to parse baseUrl", err) } - u.Path = requestPath + u.Path = path.Join(u.Path, requestPath) if requestParams != nil { u.RawQuery = requestParams.Encode() } @@ -87,7 +88,7 @@ func createRequestWithRawDataAndParams(ctx context.Context, httpMethod string, b if err != nil { return nil, errors.NewCommonEdgeX(errors.KindServerError, "fail to parse baseUrl", err) } - u.Path = requestPath + u.Path = path.Join(u.Path, requestPath) if requestParams != nil { u.RawQuery = requestParams.Encode() } @@ -115,7 +116,7 @@ func createRequestWithRawData(ctx context.Context, httpMethod string, baseUrl st if err != nil { return nil, errors.NewCommonEdgeX(errors.KindServerError, "fail to parse baseUrl", err) } - u.Path = requestPath + u.Path = path.Join(u.Path, requestPath) if requestParams != nil { u.RawQuery = requestParams.Encode() } @@ -144,7 +145,7 @@ func createRequestWithEncodedData(ctx context.Context, httpMethod string, baseUr if err != nil { return nil, errors.NewCommonEdgeX(errors.KindServerError, "fail to parse baseUrl", err) } - u.Path = requestPath + u.Path = path.Join(u.Path, requestPath) content := encoding if content == "" { @@ -166,7 +167,7 @@ func createRequestFromFilePath(ctx context.Context, httpMethod string, baseUrl s if err != nil { return nil, errors.NewCommonEdgeX(errors.KindServerError, "fail to parse baseUrl", err) } - u.Path = requestPath + u.Path = path.Join(u.Path, requestPath) fileContents, err := ioutil.ReadFile(filePath) if err != nil {