@@ -59,7 +59,7 @@ type AppStoreDeploymentFullModeService interface {
5959 SyncACD (acdAppName string , ctx context.Context )
6060 UpdateValuesYaml (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) (* appStoreBean.InstallAppVersionDTO , error )
6161 UpdateRequirementYaml (installAppVersionRequest * appStoreBean.InstallAppVersionDTO , appStoreAppVersion * appStoreDiscoverRepository.AppStoreApplicationVersion ) error
62- GetGitOpsRepoName (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) string
62+ GetGitOpsRepoName (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) ( string , error )
6363}
6464
6565type AppStoreDeploymentFullModeServiceImpl struct {
@@ -307,30 +307,33 @@ func (impl AppStoreDeploymentFullModeServiceImpl) createInArgo(chartGitAttribute
307307 return nil
308308}
309309
310- func (impl AppStoreDeploymentFullModeServiceImpl ) GetGitOpsRepoName (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) string {
310+ func (impl AppStoreDeploymentFullModeServiceImpl ) GetGitOpsRepoName (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) (string , error ) {
311+ gitOpsRepoName := ""
311312 ctx , err := impl .tokenCache .BuildACDSynchContext ()
312313 if err != nil {
313- impl .logger .Errorw ("error in creating acd synch context" , "err" , err )
314- return ""
314+ impl .logger .Errorw ("error in creating acd sync context" , "err" , err )
315+ return "" , err
315316 }
316317 acdAppName := fmt .Sprintf ("%s-%s" , installAppVersionRequest .AppName , installAppVersionRequest .EnvironmentName )
317- gitOpsRepoName := ""
318318 application , err := impl .acdClient .Get (ctx , & application.ApplicationQuery {Name : & acdAppName })
319319 if err != nil {
320- impl .logger .Errorw ("no argo app exists" , "app " , acdAppName )
321- return ""
320+ impl .logger .Errorw ("no argo app exists" , "acdAppName " , acdAppName , "err" , err )
321+ return "" , err
322322 }
323323 if application != nil {
324324 gitOpsRepoUrl := application .Spec .Source .RepoURL
325325 gitOpsRepoName = impl .chartTemplateService .GetGitOpsRepoNameFromUrl (gitOpsRepoUrl )
326326 }
327- return gitOpsRepoName
327+ return gitOpsRepoName , nil
328328}
329329
330330func (impl AppStoreDeploymentFullModeServiceImpl ) UpdateValuesYaml (installAppVersionRequest * appStoreBean.InstallAppVersionDTO ) (* appStoreBean.InstallAppVersionDTO , error ) {
331331 acdAppName := fmt .Sprintf ("%s-%s" , installAppVersionRequest .AppName , installAppVersionRequest .EnvironmentName )
332332 if len (installAppVersionRequest .GitOpsRepoName ) == 0 {
333- gitOpsRepoName := impl .GetGitOpsRepoName (installAppVersionRequest )
333+ gitOpsRepoName , err := impl .GetGitOpsRepoName (installAppVersionRequest )
334+ if err != nil {
335+ return installAppVersionRequest , err
336+ }
334337 installAppVersionRequest .GitOpsRepoName = gitOpsRepoName
335338 }
336339 valuesOverrideByte , err := yaml .YAMLToJSON ([]byte (installAppVersionRequest .ValuesOverrideYaml ))
0 commit comments