Skip to content

Commit 5ab4dfb

Browse files
kartik-579kartik-579
committed
rename pkg/
1 parent 7ae5b3d commit 5ab4dfb

File tree

21 files changed

+36
-36
lines changed

21 files changed

+36
-36
lines changed

‎api/argoApplication/ArgoApplicationRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"errors"
2222
"github.com/devtron-labs/devtron/api/restHandler/common"
2323
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
24-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
25-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read"
24+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
25+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read"
2626
"go.uber.org/zap"
2727
"net/http"
2828
"strconv"

‎api/argoApplication/wire_argoApplication.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package argoApplication
1818

1919
import (
20-
argoApplication2 "github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
21-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read"
22-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read/config"
20+
argoApplication2 "github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
21+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read"
22+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
2323
"github.com/google/wire"
2424
)
2525

‎api/helm-app/HelmAppRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
2626
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
2727
clusterBean "github.com/devtron-labs/devtron/pkg/cluster/bean"
28+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
29+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
2830
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
2931
"github.com/devtron-labs/devtron/pkg/fluxApplication"
3032
bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
31-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
32-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
3333
"github.com/devtron-labs/devtron/pkg/pipeline"
3434
"net/http"
3535
"strconv"

‎api/k8s/application/k8sApplicationRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ import (
3636
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
3737
"github.com/devtron-labs/devtron/pkg/auth/user"
3838
bean4 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
39+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
40+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read"
3941
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
4042
"github.com/devtron-labs/devtron/pkg/fluxApplication"
4143
"github.com/devtron-labs/devtron/pkg/k8s"
4244
application2 "github.com/devtron-labs/devtron/pkg/k8s/application"
4345
bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
4446
bean3 "github.com/devtron-labs/devtron/pkg/k8s/bean"
45-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
46-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read"
4747
"github.com/devtron-labs/devtron/pkg/terminal"
4848
"github.com/devtron-labs/devtron/util"
4949
"github.com/devtron-labs/devtron/util/rbac"

‎cmd/external-app/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/app/AppService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
internalUtil "github.com/devtron-labs/devtron/internal/util"
3030
bean3 "github.com/devtron-labs/devtron/pkg/app/bean"
3131
installedAppReader "github.com/devtron-labs/devtron/pkg/appStore/installedApp/read"
32+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
3233
common2 "github.com/devtron-labs/devtron/pkg/deployment/common"
3334
bean2 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
3435
commonBean "github.com/devtron-labs/devtron/pkg/deployment/gitOps/common/bean"
@@ -38,7 +39,6 @@ import (
3839
bean6 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/bean"
3940
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/read"
4041
bean4 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
41-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
4242
"github.com/devtron-labs/devtron/pkg/workflow/cd"
4343
"net/url"
4444
"strconv"

‎pkg/appStore/installedApp/service/FullMode/deploymentTypeChange/InstalledAppDeploymentTypeChangeService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ import (
4242
"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
4343
"github.com/devtron-labs/devtron/pkg/cluster/read"
4444
repository5 "github.com/devtron-labs/devtron/pkg/cluster/repository"
45+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
46+
bean4 "github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
4547
"github.com/devtron-labs/devtron/pkg/deployment/common"
4648
bean3 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
4749
"github.com/devtron-labs/devtron/pkg/deployment/gitOps/config"
4850
bean2 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
4951
"github.com/devtron-labs/devtron/pkg/k8s"
50-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
51-
bean4 "github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
5252
util3 "github.com/devtron-labs/devtron/util"
5353
"github.com/go-pg/pg"
5454
"go.uber.org/zap"

‎pkg/appStore/installedApp/service/FullMode/resource/ResourceTreeService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import (
3737
"github.com/devtron-labs/devtron/pkg/appStore/bean"
3838
appStoreDiscoverRepository "github.com/devtron-labs/devtron/pkg/appStore/discover/repository"
3939
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
40+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
41+
bean3 "github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
4042
"github.com/devtron-labs/devtron/pkg/deployment/common"
4143
bean2 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
4244
"github.com/devtron-labs/devtron/pkg/k8s"
4345
application3 "github.com/devtron-labs/devtron/pkg/k8s/application"
44-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
45-
bean3 "github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
4646
util3 "github.com/devtron-labs/devtron/pkg/util"
4747
util2 "github.com/devtron-labs/devtron/util"
4848
"github.com/tidwall/gjson"

‎pkg/nucleus/argoApplication/ArgoApplicationService.go renamed to ‎pkg/coreEntities/argoApplication/ArgoApplicationService.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
util2 "github.com/devtron-labs/devtron/internal/util"
2828
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
2929
clusterRepository "github.com/devtron-labs/devtron/pkg/cluster/repository"
30+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
31+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
32+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
3033
"github.com/devtron-labs/devtron/pkg/deployment/common"
3134
commonBean "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
3235
"github.com/devtron-labs/devtron/pkg/k8s/application"
3336
k8s2 "github.com/devtron-labs/devtron/pkg/k8s/bean"
34-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
35-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
36-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read/config"
3737
"github.com/devtron-labs/devtron/util"
3838
"github.com/devtron-labs/devtron/util/sliceUtil"
3939
"go.uber.org/zap"

‎pkg/nucleus/argoApplication/ArgoApplicationServiceExtended.go renamed to ‎pkg/coreEntities/argoApplication/ArgoApplicationServiceExtended.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
util2 "github.com/devtron-labs/devtron/internal/util"
3030
"github.com/devtron-labs/devtron/pkg/app/appDetails/adapter"
3131
"github.com/devtron-labs/devtron/pkg/cluster"
32-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
33-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read"
32+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
33+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read"
3434
util3 "github.com/devtron-labs/devtron/pkg/util"
3535
"github.com/devtron-labs/devtron/util"
3636
"google.golang.org/grpc"

‎pkg/nucleus/argoApplication/bean/bean.go renamed to ‎pkg/coreEntities/argoApplication/bean/bean.go

File renamed without changes.

‎pkg/nucleus/argoApplication/helper/deploymentStatusHelper.go renamed to ‎pkg/coreEntities/argoApplication/helper/deploymentStatusHelper.go

File renamed without changes.

‎pkg/nucleus/argoApplication/helper/helper.go renamed to ‎pkg/coreEntities/argoApplication/helper/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
66
"github.com/devtron-labs/devtron/api/helm-app/gRPC"
77
"github.com/devtron-labs/devtron/pkg/cluster/repository"
8-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
8+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
99
"strconv"
1010
"strings"
1111
)

‎pkg/nucleus/argoApplication/read/ArgoApplicationReadService.go renamed to ‎pkg/coreEntities/argoApplication/read/ArgoApplicationReadService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"github.com/devtron-labs/devtron/api/helm-app/service"
2727
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
2828
clusterRepository "github.com/devtron-labs/devtron/pkg/cluster/repository"
29+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
30+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
2931
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
30-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
31-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
3232
"go.uber.org/zap"
3333
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/labels"

‎pkg/nucleus/argoApplication/read/config/ArgoApplicationConfigService.go renamed to ‎pkg/coreEntities/argoApplication/read/config/ArgoApplicationConfigService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
99
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
1010
clusterRepository "github.com/devtron-labs/devtron/pkg/cluster/repository"
11-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
12-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
11+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
12+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
1313
"go.uber.org/zap"
1414
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/labels"

‎pkg/deployment/deployedApp/status/resourceTree/ResourceTreeService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ import (
3535
"github.com/devtron-labs/devtron/pkg/app"
3636
"github.com/devtron-labs/devtron/pkg/appStatus"
3737
read2 "github.com/devtron-labs/devtron/pkg/cluster/environment/read"
38+
argoApplication2 "github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication"
39+
bean2 "github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/bean"
3840
commonBean "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
3941
"github.com/devtron-labs/devtron/pkg/k8s"
4042
application2 "github.com/devtron-labs/devtron/pkg/k8s/application"
41-
argoApplication2 "github.com/devtron-labs/devtron/pkg/nucleus/argoApplication"
42-
bean2 "github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/bean"
4343
util2 "github.com/devtron-labs/devtron/util"
4444
"go.uber.org/zap"
4545
"strconv"

‎pkg/deployment/trigger/devtronApps/TriggerService_ent1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
bean4 "github.com/devtron-labs/devtron/pkg/app/bean"
1111
bean2 "github.com/devtron-labs/devtron/pkg/bean"
1212
repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
13+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
1314
"github.com/devtron-labs/devtron/pkg/deployment/manifest/publish"
1415
"github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
15-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
1616
"github.com/devtron-labs/devtron/pkg/pipeline/repository"
1717
"helm.sh/helm/v3/pkg/chart"
1818
)

‎pkg/k8s/K8sCommonService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
bean2 "github.com/devtron-labs/devtron/pkg/cluster/bean"
2929
bean4 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3030
"github.com/devtron-labs/devtron/pkg/cluster/read"
31+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
3132
bean3 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
3233
bean5 "github.com/devtron-labs/devtron/pkg/k8s/bean"
33-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read/config"
3434
"github.com/devtron-labs/devtron/util"
3535
"go.opentelemetry.io/otel"
3636
"go.uber.org/zap"

‎pkg/k8s/application/k8sApplicationService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
2929
bean5 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3030
"github.com/devtron-labs/devtron/pkg/cluster/read"
31+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
3132
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
3233
"github.com/devtron-labs/devtron/pkg/fluxApplication"
3334
bean2 "github.com/devtron-labs/devtron/pkg/fluxApplication/bean"
3435
bean4 "github.com/devtron-labs/devtron/pkg/k8s/bean"
35-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/helper"
3636
"io"
3737
v1 "k8s.io/client-go/kubernetes/typed/core/v1"
3838
"net/http"

‎pkg/terminal/terminalSesion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
bean2 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3333
"github.com/devtron-labs/devtron/pkg/cluster/read"
3434
"github.com/devtron-labs/devtron/pkg/cluster/repository"
35-
"github.com/devtron-labs/devtron/pkg/nucleus/argoApplication/read/config"
35+
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
3636
errors1 "github.com/juju/errors"
3737
"go.uber.org/zap"
3838
"io"

‎wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)