soharab-icandGitHub
8de5a5b0f3
* Fix storage leak in builder ``` builder pod keeps old src and deployment packages irrespective of build status. delete src package after every build request is completed. delete deployment package after package is uploaded. ``` * Optimized src/deploy cleanup pkg code * Fix high severity security issue * Add a test for builder's Clean API * Resolve review comments --------- Signed-off-by: Md Soharab Ansari <soharab.ansari@infracloud.io>
121 lines
3.2 KiB
Go
121 lines
3.2 KiB
Go
/*
|
|
Copyright 2016 The Fission Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-retryablehttp"
|
|
"github.com/pkg/errors"
|
|
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
|
"go.uber.org/zap"
|
|
"golang.org/x/net/context/ctxhttp"
|
|
|
|
"github.com/fission/fission/pkg/builder"
|
|
ferror "github.com/fission/fission/pkg/error"
|
|
otelUtils "github.com/fission/fission/pkg/utils/otel"
|
|
)
|
|
|
|
type (
|
|
ClientInterface interface {
|
|
Build(context.Context, *builder.PackageBuildRequest) (*builder.PackageBuildResponse, error)
|
|
Clean(context.Context, string) error
|
|
}
|
|
|
|
client struct {
|
|
logger *zap.Logger
|
|
url string
|
|
httpClient *retryablehttp.Client
|
|
}
|
|
)
|
|
|
|
func MakeClient(logger *zap.Logger, builderUrl string) ClientInterface {
|
|
hc := retryablehttp.NewClient()
|
|
hc.ErrorHandler = retryablehttp.PassthroughErrorHandler
|
|
hc.HTTPClient.Transport = otelhttp.NewTransport(hc.HTTPClient.Transport)
|
|
return &client{
|
|
logger: logger.Named("builder_client"),
|
|
url: strings.TrimSuffix(builderUrl, "/"),
|
|
httpClient: hc,
|
|
}
|
|
}
|
|
|
|
func (c *client) getCleanUrl(srcPkgFilename string) string {
|
|
return c.url + "/clean" + "?name=" + srcPkgFilename
|
|
}
|
|
|
|
func (c *client) Build(ctx context.Context, req *builder.PackageBuildRequest) (*builder.PackageBuildResponse, error) {
|
|
logger := otelUtils.LoggerWithTraceID(ctx, c.logger)
|
|
|
|
body, err := json.Marshal(req)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "error marshaling json")
|
|
}
|
|
|
|
resp, err := ctxhttp.Post(ctx, c.httpClient.StandardClient(), c.url, "application/json", bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
rBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
logger.Error("error reading resp body", zap.Error(err))
|
|
return nil, err
|
|
}
|
|
|
|
pkgBuildResp := builder.PackageBuildResponse{}
|
|
err = json.Unmarshal(rBody, &pkgBuildResp)
|
|
if err != nil {
|
|
logger.Error("error parsing resp body", zap.Error(err))
|
|
return nil, err
|
|
}
|
|
|
|
return &pkgBuildResp, ferror.MakeErrorFromHTTP(resp)
|
|
}
|
|
|
|
func (c *client) Clean(ctx context.Context, srcPkgFilename string) error {
|
|
logger := otelUtils.LoggerWithTraceID(ctx, c.logger)
|
|
|
|
req, err := http.NewRequest(http.MethodDelete, c.getCleanUrl(srcPkgFilename), http.NoBody)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to create http request for clean api")
|
|
}
|
|
|
|
resp, err := ctxhttp.Do(ctx, c.httpClient.StandardClient(), req)
|
|
if err != nil {
|
|
logger.Error("error sending clean request", zap.Error(err))
|
|
return err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode == http.StatusMethodNotAllowed {
|
|
return nil
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return ferror.MakeErrorFromHTTP(resp)
|
|
}
|
|
|
|
return nil
|
|
}
|