Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a8e1a38
wip
manish-agrawal-ai Oct 25, 2022
6f9fefc
compile fix
manish-agrawal-ai Oct 25, 2022
b91ba03
compile fix2
manish-agrawal-ai Oct 25, 2022
7c1a1b4
type fix
manish-agrawal-ai Oct 25, 2022
bb9099d
sql fix
manish-agrawal-ai Oct 25, 2022
df30ceb
fix
manish-agrawal-ai Oct 25, 2022
47b3afb
fix
manish-agrawal-ai Oct 26, 2022
19ecd1c
clusterName, registryId, externalCi, ipsAccess return for app detail
manish-agrawal-ai Oct 26, 2022
f02fb87
ips create while deployment
manish-agrawal-ai Oct 27, 2022
9f4af77
resourceNode info
manish-agrawal-ai Oct 27, 2022
3696b3d
fix10
manish-agrawal-ai Oct 28, 2022
711ff85
updatr fix
manish-agrawal-ai Oct 28, 2022
78299d5
test cases
manish-agrawal-ai Oct 28, 2022
1d59a22
fix
manish-agrawal-ai Oct 28, 2022
4dac281
ecr fix
manish-agrawal-ai Oct 28, 2022
4206332
refactoring
manish-agrawal-ai Oct 28, 2022
56c93f3
fix
manish-agrawal-ai Oct 28, 2022
097efbd
comment added
manish-agrawal-ai Oct 28, 2022
b9603ee
gcr fix
manish-agrawal-ai Oct 28, 2022
c668758
Merge branch 'main' into issue_1930
manish-agrawal-ai Oct 28, 2022
01d3609
sql file renamed
manish-agrawal-ai Oct 29, 2022
08a6e29
proto update
manish-agrawal-ai Nov 2, 2022
bdc40e1
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 3, 2022
373d442
fix
manish-agrawal-ai Nov 4, 2022
fd2642f
some checks added
manish-agrawal-ai Nov 4, 2022
5e03ca4
fix for external ci
manish-agrawal-ai Nov 4, 2022
2e26d8b
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 7, 2022
7c5f5c9
unique constraint added on docker_artifact_store_id column in docker_…
manish-agrawal-ai Nov 8, 2022
4c57556
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 9, 2022
8e6850a
ips name lowercase bug fix
manish-agrawal-ai Nov 10, 2022
8886ac2
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 10, 2022
fe96179
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 11, 2022
a01aea5
Merge branch 'main' into issue_1930
manish-agrawal-ai Nov 11, 2022
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
10 changes: 8 additions & 2 deletions Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import (
appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
"github.com/devtron-labs/devtron/internal/sql/repository/helper"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
security2 "github.com/devtron-labs/devtron/internal/sql/repository/security"
Expand All @@ -85,6 +86,7 @@ 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/dockerRegistry"
"github.com/devtron-labs/devtron/pkg/git"
"github.com/devtron-labs/devtron/pkg/gitops"
jira2 "github.com/devtron-labs/devtron/pkg/jira"
Expand Down Expand Up @@ -214,8 +216,12 @@ func InitializeApp() (*App, error) {
wire.Bind(new(restHandler.MigrateDbRestHandler), new(*restHandler.MigrateDbRestHandlerImpl)),
pipeline.NewDockerRegistryConfigImpl,
wire.Bind(new(pipeline.DockerRegistryConfig), new(*pipeline.DockerRegistryConfigImpl)),
repository.NewDockerArtifactStoreRepositoryImpl,
wire.Bind(new(repository.DockerArtifactStoreRepository), new(*repository.DockerArtifactStoreRepositoryImpl)),
dockerRegistry.NewDockerRegistryIpsConfigServiceImpl,
wire.Bind(new(dockerRegistry.DockerRegistryIpsConfigService), new(*dockerRegistry.DockerRegistryIpsConfigServiceImpl)),
dockerRegistryRepository.NewDockerArtifactStoreRepositoryImpl,
wire.Bind(new(dockerRegistryRepository.DockerArtifactStoreRepository), new(*dockerRegistryRepository.DockerArtifactStoreRepositoryImpl)),
dockerRegistryRepository.NewDockerRegistryIpsConfigRepositoryImpl,
wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
util.NewChartTemplateServiceImpl,
wire.Bind(new(util.ChartTemplateService), new(*util.ChartTemplateServiceImpl)),
chart.NewChartServiceImpl,
Expand Down
5 changes: 5 additions & 0 deletions api/bean/AppView.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ type DeploymentDetailContainer struct {
CiArtifactId int `json:"ciArtifactId"`
ClusterId int `json:"clusterId"`
DeploymentAppType string `json:"deploymentAppType"`
CiPipelineId int `json:"-"`
IsExternalCi bool `json:"externalCi"`
ClusterName string `json:"clusterName,omitempty"`
DockerRegistryId string `json:"dockerRegistryId,omitempty"`
IpsAccessProvided bool `json:"ipsAccessProvided"`
}

type AppDetailContainer struct {
Expand Down
Loading