Skip to content

Commit ed1488e

Browse files
Shivam-nagar23Shivam-nagar23
committed
sql scripts
2 parents 0a48005 + 562938c commit ed1488e

File tree

327 files changed

+40747
-7658
lines changed

Some content is hidden

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

327 files changed

+40747
-7658
lines changed

‎Wire.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ import (
103103
appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
104104
"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
105105
"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
106-
"github.com/devtron-labs/devtron/internal/sql/repository/deploymentConfig"
107106
dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
108107
"github.com/devtron-labs/devtron/internal/sql/repository/helper"
109108
repository8 "github.com/devtron-labs/devtron/internal/sql/repository/imageTagging"
110109
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
111110
resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
112111
"github.com/devtron-labs/devtron/internal/util"
113112
"github.com/devtron-labs/devtron/pkg/app"
113+
read4 "github.com/devtron-labs/devtron/pkg/app/appDetails/read"
114114
"github.com/devtron-labs/devtron/pkg/app/dbMigration"
115115
"github.com/devtron-labs/devtron/pkg/app/status"
116116
"github.com/devtron-labs/devtron/pkg/appClone"
@@ -129,6 +129,7 @@ import (
129129
"github.com/devtron-labs/devtron/pkg/bulkAction/service"
130130
"github.com/devtron-labs/devtron/pkg/chart"
131131
"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
132+
read2 "github.com/devtron-labs/devtron/pkg/chart/read"
132133
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
133134
"github.com/devtron-labs/devtron/pkg/commonService"
134135
"github.com/devtron-labs/devtron/pkg/config"
@@ -360,6 +361,8 @@ func InitializeApp() (*App, error) {
360361
wire.Bind(new(gitOpsConfig.DevtronAppGitOpConfigService), new(*gitOpsConfig.DevtronAppGitOpConfigServiceImpl)),
361362
chart.NewChartServiceImpl,
362363
wire.Bind(new(chart.ChartService), new(*chart.ChartServiceImpl)),
364+
read2.NewChartReadServiceImpl,
365+
wire.Bind(new(read2.ChartReadService), new(*read2.ChartReadServiceImpl)),
363366
service.NewBulkUpdateServiceImpl,
364367
wire.Bind(new(service.BulkUpdateService), new(*service.BulkUpdateServiceImpl)),
365368

@@ -378,6 +381,10 @@ func InitializeApp() (*App, error) {
378381
wire.Bind(new(appList.AppListingRouter), new(*appList.AppListingRouterImpl)),
379382
appList2.NewAppListingRestHandlerImpl,
380383
wire.Bind(new(appList2.AppListingRestHandler), new(*appList2.AppListingRestHandlerImpl)),
384+
385+
read4.NewAppDetailsReadServiceImpl,
386+
wire.Bind(new(read4.AppDetailsReadService), new(*read4.AppDetailsReadServiceImpl)),
387+
381388
app.NewAppListingServiceImpl,
382389
wire.Bind(new(app.AppListingService), new(*app.AppListingServiceImpl)),
383390
repository.NewAppListingRepositoryImpl,
@@ -628,6 +635,7 @@ func InitializeApp() (*App, error) {
628635
repository9.NewClusterInstalledAppsRepositoryImpl,
629636
wire.Bind(new(repository9.ClusterInstalledAppsRepository), new(*repository9.ClusterInstalledAppsRepositoryImpl)),
630637

638+
commonService.NewCommonBaseServiceImpl,
631639
commonService.NewCommonServiceImpl,
632640
wire.Bind(new(commonService.CommonService), new(*commonService.CommonServiceImpl)),
633641

@@ -665,8 +673,8 @@ func InitializeApp() (*App, error) {
665673

666674
router.NewCommonRouterImpl,
667675
wire.Bind(new(router.CommonRouter), new(*router.CommonRouterImpl)),
668-
restHandler.NewCommonRestHanlderImpl,
669-
wire.Bind(new(restHandler.CommonRestHanlder), new(*restHandler.CommonRestHanlderImpl)),
676+
restHandler.NewCommonRestHandlerImpl,
677+
wire.Bind(new(restHandler.CommonRestHandler), new(*restHandler.CommonRestHandlerImpl)),
670678

671679
router.NewScopedVariableRouterImpl,
672680
wire.Bind(new(router.ScopedVariableRouter), new(*router.ScopedVariableRouterImpl)),
@@ -947,11 +955,7 @@ func InitializeApp() (*App, error) {
947955
cel.NewCELServiceImpl,
948956
wire.Bind(new(cel.EvaluatorService), new(*cel.EvaluatorServiceImpl)),
949957

950-
deploymentConfig.NewRepositoryImpl,
951-
wire.Bind(new(deploymentConfig.Repository), new(*deploymentConfig.RepositoryImpl)),
952-
953-
common.NewDeploymentConfigServiceImpl,
954-
wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
958+
common.WireSet,
955959

956960
repoCredsK8sClient.NewRepositoryCredsK8sClientImpl,
957961
wire.Bind(new(repoCredsK8sClient.RepositoryCredsK8sClient), new(*repoCredsK8sClient.RepositoryCredsK8sClientImpl)),

‎WiringNilCheck.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ func skipUnnecessaryFieldsForCheck(fieldName, valName string) bool {
114114
"modulecronserviceimpl": {"cron"},
115115
"oteltracingserviceimpl": {"traceprovider"},
116116
"terminalaccessrepositoryimpl": {"templatescache"},
117+
"grpcapiclientimpl": {"serviceclient"},
118+
"serverenvconfig": {"errorencounteredongettingdevtronhelmrelease"},
117119
}
118120
if _, ok := fieldAndValName[valName]; ok {
119121
for _, ignoreFieldName := range fieldAndValName[valName] {

‎api/argoApplication/ArgoApplicationRestHandler.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package argoApplication
1818

1919
import (
20+
"context"
2021
"errors"
2122
"github.com/devtron-labs/devtron/api/restHandler/common"
2223
"github.com/devtron-labs/devtron/pkg/argoApplication"
@@ -89,6 +90,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
8990
common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
9091
return
9192
}
93+
ctx := r.Context()
94+
ctx = context.WithValue(ctx, "token", token)
95+
9296
var err error
9397
v := r.URL.Query()
9498
resourceName := v.Get("name")
@@ -104,7 +108,7 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
104108
return
105109
}
106110
}
107-
resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
111+
resp, err := handler.readService.GetAppDetailEA(ctx, resourceName, namespace, clusterId)
108112
if err != nil {
109113
handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
110114
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

‎api/argoApplication/wire_argoApplication.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var ArgoApplicationWireSetFull = wire.NewSet(
3030
config.NewArgoApplicationConfigServiceImpl,
3131
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),
3232

33+
argoApplication.NewArgoApplicationServiceImpl,
3334
argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
3435
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
3536

‎api/bean/AppView/AppView.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,16 @@ type LinkOuts struct {
294294
Link string `json:"link,omitempty"`
295295
Description string `json:"description,omitempty"`
296296
}
297+
298+
type AppStages struct {
299+
AppId int `json:"app_id,omitempty" sql:"app_id"`
300+
CiTemplateId int `json:"ci_template_id,omitempty" sql:"ci_template_id"`
301+
CiPipelineId int `json:"ci_pipeline_id,omitempty" sql:"ci_pipeline_id"`
302+
ChartId int `json:"chart_id,omitempty" sql:"chart_id"`
303+
ChartGitRepoUrl string `json:"chart_git_repo_url,omitempty" sql:"chart_git_repo_url"`
304+
PipelineId int `json:"pipeline_id,omitempty" sql:"pipeline_id"`
305+
YamlStatus int `json:"yaml_status,omitempty" sql:"yaml_status"`
306+
YamlReviewed bool `json:"yaml_reviewed,omitempty" sql:"yaml_reviewed"`
307+
DeploymentConfigRepoURL string `json:"deployment_config_repo_url" sql:"-"`
308+
GitMaterialExists int `json:"-" sql:"-"`
309+
}

‎api/bean/gitOps/GitOpsConfig.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ type GitOpsConfigDto struct {
4242
IsTLSKeyDataPresent bool `json:"isTLSKeyDataPresent"`
4343

4444
// TODO refactoring: create different struct for internal fields
45-
GitRepoName string `json:"-"`
46-
UserEmailId string `json:"-"`
47-
Description string `json:"-"`
48-
UserId int32 `json:"-"`
45+
GitRepoName string `json:"-"`
46+
TargetRevision string `json:"-"`
47+
UserEmailId string `json:"-"`
48+
Description string `json:"-"`
49+
UserId int32 `json:"-"`
50+
}
51+
52+
func (dto GitOpsConfigDto) GetHostUrl() string {
53+
return dto.Host
4954
}
5055

5156
type GitRepoRequestDto struct {
@@ -80,5 +85,5 @@ func IsGitOpsRepoNotConfigured(gitRepoUrl string) bool {
8085
}
8186

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

‎api/helm-app/HelmAppRestHandler.go

Lines changed: 2 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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/k8s/application/k8sApplicationRestHandler.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
253253
}
254254

255255
token := r.Header.Get("token")
256+
ctx := r.Context()
257+
ctx = context.WithValue(ctx, "token", token)
256258
var k8sAppDetail AppView.AppDetailContainer
257259
var resourceTreeResponse *gRPC.ResourceTreeResponse
258260
var clusterId int
@@ -276,7 +278,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
276278
return
277279
}
278280
//RBAC enforcer Ends
279-
appDetail, err := handler.helmAppService.GetApplicationDetail(r.Context(), appIdentifier)
281+
appDetail, err := handler.helmAppService.GetApplicationDetail(ctx, appIdentifier)
280282
if err != nil {
281283
apiError := clientErrors.ConvertToApiError(err)
282284
if apiError != nil {
@@ -303,7 +305,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
303305
}
304306
//RBAC enforcer Ends
305307

306-
appDetail, err := handler.argoApplicationReadService.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
308+
appDetail, err := handler.argoApplicationReadService.GetAppDetailEA(r.Context(), appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
307309
if err != nil {
308310
apiError := clientErrors.ConvertToApiError(err)
309311
if apiError != nil {

‎api/module/ModuleRestHandler.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package module
1919
import (
2020
"encoding/json"
2121
"errors"
22+
"github.com/devtron-labs/devtron/pkg/module/bean"
2223
"net/http"
2324

2425
"github.com/devtron-labs/devtron/api/restHandler/common"
@@ -135,7 +136,7 @@ func (impl ModuleRestHandlerImpl) HandleModuleAction(w http.ResponseWriter, r *h
135136

136137
// decode request
137138
decoder := json.NewDecoder(r.Body)
138-
var moduleActionRequestDto *module.ModuleActionRequestDto
139+
var moduleActionRequestDto *bean.ModuleActionRequestDto
139140
err = decoder.Decode(&moduleActionRequestDto)
140141
if err != nil {
141142
impl.logger.Errorw("error in decoding request in HandleModuleAction", "err", err)
@@ -184,7 +185,7 @@ func (impl ModuleRestHandlerImpl) EnableModule(w http.ResponseWriter, r *http.Re
184185
}
185186
// decode request
186187
decoder := json.NewDecoder(r.Body)
187-
var moduleEnableRequestDto module.ModuleEnableRequestDto
188+
var moduleEnableRequestDto bean.ModuleEnableRequestDto
188189
err = decoder.Decode(&moduleEnableRequestDto)
189190
if err != nil {
190191
impl.logger.Errorw("error in decoding request in ModuleEnableRequestDto", "err", err)

‎api/module/wire_module.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ package module
1818

1919
import (
2020
"github.com/devtron-labs/devtron/pkg/module"
21+
"github.com/devtron-labs/devtron/pkg/module/bean"
22+
"github.com/devtron-labs/devtron/pkg/module/read"
2123
moduleRepo "github.com/devtron-labs/devtron/pkg/module/repo"
2224
moduleDataStore "github.com/devtron-labs/devtron/pkg/module/store"
2325
"github.com/google/wire"
@@ -28,9 +30,11 @@ var ModuleWireSet = wire.NewSet(
2830
wire.Bind(new(module.ModuleActionAuditLogRepository), new(*module.ModuleActionAuditLogRepositoryImpl)),
2931
moduleRepo.NewModuleRepositoryImpl,
3032
wire.Bind(new(moduleRepo.ModuleRepository), new(*moduleRepo.ModuleRepositoryImpl)),
33+
read.NewModuleReadServiceImpl,
34+
wire.Bind(new(read.ModuleReadService), new(*read.ModuleReadServiceImpl)),
3135
moduleRepo.NewModuleResourceStatusRepositoryImpl,
3236
wire.Bind(new(moduleRepo.ModuleResourceStatusRepository), new(*moduleRepo.ModuleResourceStatusRepositoryImpl)),
33-
module.ParseModuleEnvConfig,
37+
bean.ParseModuleEnvConfig,
3438
moduleDataStore.InitModuleDataStore,
3539
module.NewModuleServiceHelperImpl,
3640
wire.Bind(new(module.ModuleServiceHelper), new(*module.ModuleServiceHelperImpl)),

‎api/restHandler/CommonRestHanlder.go

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,29 @@ import (
2525
"go.uber.org/zap"
2626
)
2727

28-
type CommonRestHanlder interface {
28+
type CommonRestHandler interface {
2929
GlobalChecklist(w http.ResponseWriter, r *http.Request)
30+
EnvironmentVariableList(w http.ResponseWriter, r *http.Request)
3031
}
3132

32-
type CommonRestHanlderImpl struct {
33+
type CommonRestHandlerImpl struct {
3334
logger *zap.SugaredLogger
3435
userAuthService user.UserService
3536
commonService commonService.CommonService
3637
}
3738

38-
func NewCommonRestHanlderImpl(
39+
func NewCommonRestHandlerImpl(
3940
logger *zap.SugaredLogger,
4041
userAuthService user.UserService,
41-
commonService commonService.CommonService) *CommonRestHanlderImpl {
42-
return &CommonRestHanlderImpl{
42+
commonService commonService.CommonService) *CommonRestHandlerImpl {
43+
return &CommonRestHandlerImpl{
4344
logger: logger,
4445
userAuthService: userAuthService,
4546
commonService: commonService,
4647
}
4748
}
4849

49-
func (impl CommonRestHanlderImpl) GlobalChecklist(w http.ResponseWriter, r *http.Request) {
50+
func (impl CommonRestHandlerImpl) GlobalChecklist(w http.ResponseWriter, r *http.Request) {
5051
userId, err := impl.userAuthService.GetLoggedInUser(r)
5152
if userId == 0 || err != nil {
5253
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
@@ -61,3 +62,19 @@ func (impl CommonRestHanlderImpl) GlobalChecklist(w http.ResponseWriter, r *http
6162

6263
common.WriteJsonResp(w, err, res, http.StatusOK)
6364
}
65+
66+
func (impl CommonRestHandlerImpl) EnvironmentVariableList(w http.ResponseWriter, r *http.Request) {
67+
userId, err := impl.userAuthService.GetLoggedInUser(r)
68+
if userId == 0 || err != nil {
69+
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
70+
return
71+
}
72+
// TODO: ADD RBAC (if required)
73+
res, err := impl.commonService.EnvironmentVariableList()
74+
if err != nil {
75+
impl.logger.Errorw("service err, EnvironmentVariableList", "err", err)
76+
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
77+
return
78+
}
79+
common.WriteJsonResp(w, err, res, http.StatusOK)
80+
}

‎api/restHandler/CoreAppRestHandler.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import (
2929
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider"
3030
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
3131
pipelineBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
32+
bean3 "github.com/devtron-labs/devtron/pkg/chart/bean"
33+
read5 "github.com/devtron-labs/devtron/pkg/chart/read"
3234
"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
3335
read3 "github.com/devtron-labs/devtron/pkg/team/read"
3436
"net/http"
@@ -101,6 +103,7 @@ type CoreAppRestHandlerImpl struct {
101103
pipelineStageService pipeline.PipelineStageService
102104
ciPipelineRepository pipelineConfig.CiPipelineRepository
103105
teamReadService read3.TeamReadService
106+
chartReadService read5.ChartReadService
104107
}
105108

106109
func NewCoreAppRestHandlerImpl(logger *zap.SugaredLogger, userAuthService user.UserService, validator *validator.Validate, enforcerUtil rbac.EnforcerUtil,
@@ -112,7 +115,8 @@ func NewCoreAppRestHandlerImpl(logger *zap.SugaredLogger, userAuthService user.U
112115
pipelineStageService pipeline.PipelineStageService, ciPipelineRepository pipelineConfig.CiPipelineRepository,
113116
gitProviderReadService read.GitProviderReadService,
114117
gitMaterialReadService read2.GitMaterialReadService,
115-
teamReadService read3.TeamReadService) *CoreAppRestHandlerImpl {
118+
teamReadService read3.TeamReadService,
119+
chartReadService read5.ChartReadService) *CoreAppRestHandlerImpl {
116120
handler := &CoreAppRestHandlerImpl{
117121
logger: logger,
118122
userAuthService: userAuthService,
@@ -136,6 +140,7 @@ func NewCoreAppRestHandlerImpl(logger *zap.SugaredLogger, userAuthService user.U
136140
pipelineStageService: pipelineStageService,
137141
ciPipelineRepository: ciPipelineRepository,
138142
teamReadService: teamReadService,
143+
chartReadService: chartReadService,
139144
}
140145
return handler
141146
}
@@ -551,7 +556,7 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentDeploymentTemplate(appI
551556
return nil, err, http.StatusBadRequest
552557
}
553558

554-
appDeploymentTemplate, err := handler.chartService.FindLatestChartForAppByAppId(appId)
559+
appDeploymentTemplate, err := handler.chartReadService.FindLatestChartForAppByAppId(appId)
555560
if err != nil {
556561
if err != pg.ErrNoRows {
557562
handler.logger.Errorw("service err, GetDeploymentTemplate in GetAppAllDetail", "err", err, "appId", appId, "envId", envId)
@@ -1365,7 +1370,7 @@ func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig
13651370
func (handler CoreAppRestHandlerImpl) createDeploymentTemplate(ctx context.Context, appId int, deploymentTemplate *appBean.DeploymentTemplate, userId int32) (error, int) {
13661371
handler.logger.Infow("Create App - creating deployment template", "appId", appId, "DeploymentStrategy", deploymentTemplate)
13671372

1368-
createDeploymentTemplateRequest := chart.TemplateRequest{
1373+
createDeploymentTemplateRequest := bean3.TemplateRequest{
13691374
AppId: appId,
13701375
ChartRefId: deploymentTemplate.ChartRefId,
13711376
IsAppMetricsEnabled: deploymentTemplate.ShowAppMetrics,
@@ -1839,7 +1844,7 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
18391844
chartEntry, err := handler.chartRepo.FindChartByAppIdAndRefId(appId, chartRefId)
18401845
if err != nil {
18411846
if pg.ErrNoRows == err {
1842-
templateRequest := chart.TemplateRequest{
1847+
templateRequest := bean3.TemplateRequest{
18431848
AppId: appId,
18441849
ChartRefId: chartRefId,
18451850
ValuesOverride: []byte("{}"),

0 commit comments

Comments
 (0)