Skip to content

Commit 6bd6815

Browse files
kartik-579kartik-579
committed
reverted pkg categorisation
1 parent 5ab4dfb commit 6bd6815

File tree

21 files changed

+43
-43
lines changed

21 files changed

+43
-43
lines changed

‎api/argoApplication/ArgoApplicationRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"context"
2121
"errors"
2222
"github.com/devtron-labs/devtron/api/restHandler/common"
23+
"github.com/devtron-labs/devtron/pkg/argoApplication"
24+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
2325
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
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: 8 additions & 8 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/coreEntities/argoApplication"
21-
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read"
22-
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
20+
argoApplication3 "github.com/devtron-labs/devtron/pkg/argoApplication"
21+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
22+
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
2323
"github.com/google/wire"
2424
)
2525

@@ -30,9 +30,9 @@ var ArgoApplicationWireSetFull = wire.NewSet(
3030
config.NewArgoApplicationConfigServiceImpl,
3131
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),
3232

33-
argoApplication2.NewArgoApplicationServiceImpl,
34-
argoApplication2.NewArgoApplicationServiceExtendedServiceImpl,
35-
wire.Bind(new(argoApplication2.ArgoApplicationService), new(*argoApplication2.ArgoApplicationServiceExtendedImpl)),
33+
argoApplication3.NewArgoApplicationServiceImpl,
34+
argoApplication3.NewArgoApplicationServiceExtendedServiceImpl,
35+
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceExtendedImpl)),
3636

3737
NewArgoApplicationRestHandlerImpl,
3838
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
@@ -48,8 +48,8 @@ var ArgoApplicationWireSetEA = wire.NewSet(
4848
config.NewArgoApplicationConfigServiceImpl,
4949
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),
5050

51-
argoApplication2.NewArgoApplicationServiceImpl,
52-
wire.Bind(new(argoApplication2.ArgoApplicationService), new(*argoApplication2.ArgoApplicationServiceImpl)),
51+
argoApplication3.NewArgoApplicationServiceImpl,
52+
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceImpl)),
5353

5454
NewArgoApplicationRestHandlerImpl,
5555
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),

‎api/helm-app/HelmAppRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
service2 "github.com/devtron-labs/devtron/api/helm-app/service"
2525
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
2626
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
27+
"github.com/devtron-labs/devtron/pkg/argoApplication"
28+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
2729
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"
3030
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
3131
"github.com/devtron-labs/devtron/pkg/fluxApplication"
3232
bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"

