Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions api/helm-app/HelmAppService.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ import (
"context"
"errors"
"fmt"
"net/http"
"reflect"
"strconv"
"strings"
"time"

"github.com/caarlos0/env/v6"
"github.com/devtron-labs/devtron/api/connector"
openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
Expand All @@ -23,17 +29,12 @@ import (
util2 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/rbac"
jsonpatch "github.com/evanphx/json-patch"
"github.com/ghodss/yaml"
"github.com/gogo/protobuf/proto"
"github.com/tidwall/gjson"
"github.com/tidwall/sjson"
"go.opentelemetry.io/otel"
"go.uber.org/zap"
"net/http"
"reflect"
"strconv"
"strings"
"time"
"sigs.k8s.io/yaml"
)

type HelmAppService interface {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ require (
github.com/devtron-labs/common-lib v0.0.0-20230407072229-d4f665f5ca12
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-pg/pg v6.15.1+incompatible
github.com/go-resty/resty/v2 v2.7.0
github.com/gogo/protobuf v1.3.2
Expand Down Expand Up @@ -122,6 +121,7 @@ require (
github.com/fatih/camelcase v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fvbommel/sortorder v1.0.1 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
Expand Down
20 changes: 10 additions & 10 deletions internal/util/ChartService.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,7 @@ import (
"compress/gzip"
"context"
"fmt"
"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/internal/sql/repository"
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
//appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
repository2 "github.com/devtron-labs/devtron/pkg/user/repository"
"github.com/devtron-labs/devtron/util"
"github.com/go-pg/pg"
"go.opentelemetry.io/otel"

"io/ioutil"
"math/rand"
"net/http"
Expand All @@ -40,11 +32,19 @@ import (
"strings"
"time"

"github.com/ghodss/yaml"
"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/internal/sql/repository"
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
repository2 "github.com/devtron-labs/devtron/pkg/user/repository"
"github.com/devtron-labs/devtron/util"
"github.com/go-pg/pg"
dirCopy "github.com/otiai10/copy"
"go.opentelemetry.io/otel"
"go.uber.org/zap"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/proto/hapi/chart"
"sigs.k8s.io/yaml"
)

type ChartWorkingDir string
Expand Down
13 changes: 7 additions & 6 deletions internal/util/K8sUtil.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ import (
error2 "errors"
"flag"
"fmt"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/version"
"net/http"
"os/user"
"path/filepath"
"strings"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/kube"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/version"

"github.com/devtron-labs/authenticator/client"
"github.com/ghodss/yaml"
"go.uber.org/zap"
batchV1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
Expand All @@ -47,6 +47,7 @@ import (
v12 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/yaml"
)

type K8sUtil struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import (
"context"
"encoding/json"
"fmt"
"path"
"regexp"
"time"

"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/argocdServer"
repository3 "github.com/devtron-labs/devtron/internal/sql/repository"
Expand All @@ -36,20 +40,17 @@ import (
util3 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/argo"
"github.com/go-pg/pg"
"path"
"regexp"
"time"

"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
repository2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
application2 "github.com/devtron-labs/devtron/client/argocdServer/application"
"github.com/devtron-labs/devtron/client/argocdServer/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/ghodss/yaml"
"go.uber.org/zap"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/proto/hapi/chart"
"sigs.k8s.io/yaml"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package appStoreDeploymentTool
import (
"context"
"errors"
"net/http"
"time"

client "github.com/devtron-labs/devtron/api/helm-app"
openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
"github.com/devtron-labs/devtron/internal/constants"
Expand All @@ -12,12 +15,10 @@ import (
"github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
appStoreDiscoverRepository "github.com/devtron-labs/devtron/pkg/appStore/discover/repository"
clusterRepository "github.com/devtron-labs/devtron/pkg/cluster/repository"
"github.com/ghodss/yaml"
"github.com/go-pg/pg"
"go.opentelemetry.io/otel"
"go.uber.org/zap"
"net/http"
"time"
"sigs.k8s.io/yaml"
)

type AppStoreDeploymentHelmService interface {
Expand Down
3 changes: 2 additions & 1 deletion pkg/chart/ChartService.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"context"
"encoding/json"
"fmt"

"go.opentelemetry.io/otel"

"github.com/devtron-labs/devtron/internal/constants"
Expand Down Expand Up @@ -54,13 +55,13 @@ import (
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/internal/util"
util2 "github.com/devtron-labs/devtron/util"
"github.com/ghodss/yaml"
"github.com/go-pg/pg"
"github.com/juju/errors"
"github.com/xeipuuv/gojsonschema"
"go.uber.org/zap"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/proto/hapi/chart"
"sigs.k8s.io/yaml"
)

type TemplateRequest struct {
Expand Down
15 changes: 8 additions & 7 deletions pkg/chartRepo/ChartRepositoryService.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,27 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"strings"
"time"

"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
"github.com/devtron-labs/devtron/pkg/cluster"
serverEnvConfig "github.com/devtron-labs/devtron/pkg/server/config"
"github.com/devtron-labs/devtron/pkg/sql"
util2 "github.com/devtron-labs/devtron/pkg/util"
"github.com/ghodss/yaml"
"github.com/google/uuid"
"go.uber.org/zap"
"io"
"io/ioutil"
"k8s.io/helm/pkg/getter"
"k8s.io/helm/pkg/helm/environment"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/version"
"net/http"
"net/url"
"strings"
"time"
"sigs.k8s.io/yaml"
)

// secret keys
Expand Down
5 changes: 3 additions & 2 deletions pkg/chartRepo/ChartRepositoryService_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package chartRepo

import (
"encoding/json"
"testing"

"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"testing"
"sigs.k8s.io/yaml"
)

type ChartRepositoryServiceMock struct {
Expand Down
12 changes: 6 additions & 6 deletions pkg/gitops/GitOpsConfigService.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ import (
"context"
"encoding/json"
"fmt"
cluster3 "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
cluster2 "github.com/devtron-labs/devtron/client/argocdServer/cluster"
"github.com/devtron-labs/devtron/pkg/sql"
util3 "github.com/devtron-labs/devtron/pkg/util"
"github.com/devtron-labs/devtron/util/argo"
"math/rand"
"net/http"
"net/url"
Expand All @@ -35,18 +30,23 @@ import (
"strings"
"time"

cluster3 "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
bean2 "github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/argocdServer"
cluster2 "github.com/devtron-labs/devtron/client/argocdServer/cluster"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/cluster"
"github.com/devtron-labs/devtron/pkg/sql"
util3 "github.com/devtron-labs/devtron/pkg/util"
util2 "github.com/devtron-labs/devtron/util"
"github.com/ghodss/yaml"
"github.com/devtron-labs/devtron/util/argo"
"github.com/go-pg/pg"
"github.com/microsoft/azure-devops-go-api/azuredevops"
"github.com/xanzy/go-gitlab"
"go.uber.org/zap"
"k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/yaml"
)

type GitOpsConfigService interface {
Expand Down
5 changes: 3 additions & 2 deletions pkg/sso/SSOLoginService.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ package sso
import (
"encoding/json"
"fmt"
"time"

"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/auth"
util2 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/argo"
"github.com/ghodss/yaml"
"github.com/go-pg/pg"
"go.uber.org/zap"
"time"
"sigs.k8s.io/yaml"
)

type SSOLoginService interface {
Expand Down