Skip to content

Commit e082b02

Browse files
Ash-expAsh-exp
committed
Merge remote-tracking branch 'origin/feat-gitops-client-refactoring' into feat-resource-tree-support
2 parents e37f8e4 + f0f8364 commit e082b02

File tree

221 files changed

+11903
-2661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+11903
-2661
lines changed

‎api/bean/gitOps/GitOpsConfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ func IsGitOpsRepoNotConfigured(gitRepoUrl string) bool {
8585
}
8686

8787
func IsGitOpsRepoConfigured(gitRepoUrl string) bool {
88-
return len(gitRepoUrl) != 0 || gitRepoUrl != GIT_REPO_NOT_CONFIGURED
88+
return !IsGitOpsRepoNotConfigured(gitRepoUrl)
8989
}

‎api/helm-app/HelmAppRestHandler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
2727
"github.com/devtron-labs/devtron/pkg/argoApplication"
2828
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
29+
clusterBean "github.com/devtron-labs/devtron/pkg/cluster/bean"
2930
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
3031
"github.com/devtron-labs/devtron/pkg/fluxApplication"
3132
bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
@@ -467,7 +468,7 @@ func (handler *HelmAppRestHandlerImpl) DeleteApplication(w http.ResponseWriter,
467468
// validate if the devtron-operator helm release, block that for deletion
468469
if appIdentifier.ReleaseName == handler.serverEnvConfig.DevtronHelmReleaseName &&
469470
appIdentifier.Namespace == handler.serverEnvConfig.DevtronHelmReleaseNamespace &&
470-
appIdentifier.ClusterId == bean.DEFAULT_CLUSTER_ID {
471+
appIdentifier.ClusterId == clusterBean.DefaultClusterId {
471472
common.WriteJsonResp(w, errors.New("cannot delete this default helm app"), nil, http.StatusForbidden)
472473
return
473474
}

‎api/helm-app/bean/bean.go

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
)
2424

2525
const (
26-
DEFAULT_CLUSTER_ID = 1
2726
SOURCE_DEVTRON_APP SourceAppType = "devtron-app"
2827
SOURCE_HELM_APP SourceAppType = "helm-app"
2928
SOURCE_EXTERNAL_HELM_APP SourceAppType = "external-helm-app"

‎api/restHandler/GitOpsConfigRestHandler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,6 @@ func (impl GitOpsConfigRestHandlerImpl) GitOpsValidator(w http.ResponseWriter, r
313313
impl.logger.Errorw("error in getting argo module", "error", err)
314314
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
315315
}
316-
detailedErrorGitOpsConfigResponse := impl.gitOpsConfigService.GitOpsValidateDryRun(argoModule, &bean)
316+
detailedErrorGitOpsConfigResponse := impl.gitOpsConfigService.GitOpsValidateDryRun(argoModule.IsInstalled(), &bean)
317317
common.WriteJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
318318
}

‎api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,15 @@ func (handler *PipelineConfigRestHandlerImpl) CreateCdPipeline(w http.ResponseWr
229229
}
230230
ok := true
231231
for _, deploymentPipeline := range cdPipeline.Pipelines {
232+
233+
if deploymentPipeline.IsLinkedRelease() {
234+
//only super admin is allowed to link pipeline to external helm release/ acd Application
235+
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*"); !ok {
236+
common.WriteJsonResp(w, errors.New("unauthorized User"), nil, http.StatusForbidden)
237+
return
238+
}
239+
}
240+
232241
//handling case of change of source from CI_PIPELINE to external-ci type (other change of type any -> any has been handled in ci-pipeline/patch api)
233242
if deploymentPipeline.IsSwitchCiPipelineRequest() {
234243
cdPipelines, err := handler.getCdPipelinesForCdPatchRbac(deploymentPipeline)
@@ -248,7 +257,6 @@ func (handler *PipelineConfigRestHandlerImpl) CreateCdPipeline(w http.ResponseWr
248257
common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
249258
return
250259
}
251-
// TODO Asutosh: check for super-admin if user tries to migrate an external argocd app/ helm release
252260
}
253261
//RBAC
254262

‎client/argocdServer/ArgoClientWrapperService.go

+14-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ type ApplicationClientWrapper interface {
8686
// GetArgoAppByName fetches an argoCd app by its name
8787
GetArgoAppByName(ctx context.Context, appName string) (*v1alpha1.Application, error)
8888

89-
GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error)
89+
GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (*v1alpha1.Application, error)
9090

9191
DeleteArgoAppWithK8sClient(ctx context.Context, clusterId int, namespace, appName string, cascadeDelete bool) error
9292

@@ -407,7 +407,7 @@ func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByName(ctx context.Context,
407407
return argoApplication, nil
408408
}
409409

410-
func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
410+
func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (*v1alpha1.Application, error) {
411411
k8sConfig, err := impl.acdConfigGetter.GetK8sConfigWithClusterIdAndNamespace(clusterId, namespace)
412412
if err != nil {
413413
impl.logger.Errorw("error in getting k8s config", "err", err)
@@ -418,7 +418,12 @@ func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByNameWithK8sClient(ctx cont
418418
impl.logger.Errorw("err in getting argo app by name", "app", appName)
419419
return nil, err
420420
}
421-
return argoApplication, nil
421+
application, err := GetAppObject(argoApplication)
422+
if err != nil {
423+
impl.logger.Errorw("error in getting app object", "deploymentAppName", appName, "err", err)
424+
return nil, err
425+
}
426+
return application, nil
422427
}
423428

424429
func (impl *ArgoClientWrapperServiceImpl) DeleteArgoAppWithK8sClient(ctx context.Context, clusterId int, namespace, appName string, cascadeDelete bool) error {
@@ -436,6 +441,12 @@ func (impl *ArgoClientWrapperServiceImpl) DeleteArgoAppWithK8sClient(ctx context
436441
}
437442

438443
func (impl *ArgoClientWrapperServiceImpl) IsArgoAppPatchRequired(argoAppSpec *v1alpha1.ApplicationSource, currentGitRepoUrl, currentTargetRevision, currentChartPath string) bool {
444+
if argoAppSpec == nil {
445+
// if argo app spec is nil, then no need to patch
446+
// this means the argo app object is in corrupted state
447+
impl.logger.Warnw("received argo app spec is nil, skipping for patch request...")
448+
return false
449+
}
439450
return (len(currentGitRepoUrl) != 0 && argoAppSpec.RepoURL != currentGitRepoUrl) ||
440451
argoAppSpec.Path != currentChartPath ||
441452
argoAppSpec.TargetRevision != currentTargetRevision

‎client/argocdServer/ArgoClientWrapperServiceEA.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByName(ctx context.Context
127127
return nil, nil
128128
}
129129

130-
func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
130+
func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (*v1alpha1.Application, error) {
131131
impl.logger.Info("not implemented for EA mode")
132132
return nil, nil
133133
}

‎client/argocdServer/helper.go

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package argocdServer
22

33
import (
44
json2 "encoding/json"
5+
errors3 "errors"
56
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
67
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
78
)
@@ -39,6 +40,9 @@ func isArgoAppSyncModeMigrationNeeded(argoApplication *v1alpha1.Application, acd
3940
}
4041

4142
func GetAppObject(appMapObj map[string]interface{}) (*v1alpha1.Application, error) {
43+
if appMapObj == nil {
44+
return nil, errors3.New("found empty application object")
45+
}
4246
appJson, err := json2.Marshal(appMapObj)
4347
if err != nil {
4448
return nil, err

‎cmd/external-app/wire_gen.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎env_gen.json

+1-1
Large diffs are not rendered by default.

‎env_gen.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
| REVISION_HISTORY_LIMIT_HELM_APP | int |1 | | | false |
2222
| RUN_HELM_INSTALL_IN_ASYNC_MODE_HELM_APPS | bool |false | | | false |
2323
| SHOULD_CHECK_NAMESPACE_ON_CLONE | bool |false | should we check if namespace exists or not while cloning app | | false |
24-
| USE_DEPLOYMENT_CONFIG_DATA | bool |false | | | false |
24+
| USE_DEPLOYMENT_CONFIG_DATA | bool |false | use deployment config data from deployment_config table | | true |
2525

2626

2727
## CI_RUNNER Related Environment Variables

‎go.mod

+18-18
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
github.com/evanphx/json-patch v5.7.0+incompatible
2828
github.com/gammazero/workerpool v1.1.3
2929
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
30-
github.com/go-git/go-billy/v5 v5.5.0
31-
github.com/go-git/go-git/v5 v5.11.0
30+
github.com/go-git/go-billy/v5 v5.6.2
31+
github.com/go-git/go-git/v5 v5.13.2
3232
github.com/go-pg/pg v6.15.1+incompatible
3333
github.com/go-resty/resty/v2 v2.7.0
3434
github.com/gogo/protobuf v1.3.2
@@ -59,7 +59,7 @@ require (
5959
github.com/prometheus/client_golang v1.16.0
6060
github.com/robfig/cron/v3 v3.0.1
6161
github.com/satori/go.uuid v1.2.0
62-
github.com/stretchr/testify v1.8.4
62+
github.com/stretchr/testify v1.10.0
6363
github.com/tidwall/gjson v1.14.4
6464
github.com/tidwall/sjson v1.2.4
6565
github.com/xanzy/go-gitlab v0.107.0
@@ -74,9 +74,9 @@ require (
7474
go.opentelemetry.io/otel/sdk v1.20.0
7575
go.opentelemetry.io/otel/trace v1.20.0
7676
go.uber.org/zap v1.21.0
77-
golang.org/x/crypto v0.31.0
78-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
79-
golang.org/x/mod v0.17.0
77+
golang.org/x/crypto v0.32.0
78+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
79+
golang.org/x/mod v0.19.0
8080
golang.org/x/oauth2 v0.21.0
8181
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
8282
google.golang.org/grpc v1.59.0
@@ -116,7 +116,7 @@ require (
116116
github.com/MakeNowJust/heredoc v1.0.0 // indirect
117117
github.com/Masterminds/semver/v3 v3.2.1 // indirect
118118
github.com/Microsoft/go-winio v0.6.1 // indirect
119-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
119+
github.com/ProtonMail/go-crypto v1.1.5 // indirect
120120
github.com/agext/levenshtein v1.2.1 // indirect
121121
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
122122
github.com/apparentlymart/go-textseg v1.0.0 // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/cespare/xxhash/v2 v2.2.0 // indirect
133133
github.com/chai2010/gettext-go v1.0.2 // indirect
134134
github.com/cloudflare/circl v1.3.7 // indirect
135-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
135+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
136136
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
137137
github.com/distribution/reference v0.6.0 // indirect
138138
github.com/docker/cli v24.0.6+incompatible // indirect
@@ -215,20 +215,20 @@ require (
215215
github.com/opencontainers/go-digest v1.0.0
216216
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
217217
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
218-
github.com/pjbgf/sha1cd v0.3.0 // indirect
218+
github.com/pjbgf/sha1cd v0.3.2 // indirect
219219
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
220220
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
221221
github.com/prometheus/common v0.44.0 // indirect
222222
github.com/prometheus/procfs v0.11.1 // indirect
223223
github.com/redis/go-redis/v9 v9.0.5 // indirect
224224
github.com/russross/blackfriday/v2 v2.1.0 // indirect
225-
github.com/sergi/go-diff v1.2.0 // indirect
225+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
226226
github.com/sirupsen/logrus v1.9.3 // indirect
227-
github.com/skeema/knownhosts v1.2.2 // indirect
227+
github.com/skeema/knownhosts v1.3.0 // indirect
228228
github.com/spf13/cobra v1.8.0 // indirect
229229
github.com/spf13/pflag v1.0.5 // indirect
230230
github.com/stoewer/go-strcase v1.2.0 // indirect
231-
github.com/stretchr/objx v0.5.0 // indirect
231+
github.com/stretchr/objx v0.5.2 // indirect
232232
github.com/syndtr/goleveldb v1.0.0 // indirect
233233
github.com/tidwall/match v1.1.1 // indirect
234234
github.com/tidwall/pretty v1.2.0 // indirect
@@ -247,13 +247,13 @@ require (
247247
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
248248
go.uber.org/atomic v1.10.0 // indirect
249249
go.uber.org/multierr v1.11.0 // indirect
250-
golang.org/x/net v0.33.0 // indirect
250+
golang.org/x/net v0.34.0 // indirect
251251
golang.org/x/sync v0.10.0 // indirect
252-
golang.org/x/sys v0.28.0 // indirect
253-
golang.org/x/term v0.27.0 // indirect
252+
golang.org/x/sys v0.29.0 // indirect
253+
golang.org/x/term v0.28.0 // indirect
254254
golang.org/x/text v0.21.0 // indirect
255255
golang.org/x/time v0.5.0 // indirect
256-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
256+
golang.org/x/tools v0.23.0 // indirect
257257
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
258258
google.golang.org/api v0.126.0 // indirect
259259
google.golang.org/appengine v1.6.8 // indirect
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)