Skip to content

Commit 345e29a

Browse files
authored
fix: link external helm app to chart store (#4919) (#4923)
* fix: link external helm app to chart store * chore: added if else blocks
1 parent 820d3b9 commit 345e29a

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -566,34 +566,34 @@ func (impl *AppStoreDeploymentDBServiceImpl) createEnvironmentIfNotExists(instal
566566
env, err := impl.environmentService.FindOneByNamespaceAndClusterId(namespace, clusterId)
567567
if err != nil && !util.IsErrNoRows(err) {
568568
return nil, err
569-
}
570-
if env.Id != 0 {
569+
} else if env != nil && env.Id != 0 {
571570
return env, nil
572-
}
573-
// create env
574-
cluster, err := impl.clusterService.FindById(clusterId)
575-
if err != nil {
576-
impl.logger.Errorw("error in getting cluster details", "clusterId", clusterId)
577-
return nil, &util.ApiError{
578-
HttpStatusCode: http.StatusBadRequest,
579-
InternalMessage: err.Error(),
580-
UserMessage: "Invalid cluster details!",
571+
} else {
572+
// create env
573+
cluster, err := impl.clusterService.FindById(clusterId)
574+
if err != nil {
575+
impl.logger.Errorw("error in getting cluster details", "clusterId", clusterId)
576+
return nil, &util.ApiError{
577+
HttpStatusCode: http.StatusBadRequest,
578+
InternalMessage: err.Error(),
579+
UserMessage: "Invalid cluster details!",
580+
}
581581
}
582-
}
583582

584-
environmentBean := &clutserBean.EnvironmentBean{
585-
Environment: clusterService.BuildEnvironmentName(cluster.ClusterName, namespace),
586-
ClusterId: clusterId,
587-
Namespace: namespace,
588-
Default: false,
589-
Active: true,
590-
}
591-
envCreateRes, err := impl.environmentService.Create(environmentBean, installAppVersionRequest.UserId)
592-
if err != nil {
593-
return nil, err
594-
}
583+
environmentBean := &clutserBean.EnvironmentBean{
584+
Environment: clusterService.BuildEnvironmentName(cluster.ClusterName, namespace),
585+
ClusterId: clusterId,
586+
Namespace: namespace,
587+
Default: false,
588+
Active: true,
589+
}
590+
envCreateRes, err := impl.environmentService.Create(environmentBean, installAppVersionRequest.UserId)
591+
if err != nil {
592+
return nil, err
593+
}
595594

596-
return envCreateRes, nil
595+
return envCreateRes, nil
596+
}
597597
}
598598

599599
func getAppInstallationMode(appOfferingMode string) string {

0 commit comments

Comments
 (0)