Skip to content

feat: resource groups CRUD and environment filtering #3974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Sep 30, 2023
Merged

feat: resource groups CRUD and environment filtering #3974

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0d7163f
resource group
subhashish-devtron Sep 27, 2023
2e5dd73
Merge branch 'main' into env-filter-final
prakash100198 Sep 27, 2023
edf8084
minor bug fix
prakash100198 Sep 27, 2023
2c625fe
code cleaning
subhashish-devtron Sep 27, 2023
6d30cdf
getting list of env ids extracted out in utils
prakash100198 Sep 27, 2023
7fedad2
resolved comments
subhashish-devtron Sep 27, 2023
cfacd40
permission check to return env names
subhashish-devtron Sep 28, 2023
7980809
enable isLast flag for previous app-wf view flow
prakash100198 Sep 28, 2023
a6b835b
added up script
subhashish-devtron Sep 28, 2023
feee22f
code refactoring
prakash100198 Sep 28, 2023
7eb2a8b
removing rbac from get
subhashish-devtron Sep 28, 2023
af7724a
refactoring
prakash100198 Sep 28, 2023
7bdb977
code refactoring
prakash100198 Sep 28, 2023
d8c7e07
code refactoring
prakash100198 Sep 29, 2023
4c3a815
added down script
subhashish-devtron Sep 29, 2023
918d98f
Merge branch 'main' into env-filter-final
subhashish-devtron Sep 29, 2023
6112864
bump script number after main merge
subhashish-devtron Sep 29, 2023
93c21ce
Merge branch 'main' into env-filter-final
kripanshdevtron Sep 29, 2023
33b2b8a
script version updated
kripanshdevtron Sep 29, 2023
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
34 changes: 21 additions & 13 deletions Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ import (
"github.com/devtron-labs/devtron/client/telemetry"
"github.com/devtron-labs/devtron/internal/sql/repository"
app2 "github.com/devtron-labs/devtron/internal/sql/repository/app"
appGroup2 "github.com/devtron-labs/devtron/internal/sql/repository/appGroup"
appStatusRepo "github.com/devtron-labs/devtron/internal/sql/repository/appStatus"
appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
Expand All @@ -75,14 +74,14 @@ import (
"github.com/devtron-labs/devtron/internal/sql/repository/helper"
repository8 "github.com/devtron-labs/devtron/internal/sql/repository/imageTagging"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
security2 "github.com/devtron-labs/devtron/internal/sql/repository/security"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/internal/util/ArgoUtil"
"github.com/devtron-labs/devtron/pkg/app"
"github.com/devtron-labs/devtron/pkg/app/status"
"github.com/devtron-labs/devtron/pkg/appClone"
"github.com/devtron-labs/devtron/pkg/appClone/batch"
"github.com/devtron-labs/devtron/pkg/appGroup"
"github.com/devtron-labs/devtron/pkg/appStatus"
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
appStoreDeploymentFullMode "github.com/devtron-labs/devtron/pkg/appStore/deployment/fullMode"
Expand All @@ -97,6 +96,8 @@ import (
"github.com/devtron-labs/devtron/pkg/commonService"
delete2 "github.com/devtron-labs/devtron/pkg/delete"
"github.com/devtron-labs/devtron/pkg/deploymentGroup"
"github.com/devtron-labs/devtron/pkg/devtronResource"
repository9 "github.com/devtron-labs/devtron/pkg/devtronResource/repository"
"github.com/devtron-labs/devtron/pkg/dockerRegistry"
"github.com/devtron-labs/devtron/pkg/git"
"github.com/devtron-labs/devtron/pkg/gitops"
Expand All @@ -111,6 +112,7 @@ import (
"github.com/devtron-labs/devtron/pkg/plugin"
repository6 "github.com/devtron-labs/devtron/pkg/plugin/repository"
"github.com/devtron-labs/devtron/pkg/projectManagementService/jira"
resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
"github.com/devtron-labs/devtron/pkg/security"
"github.com/devtron-labs/devtron/pkg/sql"
util3 "github.com/devtron-labs/devtron/pkg/util"
Expand Down Expand Up @@ -198,7 +200,7 @@ func InitializeApp() (*App, error) {
wire.Bind(new(chartConfig.EnvConfigOverrideRepository), new(*chartConfig.EnvConfigOverrideRepositoryImpl)),
chartConfig.NewPipelineOverrideRepository,
wire.Bind(new(chartConfig.PipelineOverrideRepository), new(*chartConfig.PipelineOverrideRepositoryImpl)),
util.MergeUtil{},
wire.Struct(new(util.MergeUtil), "*"),
util.NewSugardLogger,

deployment.NewDeploymentConfigRestHandlerImpl,
Expand Down Expand Up @@ -863,16 +865,16 @@ func InitializeApp() (*App, error) {
kubernetesResourceAuditLogs.Newk8sResourceHistoryServiceImpl,
wire.Bind(new(kubernetesResourceAuditLogs.K8sResourceHistoryService), new(*kubernetesResourceAuditLogs.K8sResourceHistoryServiceImpl)),

router.NewAppGroupingRouterImpl,
wire.Bind(new(router.AppGroupingRouter), new(*router.AppGroupingRouterImpl)),
restHandler.NewAppGroupRestHandlerImpl,
wire.Bind(new(restHandler.AppGroupRestHandler), new(*restHandler.AppGroupRestHandlerImpl)),
appGroup.NewAppGroupServiceImpl,
wire.Bind(new(appGroup.AppGroupService), new(*appGroup.AppGroupServiceImpl)),
appGroup2.NewAppGroupRepositoryImpl,
wire.Bind(new(appGroup2.AppGroupRepository), new(*appGroup2.AppGroupRepositoryImpl)),
appGroup2.NewAppGroupMappingRepositoryImpl,
wire.Bind(new(appGroup2.AppGroupMappingRepository), new(*appGroup2.AppGroupMappingRepositoryImpl)),
router.NewResourceGroupingRouterImpl,
wire.Bind(new(router.ResourceGroupingRouter), new(*router.ResourceGroupingRouterImpl)),
restHandler.NewResourceGroupRestHandlerImpl,
wire.Bind(new(restHandler.ResourceGroupRestHandler), new(*restHandler.ResourceGroupRestHandlerImpl)),
resourceGroup2.NewResourceGroupServiceImpl,
wire.Bind(new(resourceGroup2.ResourceGroupService), new(*resourceGroup2.ResourceGroupServiceImpl)),
resourceGroup.NewResourceGroupRepositoryImpl,
wire.Bind(new(resourceGroup.ResourceGroupRepository), new(*resourceGroup.ResourceGroupRepositoryImpl)),
resourceGroup.NewResourceGroupMappingRepositoryImpl,
wire.Bind(new(resourceGroup.ResourceGroupMappingRepository), new(*resourceGroup.ResourceGroupMappingRepositoryImpl)),
pipeline.NewArgoWorkflowExecutorImpl,
wire.Bind(new(pipeline.ArgoWorkflowExecutor), new(*pipeline.ArgoWorkflowExecutorImpl)),
pipeline.NewSystemWorkflowExecutorImpl,
Expand All @@ -897,6 +899,12 @@ func InitializeApp() (*App, error) {
wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
dockerRegistryRepository.NewOCIRegistryConfigRepositoryImpl,
wire.Bind(new(dockerRegistryRepository.OCIRegistryConfigRepository), new(*dockerRegistryRepository.OCIRegistryConfigRepositoryImpl)),
repository9.NewDevtronResourceSearchableKeyRepositoryImpl,
wire.Bind(new(repository9.DevtronResourceSearchableKeyRepository), new(*repository9.DevtronResourceSearchableKeyRepositoryImpl)),

devtronResource.NewDevtronResourceSearchableKeyServiceImpl,
wire.Bind(new(devtronResource.DevtronResourceService), new(*devtronResource.DevtronResourceSearchableKeyServiceImpl)),

// end: docker registry wire set injection
)
return &App{}, nil
Expand Down
278 changes: 0 additions & 278 deletions api/restHandler/AppGroupRestHandler.go
View file
Open in desktop

This file was deleted.

Loading