@@ -566,34 +566,34 @@ func (impl *AppStoreDeploymentDBServiceImpl) createEnvironmentIfNotExists(instal
566
566
env , err := impl .environmentService .FindOneByNamespaceAndClusterId (namespace , clusterId )
567
567
if err != nil && ! util .IsErrNoRows (err ) {
568
568
return nil , err
569
- }
570
- if env .Id != 0 {
569
+ } else if env != nil && env .Id != 0 {
571
570
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
+ }
581
581
}
582
- }
583
582
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
+ }
595
594
596
- return envCreateRes , nil
595
+ return envCreateRes , nil
596
+ }
597
597
}
598
598
599
599
func getAppInstallationMode (appOfferingMode string ) string {
0 commit comments