Skip to content

Commit

Permalink
feat: minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
ReuDa committed May 4, 2023
1 parent 2794b8e commit 14b679f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 36 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

A [Steadybit](https://www.steadybit.com/) extension to execute [Postman](https://www.postman.com/) collections via Postman Cloud Api.

:warning: The Postman extension is currently bundled in the out-of-the-box version of steadybit. This code should help you to understand the usage
of [Action kit](https://github.com/steadybit/action-kit).

## Prerequisites

- A Postman account with a
Expand Down
2 changes: 1 addition & 1 deletion charts/steadybit-extension-postman/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: steadybit-extension-postman
description: Steadybit Postman extension Helm chart for Kubernetes.
version: 1.6.8
version: 1.6.9
appVersion: latest
home: https://www.steadybit.com/
icon: https://steadybit-website-assets.s3.amazonaws.com/logo-symbol-transparent.png
Expand Down
11 changes: 5 additions & 6 deletions extpostman/action_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/steadybit/extension-kit/extbuild"
"github.com/steadybit/extension-kit/extcmd"
"github.com/steadybit/extension-kit/extconversion"
"github.com/steadybit/extension-kit/extfile"
"github.com/steadybit/extension-kit/extutil"
"github.com/steadybit/extension-postman/utils"
"os"
"os/exec"
"strings"
Expand Down Expand Up @@ -155,9 +155,8 @@ func (f PostmanAction) Describe() action_kit_api.ActionDescription {

func (f PostmanAction) Prepare(_ context.Context, state *PostmanState, request action_kit_api.PrepareActionRequestBody) (*action_kit_api.PrepareResult, error) {
var config PostmanConfig
err := extconversion.Convert(request.Config, &config)
if err != nil {
return nil, err
if err := extconversion.Convert(request.Config, &config); err != nil {
return nil, extension_kit.ToError("Failed to unmarshal the config.", err)
}

state.Timestamp = time.Now().Format(time.RFC3339)
Expand Down Expand Up @@ -310,7 +309,7 @@ func (f PostmanAction) Stop(_ context.Context, state *PostmanState) (*action_kit
_, err = os.Stat(fmt.Sprintf(ResultSummaryFileName, timestamp))

if err == nil { // file exists
summaryFileContent, err = utils.File2Base64(fmt.Sprintf(ResultSummaryFileName, timestamp))
summaryFileContent, err = extfile.File2Base64(fmt.Sprintf(ResultSummaryFileName, timestamp))
if err != nil {
return nil, extutil.Ptr(extension_kit.ToError("Failed to open summaryFileContent file", err))
}
Expand All @@ -325,7 +324,7 @@ func (f PostmanAction) Stop(_ context.Context, state *PostmanState) (*action_kit
_, err = os.Stat(fmt.Sprintf(ResultFileName, timestamp))

if err == nil { // file exists
htmlResultFileContent, err = utils.File2Base64(fmt.Sprintf(ResultFileName, timestamp))
htmlResultFileContent, err = extfile.File2Base64(fmt.Sprintf(ResultFileName, timestamp))
if err != nil {
return nil, extutil.Ptr(extension_kit.ToError("Failed to open htmlResultFileContent file", err))
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/rs/zerolog v1.29.1
github.com/steadybit/action-kit/go/action_kit_api/v2 v2.5.1
github.com/steadybit/action-kit/go/action_kit_sdk v1.0.2
github.com/steadybit/extension-kit v1.7.14
github.com/steadybit/extension-kit v1.7.16
github.com/stretchr/testify v1.8.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ github.com/steadybit/action-kit/go/action_kit_api/v2 v2.5.1 h1:gW6IttJ33Tu/ynn2c
github.com/steadybit/action-kit/go/action_kit_api/v2 v2.5.1/go.mod h1:4yGr/DzsHpw6elju1XHCeUsY/qoqNTcLY3ytgnNcMt8=
github.com/steadybit/action-kit/go/action_kit_sdk v1.0.2 h1:pYpKm1BaRY296OH56oMXTfUQjEJLwE2e6ESxRoBuyME=
github.com/steadybit/action-kit/go/action_kit_sdk v1.0.2/go.mod h1:mTMPHv8eCORj2cVHL3BMDEcUlU86A0mRyaCNsVi25AQ=
github.com/steadybit/extension-kit v1.7.14 h1:PTeg0AgU9gmt/a+tmPFducxRITOk0Bx0HEZHyXlvSO4=
github.com/steadybit/extension-kit v1.7.14/go.mod h1:zC5Tw+wrJTx4xvOlsIY+MfMoRYoglj83vR15Xr3aP5c=
github.com/steadybit/extension-kit v1.7.16 h1:AhXzBLhCYaptxhICURH0pXa8vTTI7DwdjWlEjzmuA70=
github.com/steadybit/extension-kit v1.7.16/go.mod h1:zC5Tw+wrJTx4xvOlsIY+MfMoRYoglj83vR15Xr3aP5c=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
Expand Down
23 changes: 0 additions & 23 deletions utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,6 @@

package utils

import (
"bytes"
"encoding/base64"
"io"
"os"
)

func RemoveAtIndex[T any](s []T, index int) []T {
return append(s[:index], s[index+1:]...)
}

func File2Base64(file string) (string, error) {
f, err := os.Open(file)
if err != nil {
return "", err
}
defer f.Close()

var buffer bytes.Buffer
_, err = io.Copy(&buffer, f)
if err != nil {
return "", err
}

return base64.StdEncoding.EncodeToString(buffer.Bytes()), nil
}

0 comments on commit 14b679f

Please sign in to comment.