From 372433d987e461f565dd3f1b4ed9d52f3809f201 Mon Sep 17 00:00:00 2001 From: Ash-exp Date: Tue, 9 Apr 2024 19:18:22 +0530 Subject: [PATCH 1/2] fix: link external helm app to chart store --- .../installedApp/service/AppStoreDeploymentDBService.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go b/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go index d77b9bc46d..15a8638138 100644 --- a/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go +++ b/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go @@ -567,7 +567,7 @@ func (impl *AppStoreDeploymentDBServiceImpl) createEnvironmentIfNotExists(instal if err != nil && !util.IsErrNoRows(err) { return nil, err } - if env.Id != 0 { + if env != nil && env.Id != 0 { return env, nil } // create env From 5f64439512046bb9f44454c2b3e22756e05cf8ad Mon Sep 17 00:00:00 2001 From: Ash-exp Date: Tue, 9 Apr 2024 19:54:39 +0530 Subject: [PATCH 2/2] chore: added if else blocks --- .../service/AppStoreDeploymentDBService.go | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go b/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go index 15a8638138..0caf8fbf91 100644 --- a/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go +++ b/pkg/appStore/installedApp/service/AppStoreDeploymentDBService.go @@ -566,34 +566,34 @@ func (impl *AppStoreDeploymentDBServiceImpl) createEnvironmentIfNotExists(instal env, err := impl.environmentService.FindOneByNamespaceAndClusterId(namespace, clusterId) if err != nil && !util.IsErrNoRows(err) { return nil, err - } - if env != nil && env.Id != 0 { + } else if env != nil && env.Id != 0 { return env, nil - } - // create env - cluster, err := impl.clusterService.FindById(clusterId) - if err != nil { - impl.logger.Errorw("error in getting cluster details", "clusterId", clusterId) - return nil, &util.ApiError{ - HttpStatusCode: http.StatusBadRequest, - InternalMessage: err.Error(), - UserMessage: "Invalid cluster details!", + } else { + // create env + cluster, err := impl.clusterService.FindById(clusterId) + if err != nil { + impl.logger.Errorw("error in getting cluster details", "clusterId", clusterId) + return nil, &util.ApiError{ + HttpStatusCode: http.StatusBadRequest, + InternalMessage: err.Error(), + UserMessage: "Invalid cluster details!", + } } - } - environmentBean := &clutserBean.EnvironmentBean{ - Environment: clusterService.BuildEnvironmentName(cluster.ClusterName, namespace), - ClusterId: clusterId, - Namespace: namespace, - Default: false, - Active: true, - } - envCreateRes, err := impl.environmentService.Create(environmentBean, installAppVersionRequest.UserId) - if err != nil { - return nil, err - } + environmentBean := &clutserBean.EnvironmentBean{ + Environment: clusterService.BuildEnvironmentName(cluster.ClusterName, namespace), + ClusterId: clusterId, + Namespace: namespace, + Default: false, + Active: true, + } + envCreateRes, err := impl.environmentService.Create(environmentBean, installAppVersionRequest.UserId) + if err != nil { + return nil, err + } - return envCreateRes, nil + return envCreateRes, nil + } } func getAppInstallationMode(appOfferingMode string) string {