Compare commits

...

1 Commits

Author SHA1 Message Date
Matt Hook
fdb462565a use go-json instead of standard/encoding or jsoniter 2023-01-25 12:31:55 +13:00
63 changed files with 116 additions and 128 deletions

View File

@@ -32,7 +32,6 @@ type Connection interface {
CreateObjectWithId(bucketName string, id int, obj interface{}) error
CreateObjectWithStringId(bucketName string, id []byte, obj interface{}) error
GetAll(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error
GetAllWithJsoniter(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error
ConvertToKey(v int) []byte
BackupMetadata() (map[string]interface{}, error)

View File

@@ -207,7 +207,7 @@ func (connection *DbConnection) GetObject(bucketName string, key []byte, object
return err
}
return connection.UnmarshalObjectWithJsoniter(data, object)
return connection.UnmarshalObject(data, object)
}
func (connection *DbConnection) getEncryptionKey() []byte {
@@ -241,7 +241,7 @@ func (connection *DbConnection) UpdateObjectFunc(bucketName string, key []byte,
return dserrors.ErrObjectNotFound
}
err := connection.UnmarshalObjectWithJsoniter(data, object)
err := connection.UnmarshalObject(data, object)
if err != nil {
return err
}
@@ -372,34 +372,12 @@ func (connection *DbConnection) GetAll(bucketName string, obj interface{}, appen
return err
}
// TODO: decide which Unmarshal to use, and use one...
func (connection *DbConnection) GetAllWithJsoniter(bucketName string, obj interface{}, append func(o interface{}) (interface{}, error)) error {
err := connection.View(func(tx *bolt.Tx) error {
bucket := tx.Bucket([]byte(bucketName))
cursor := bucket.Cursor()
for k, v := cursor.First(); k != nil; k, v = cursor.Next() {
err := connection.UnmarshalObjectWithJsoniter(v, obj)
if err != nil {
return err
}
obj, err = append(obj)
if err != nil {
return err
}
}
return nil
})
return err
}
func (connection *DbConnection) GetAllWithKeyPrefix(bucketName string, keyPrefix []byte, obj interface{}, append func(o interface{}) (interface{}, error)) error {
return connection.View(func(tx *bolt.Tx) error {
cursor := tx.Bucket([]byte(bucketName)).Cursor()
for k, v := cursor.Seek(keyPrefix); k != nil && bytes.HasPrefix(k, keyPrefix); k, v = cursor.Next() {
err := connection.UnmarshalObjectWithJsoniter(v, obj)
err := connection.UnmarshalObject(v, obj)
if err != nil {
return err
}

View File

@@ -1,9 +1,9 @@
package boltdb
import (
"encoding/json"
"time"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
bolt "go.etcd.io/bbolt"
)

View File

@@ -4,11 +4,10 @@ import (
"crypto/aes"
"crypto/cipher"
"crypto/rand"
"encoding/json"
"fmt"
"io"
jsoniter "github.com/json-iterator/go"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)
@@ -54,31 +53,6 @@ func (connection *DbConnection) UnmarshalObject(data []byte, object interface{})
return err
}
// UnmarshalObjectWithJsoniter decodes an object from binary data
// using the jsoniter library. It is mainly used to accelerate environment(endpoint)
// decoding at the moment.
func (connection *DbConnection) UnmarshalObjectWithJsoniter(data []byte, object interface{}) error {
if connection.getEncryptionKey() != nil {
var err error
data, err = decrypt(data, connection.getEncryptionKey())
if err != nil {
return err
}
}
var jsoni = jsoniter.ConfigCompatibleWithStandardLibrary
err := jsoni.Unmarshal(data, &object)
if err != nil {
if s, ok := object.(*string); ok {
*s = string(data)
return nil
}
return err
}
return nil
}
// mmm, don't have a KMS .... aes GCM seems the most likely from
// https://gist.github.com/atoponce/07d8d4c833873be2f68c34f9afc5a78a#symmetric-encryption

View File

@@ -36,7 +36,7 @@ func NewService(connection portainer.Connection) (*Service, error) {
func (service *Service) EdgeGroups() ([]portainer.EdgeGroup, error) {
var groups = make([]portainer.EdgeGroup, 0)
err := service.connection.GetAllWithJsoniter(
err := service.connection.GetAll(
BucketName,
&portainer.EdgeGroup{},
func(obj interface{}) (interface{}, error) {

View File

@@ -120,7 +120,7 @@ func (service *Service) DeleteEndpoint(ID portainer.EndpointID) error {
func (service *Service) Endpoints() ([]portainer.Endpoint, error) {
var endpoints = make([]portainer.Endpoint, 0)
err := service.connection.GetAllWithJsoniter(
err := service.connection.GetAll(
BucketName,
&portainer.Endpoint{},
func(obj interface{}) (interface{}, error) {

View File

@@ -46,7 +46,7 @@ func (service *Service) Snapshot(endpointID portainer.EndpointID) (*portainer.Sn
func (service *Service) Snapshots() ([]portainer.Snapshot, error) {
var snapshots = make([]portainer.Snapshot, 0)
err := service.connection.GetAllWithJsoniter(
err := service.connection.GetAll(
BucketName,
&portainer.Snapshot{},
func(obj interface{}) (interface{}, error) {

View File

@@ -2,7 +2,6 @@ package datastore
import (
"bytes"
"encoding/json"
"fmt"
"io"
"os"
@@ -15,6 +14,8 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/portainer/portainer/api/database/models"
"github.com/rs/zerolog/log"
"github.com/goccy/go-json"
)
// testVersion is a helper which tests current store version against wanted version

View File

@@ -1,7 +1,6 @@
package datastore
import (
"encoding/json"
"fmt"
"os"
@@ -36,6 +35,7 @@ import (
"github.com/portainer/portainer/api/dataservices/version"
"github.com/portainer/portainer/api/dataservices/webhook"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -2,7 +2,6 @@ package exec
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"os"
@@ -15,6 +14,8 @@ import (
"github.com/portainer/portainer/api/dataservices"
"github.com/portainer/portainer/api/internal/registryutils"
"github.com/portainer/portainer/api/stacks/stackutils"
"github.com/goccy/go-json"
)
// SwarmStackManager represents a service for managing stacks.

View File

@@ -2,18 +2,18 @@ package filesystem
import (
"bytes"
"encoding/json"
"encoding/pem"
"errors"
"fmt"
"io"
"os"
"path/filepath"
"strings"
"github.com/gofrs/uuid"
portainer "github.com/portainer/portainer/api"
"io"
"os"
"github.com/goccy/go-json"
)
const (

View File

@@ -3,7 +3,6 @@ package git
import (
"context"
"crypto/tls"
"encoding/json"
"fmt"
"io"
"net/http"
@@ -17,6 +16,8 @@ import (
"github.com/pkg/errors"
"github.com/portainer/portainer/api/archive"
gittypes "github.com/portainer/portainer/api/git/types"
"github.com/goccy/go-json"
)
const (

View File

@@ -21,6 +21,7 @@ require (
github.com/go-git/go-git/v5 v5.3.0
github.com/go-ldap/ldap/v3 v3.1.8
github.com/go-playground/validator/v10 v10.10.1
github.com/goccy/go-json v0.10.0
github.com/gofrs/uuid v4.0.0+incompatible
github.com/golang-jwt/jwt/v4 v4.2.0
github.com/google/go-cmp v0.5.8

View File

@@ -171,6 +171,8 @@ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/j
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig=
github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=

View File

@@ -2,12 +2,13 @@ package openamt
import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type authenticationResponse struct {

View File

@@ -2,7 +2,6 @@ package openamt
import (
"encoding/base64"
"encoding/json"
"encoding/pem"
"fmt"
"io"
@@ -11,6 +10,8 @@ import (
"strings"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type CIRAConfig struct {

View File

@@ -1,11 +1,12 @@
package openamt
import (
"encoding/json"
"fmt"
"strings"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type Device struct {

View File

@@ -1,11 +1,12 @@
package openamt
import (
"encoding/json"
"fmt"
"net/http"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type (

View File

@@ -1,11 +1,12 @@
package openamt
import (
"encoding/json"
"fmt"
"net/http"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type (

View File

@@ -1,12 +1,13 @@
package openamt
import (
"encoding/json"
"fmt"
"net/http"
"strings"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
type ActionResponse struct {

View File

@@ -1,11 +1,12 @@
package openamt
import (
"encoding/json"
"fmt"
"net/http"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
func (service *Service) enableDeviceFeatures(configuration portainer.OpenAMTConfiguration, deviceGUID string, features portainer.OpenAMTDeviceEnabledFeatures) error {

View File

@@ -3,7 +3,6 @@ package openamt
import (
"bytes"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"io"
@@ -12,6 +11,8 @@ import (
portainer "github.com/portainer/portainer/api"
"golang.org/x/sync/errgroup"
"github.com/goccy/go-json"
)
const (

View File

@@ -2,7 +2,6 @@ package client
import (
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"io"
@@ -13,6 +12,7 @@ import (
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -1,7 +1,6 @@
package customtemplates
import (
"encoding/json"
"errors"
"fmt"
"net/http"
@@ -18,6 +17,8 @@ import (
gittypes "github.com/portainer/portainer/api/git/types"
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -2,7 +2,6 @@ package edgestacks
import (
"bytes"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
@@ -20,6 +19,7 @@ import (
"github.com/portainer/portainer/api/internal/edge/edgestacks"
"github.com/portainer/portainer/api/jwt"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)

View File

@@ -1,13 +1,14 @@
package edgetemplates
import (
"encoding/json"
"net/http"
httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/http/client"
"github.com/goccy/go-json"
)
type templateFileFormat struct {

View File

@@ -2,7 +2,6 @@ package endpointedge
import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
@@ -17,6 +16,7 @@ import (
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/jwt"
"github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
)

View File

@@ -1,7 +1,6 @@
package endpoints
import (
"encoding/json"
"errors"
"fmt"
"net/http"
@@ -14,6 +13,8 @@ import (
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/http/client"
"github.com/portainer/portainer/api/internal/endpointutils"
"github.com/goccy/go-json"
)
type dockerhubStatusResponse struct {

View File

@@ -1,7 +1,6 @@
package endpoints
import (
"encoding/json"
"fmt"
"io"
"net/http"
@@ -15,6 +14,8 @@ import (
"github.com/portainer/portainer/api/internal/testhelpers"
helper "github.com/portainer/portainer/api/internal/testhelpers"
"github.com/stretchr/testify/assert"
"github.com/goccy/go-json"
)
type endpointListTest struct {

View File

@@ -2,7 +2,6 @@ package helm
import (
"bytes"
"encoding/json"
"io"
"net/http"
"net/http/httptest"
@@ -20,6 +19,8 @@ import (
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/stretchr/testify/assert"
"github.com/goccy/go-json"
)
func Test_helmInstall(t *testing.T) {

View File

@@ -1,7 +1,6 @@
package helm
import (
"encoding/json"
"io"
"net/http"
"net/http/httptest"
@@ -11,6 +10,7 @@ import (
"github.com/portainer/portainer/api/datastore"
"github.com/portainer/portainer/api/exec/exectest"
"github.com/portainer/portainer/api/http/security"
helper "github.com/portainer/portainer/api/internal/testhelpers"
"github.com/portainer/portainer/api/jwt"
"github.com/portainer/portainer/api/kubernetes"
"github.com/portainer/portainer/pkg/libhelm/binary/test"
@@ -18,7 +18,7 @@ import (
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/stretchr/testify/assert"
helper "github.com/portainer/portainer/api/internal/testhelpers"
"github.com/goccy/go-json"
)
func Test_helmList(t *testing.T) {

View File

@@ -2,7 +2,6 @@ package openamt
import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
@@ -20,6 +19,7 @@ import (
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -1,7 +1,6 @@
package motd
import (
"encoding/json"
"net/http"
"strings"
@@ -9,6 +8,8 @@ import (
"github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/http/client"
"github.com/goccy/go-json"
)
type motdResponse struct {

View File

@@ -1,7 +1,6 @@
package system
import (
"encoding/json"
"net/http"
"github.com/portainer/libhttp/response"
@@ -11,6 +10,8 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/rs/zerolog/log"
"github.com/goccy/go-json"
)
type versionResponse struct {

View File

@@ -1,7 +1,6 @@
package teams
import (
"encoding/json"
"fmt"
"io"
"net/http"
@@ -16,6 +15,8 @@ import (
"github.com/portainer/portainer/api/internal/authorization"
"github.com/portainer/portainer/api/jwt"
"github.com/stretchr/testify/assert"
"github.com/goccy/go-json"
)
func Test_teamList(t *testing.T) {

View File

@@ -1,7 +1,6 @@
package templates
import (
"encoding/json"
"errors"
"net/http"
@@ -11,6 +10,7 @@ import (
"github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -2,7 +2,6 @@ package users
import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
@@ -15,6 +14,8 @@ import (
"github.com/portainer/portainer/api/datastore"
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/jwt"
"github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
)

View File

@@ -1,7 +1,6 @@
package users
import (
"encoding/json"
"fmt"
"io"
"net/http"
@@ -14,6 +13,8 @@ import (
"github.com/portainer/portainer/api/datastore"
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/jwt"
"github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
)

View File

@@ -1,7 +1,6 @@
package users
import (
"encoding/json"
"fmt"
"io"
"net/http"
@@ -17,6 +16,8 @@ import (
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/portainer/portainer/api/jwt"
"github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
)

View File

@@ -2,7 +2,6 @@ package websocket
import (
"bytes"
"encoding/json"
"net"
"net/http"
"net/http/httputil"
@@ -13,6 +12,7 @@ import (
portainer "github.com/portainer/portainer/api"
"github.com/asaskevich/govalidator"
"github.com/goccy/go-json"
"github.com/gorilla/websocket"
)

View File

@@ -2,7 +2,6 @@ package docker
import (
"bytes"
"encoding/json"
"errors"
"io"
"mime"
@@ -10,6 +9,7 @@ import (
"github.com/portainer/portainer/api/archive"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -3,7 +3,6 @@ package docker
import (
"bytes"
"context"
"encoding/json"
"errors"
"io"
"net/http"
@@ -14,6 +13,8 @@ import (
"github.com/portainer/portainer/api/http/proxy/factory/utils"
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/goccy/go-json"
)
const (

View File

@@ -3,7 +3,6 @@ package docker
import (
"bytes"
"context"
"encoding/json"
"errors"
"io"
"net/http"
@@ -14,6 +13,8 @@ import (
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/http/proxy/factory/utils"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/goccy/go-json"
)
const (

View File

@@ -3,7 +3,6 @@ package docker
import (
"bytes"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"io"
@@ -21,6 +20,7 @@ import (
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/goccy/go-json"
"github.com/rs/zerolog/log"
)

View File

@@ -2,7 +2,6 @@ package kubernetes
import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
@@ -16,6 +15,7 @@ import (
"github.com/portainer/portainer/api/http/security"
"github.com/portainer/portainer/api/kubernetes/cli"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)

View File

@@ -2,12 +2,12 @@ package utils
import (
"compress/gzip"
"encoding/json"
"errors"
"fmt"
"io"
"mime"
"github.com/goccy/go-json"
"gopkg.in/yaml.v3"
)

View File

@@ -1,10 +1,10 @@
package maps
import (
"encoding/json"
"fmt"
"testing"
"github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
)

View File

@@ -2,8 +2,8 @@ package registryutils
import (
"encoding/base64"
"encoding/json"
"github.com/goccy/go-json"
portainer "github.com/portainer/portainer/api"
)

View File

@@ -2,10 +2,11 @@ package cli
import (
"context"
"encoding/json"
"github.com/pkg/errors"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
"github.com/pkg/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

View File

@@ -2,9 +2,10 @@ package cli
import (
"context"
"encoding/json"
models "github.com/portainer/portainer/api/http/models/kubernetes"
"github.com/goccy/go-json"
)
func (kcl *KubeClient) GetMetrics() (models.K8sMetrics, error) {

View File

@@ -2,12 +2,13 @@ package cli
import (
"context"
"encoding/json"
"fmt"
"strconv"
"github.com/pkg/errors"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"github.com/portainer/portainer/api/internal/registryutils"
v1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"

View File

@@ -2,7 +2,6 @@ package oauth
import (
"context"
"encoding/json"
"io"
"mime"
"net/http"
@@ -11,6 +10,7 @@ import (
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
"github.com/golang-jwt/jwt/v4"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"

View File

@@ -1,7 +1,6 @@
package oauthtest
import (
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
@@ -9,6 +8,8 @@ import (
"github.com/gorilla/mux"
portainer "github.com/portainer/portainer/api"
"github.com/goccy/go-json"
)
const (

View File

@@ -1,11 +1,11 @@
package binary
import (
"encoding/json"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)
// Install runs `helm install` with specified install options.

View File

@@ -1,11 +1,11 @@
package binary
import (
"encoding/json"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)
// List runs `helm list --output json --filter <filter> --selector <selector> --namespace <namespace>` with specified list options.

View File

@@ -4,15 +4,16 @@ package binary
// The functionality does not rely on the implementation of `HelmPackageManager`
import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"path"
"time"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
)

View File

@@ -1,13 +1,14 @@
package test
import (
"encoding/json"
"strings"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
)

View File

@@ -17,9 +17,10 @@ limitations under the License.
package time
import (
"encoding/json"
"testing"
"time"
"github.com/goccy/go-json"
)
var (

View File

@@ -1,11 +1,11 @@
package binary
import (
"encoding/json"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)
// Install runs `helm install` with specified install options.

View File

@@ -1,11 +1,11 @@
package binary
import (
"encoding/json"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
)
// List runs `helm list --output json --filter <filter> --selector <selector> --namespace <namespace>` with specified list options.

View File

@@ -4,15 +4,16 @@ package binary
// The functionality does not rely on the implementation of `HelmPackageManager`
import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"path"
"time"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
)

View File

@@ -1,13 +1,14 @@
package test
import (
"encoding/json"
"strings"
"github.com/pkg/errors"
"github.com/portainer/portainer/pkg/libhelm"
"github.com/portainer/portainer/pkg/libhelm/options"
"github.com/portainer/portainer/pkg/libhelm/release"
"github.com/goccy/go-json"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
)

View File

@@ -17,9 +17,10 @@ limitations under the License.
package time
import (
"encoding/json"
"testing"
"time"
"github.com/goccy/go-json"
)
var (