Skip to content

Commit d32f9a3

Browse files
acd context fix for gitops repo name (#1446)
1 parent 6d9728a commit d32f9a3

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

pkg/appStore/deployment/fullMode/AppStoreDeploymentFullModeService.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ type AppStoreDeploymentFullModeServiceImpl struct {
7676
gitOpsRepository repository3.GitOpsConfigRepository
7777
globalEnvVariables *util3.GlobalEnvVariables
7878
installedAppRepository appStoreRepository.InstalledAppRepository
79+
tokenCache *util2.TokenCache
7980
}
8081

8182
func NewAppStoreDeploymentFullModeServiceImpl(logger *zap.SugaredLogger,
@@ -87,7 +88,7 @@ func NewAppStoreDeploymentFullModeServiceImpl(logger *zap.SugaredLogger,
8788
argoK8sClient argocdServer.ArgoK8sClient,
8889
gitFactory *util.GitFactory, aCDAuthConfig *util2.ACDAuthConfig,
8990
gitOpsRepository repository3.GitOpsConfigRepository, globalEnvVariables *util3.GlobalEnvVariables,
90-
installedAppRepository appStoreRepository.InstalledAppRepository) *AppStoreDeploymentFullModeServiceImpl {
91+
installedAppRepository appStoreRepository.InstalledAppRepository, tokenCache *util2.TokenCache) *AppStoreDeploymentFullModeServiceImpl {
9192
return &AppStoreDeploymentFullModeServiceImpl{
9293
logger: logger,
9394
chartTemplateService: chartTemplateService,
@@ -102,6 +103,7 @@ func NewAppStoreDeploymentFullModeServiceImpl(logger *zap.SugaredLogger,
102103
gitOpsRepository: gitOpsRepository,
103104
globalEnvVariables: globalEnvVariables,
104105
installedAppRepository: installedAppRepository,
106+
tokenCache: tokenCache,
105107
}
106108
}
107109

@@ -306,9 +308,14 @@ func (impl AppStoreDeploymentFullModeServiceImpl) createInArgo(chartGitAttribute
306308
}
307309

308310
func (impl AppStoreDeploymentFullModeServiceImpl) GetGitOpsRepoName(installAppVersionRequest *appStoreBean.InstallAppVersionDTO) string {
311+
ctx, err := impl.tokenCache.BuildACDSynchContext()
312+
if err != nil {
313+
impl.logger.Errorw("error in creating acd synch context", "err", err)
314+
return ""
315+
}
309316
acdAppName := fmt.Sprintf("%s-%s", installAppVersionRequest.AppName, installAppVersionRequest.EnvironmentName)
310317
gitOpsRepoName := ""
311-
application, err := impl.acdClient.Get(context.Background(), &application.ApplicationQuery{Name: &acdAppName})
318+
application, err := impl.acdClient.Get(ctx, &application.ApplicationQuery{Name: &acdAppName})
312319
if err != nil {
313320
impl.logger.Errorw("no argo app exists", "app", acdAppName)
314321
return ""

0 commit comments

Comments
 (0)