‎api/k8s/application/k8sApplicationRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import (
3333
client "github.com/devtron-labs/devtron/api/helm-app/service"
3434
"github.com/devtron-labs/devtron/api/restHandler/common"
3535
util2 "github.com/devtron-labs/devtron/internal/util"
36+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
37+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
3638
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
3739
"github.com/devtron-labs/devtron/pkg/auth/user"
3840
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"
4141
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
4242
"github.com/devtron-labs/devtron/pkg/fluxApplication"
4343
"github.com/devtron-labs/devtron/pkg/k8s"

‎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,7 +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"
32+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
3333
common2 "github.com/devtron-labs/devtron/pkg/deployment/common"
3434
bean2 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
3535
commonBean "github.com/devtron-labs/devtron/pkg/deployment/gitOps/common/bean"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ import (
3737
deployment2 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode/deployment"
3838
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deployment"
3939
util2 "github.com/devtron-labs/devtron/pkg/appStore/util"
40+
"github.com/devtron-labs/devtron/pkg/argoApplication"
41+
bean4 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
4042
"github.com/devtron-labs/devtron/pkg/bean"
4143
"github.com/devtron-labs/devtron/pkg/cluster"
4244
"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
4345
"github.com/devtron-labs/devtron/pkg/cluster/read"
4446
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"
4747
"github.com/devtron-labs/devtron/pkg/deployment/common"
4848
bean3 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
4949
"github.com/devtron-labs/devtron/pkg/deployment/gitOps/config"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ 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"
40+
"github.com/devtron-labs/devtron/pkg/argoApplication"
41+
bean3 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
4242
"github.com/devtron-labs/devtron/pkg/deployment/common"
4343
bean2 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
4444
"github.com/devtron-labs/devtron/pkg/k8s"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"github.com/devtron-labs/devtron/api/helm-app/service"
2626
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
2727
util2 "github.com/devtron-labs/devtron/internal/util"
28+
"github.com/devtron-labs/devtron/pkg/argoApplication/bean"
29+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
30+
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
2831
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
2932
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"
3333
"github.com/devtron-labs/devtron/pkg/deployment/common"
3434
commonBean "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
3535
"github.com/devtron-labs/devtron/pkg/k8s/application"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
2929
util2 "github.com/devtron-labs/devtron/internal/util"
3030
"github.com/devtron-labs/devtron/pkg/app/appDetails/adapter"
31+
"github.com/devtron-labs/devtron/pkg/argoApplication/bean"
32+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
3133
"github.com/devtron-labs/devtron/pkg/cluster"
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/coreEntities/argoApplication/bean/bean.go renamed to ‎pkg/argoApplication/bean/bean.go

File renamed without changes.

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

File renamed without changes.

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
2525
"github.com/devtron-labs/devtron/api/helm-app/gRPC"
2626
"github.com/devtron-labs/devtron/api/helm-app/service"
27+
"github.com/devtron-labs/devtron/pkg/argoApplication/bean"
28+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
2729
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
2830
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"
3131
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
3232
"go.uber.org/zap"
3333
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"fmt"
77
"github.com/devtron-labs/common-lib/utils/k8s"
88
k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
9+
"github.com/devtron-labs/devtron/pkg/argoApplication/bean"
10+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
911
"github.com/devtron-labs/devtron/pkg/cluster/adapter"
1012
clusterRepository "github.com/devtron-labs/devtron/pkg/cluster/repository"
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
@@ -34,9 +34,9 @@ import (
3434
"github.com/devtron-labs/devtron/internal/util"
3535
"github.com/devtron-labs/devtron/pkg/app"
3636
"github.com/devtron-labs/devtron/pkg/appStatus"
37+
argoApplication2 "github.com/devtron-labs/devtron/pkg/argoApplication"
38+
bean2 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
3739
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"
4040
commonBean "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
4141
"github.com/devtron-labs/devtron/pkg/k8s"
4242
application2 "github.com/devtron-labs/devtron/pkg/k8s/application"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
99
"github.com/devtron-labs/devtron/pkg/app"
1010
bean4 "github.com/devtron-labs/devtron/pkg/app/bean"
11+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
1112
bean2 "github.com/devtron-labs/devtron/pkg/bean"
1213
repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
13-
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
1414
"github.com/devtron-labs/devtron/pkg/deployment/manifest/publish"
1515
"github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
1616
"github.com/devtron-labs/devtron/pkg/pipeline/repository"

‎pkg/k8s/K8sCommonService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"github.com/devtron-labs/devtron/api/bean/AppView"
2626
helmBean "github.com/devtron-labs/devtron/api/helm-app/service/bean"
2727
internalUtil "github.com/devtron-labs/devtron/internal/util"
28+
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
2829
bean2 "github.com/devtron-labs/devtron/pkg/cluster/bean"
2930
bean4 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3031
"github.com/devtron-labs/devtron/pkg/cluster/read"
31-
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/read/config"
3232
bean3 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
3333
bean5 "github.com/devtron-labs/devtron/pkg/k8s/bean"
3434
"github.com/devtron-labs/devtron/util"

‎pkg/k8s/application/k8sApplicationService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"github.com/devtron-labs/devtron/api/helm-app/gRPC"
2626
client "github.com/devtron-labs/devtron/api/helm-app/service"
2727
"github.com/devtron-labs/devtron/api/helm-app/service/bean"
28+
"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
2829
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
2930
bean5 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3031
"github.com/devtron-labs/devtron/pkg/cluster/read"
31-
"github.com/devtron-labs/devtron/pkg/coreEntities/argoApplication/helper"
3232
clientErrors "github.com/devtron-labs/devtron/pkg/errors"
3333
"github.com/devtron-labs/devtron/pkg/fluxApplication"
3434
bean2 "github.com/devtron-labs/devtron/pkg/fluxApplication/bean"

‎pkg/terminal/terminalSesion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"github.com/caarlos0/env"
2727
"github.com/devtron-labs/common-lib/utils/k8s"
2828
"github.com/devtron-labs/devtron/internal/middleware"
29+
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
2930
"github.com/devtron-labs/devtron/pkg/cluster"
3031
"github.com/devtron-labs/devtron/pkg/cluster/bean"
3132
"github.com/devtron-labs/devtron/pkg/cluster/environment"
3233
bean2 "github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
3334
"github.com/devtron-labs/devtron/pkg/cluster/read"
3435
"github.com/devtron-labs/devtron/pkg/cluster/repository"
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: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)