passing allowInsecureConnection

iamayushm · iamayushm · commit 367c07ed549f · 2024-06-18T17:38:05.000+05:30
diff --git a/api/helm-app/gRPC/applist.pb.go b/api/helm-app/gRPC/applist.pb.go
diff --git a/api/helm-app/gRPC/applist.proto b/api/helm-app/gRPC/applist.proto
@@ -281,6 +281,7 @@ message ChartRepository {
   string url = 2;
   string username = 3;
   string password = 4;
+  bool   allowInsecureConnection = 5;
 }
 
 message InstallReleaseRequest {
diff --git a/api/helm-app/service/HelmAppService.go b/api/helm-app/service/HelmAppService.go
@@ -1020,10 +1020,11 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart
 		}
 	} else {
 		chartRepository = &gRPC.ChartRepository{
-			Name:     appStoreAppVersion.AppStore.ChartRepo.Name,
-			Url:      appStoreAppVersion.AppStore.ChartRepo.Url,
-			Username: appStoreAppVersion.AppStore.ChartRepo.UserName,
-			Password: appStoreAppVersion.AppStore.ChartRepo.Password,
+			Name:                    appStoreAppVersion.AppStore.ChartRepo.Name,
+			Url:                     appStoreAppVersion.AppStore.ChartRepo.Url,
+			Username:                appStoreAppVersion.AppStore.ChartRepo.UserName,
+			Password:                appStoreAppVersion.AppStore.ChartRepo.Password,
+			AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,
 		}
 	}
 
diff --git a/pkg/appStore/installedApp/service/AppStoreDeploymentService.go b/pkg/appStore/installedApp/service/AppStoreDeploymentService.go
@@ -924,10 +924,11 @@ func (impl *AppStoreDeploymentServiceImpl) linkHelmApplicationToChartStore(insta
 	}
 	if chartRepoInfo != nil {
 		updateReleaseRequest.ChartRepository = &bean4.ChartRepository{
-			Name:     chartRepoInfo.Name,
-			Url:      chartRepoInfo.Url,
-			Username: chartRepoInfo.UserName,
-			Password: chartRepoInfo.Password,
+			Name:                    chartRepoInfo.Name,
+			Url:                     chartRepoInfo.Url,
+			Username:                chartRepoInfo.UserName,
+			Password:                chartRepoInfo.Password,
+			AllowInsecureConnection: chartRepoInfo.AllowInsecureConnection,
 		}
 	}
 	res, err := impl.helmAppService.UpdateApplicationWithChartInfo(ctx, installAppVersionRequest.ClusterId, updateReleaseRequest)
diff --git a/pkg/appStore/installedApp/service/EAMode/EAModeDeploymentService.go b/pkg/appStore/installedApp/service/EAMode/EAModeDeploymentService.go
@@ -126,10 +126,11 @@ func (impl *EAModeDeploymentServiceImpl) InstallApp(installAppVersionRequest *ap
 		}
 	} else {
 		chartRepository = &gRPC.ChartRepository{
-			Name:     appStoreAppVersion.AppStore.ChartRepo.Name,
-			Url:      appStoreAppVersion.AppStore.ChartRepo.Url,
-			Username: appStoreAppVersion.AppStore.ChartRepo.UserName,
-			Password: appStoreAppVersion.AppStore.ChartRepo.Password,
+			Name:                    appStoreAppVersion.AppStore.ChartRepo.Name,
+			Url:                     appStoreAppVersion.AppStore.ChartRepo.Url,
+			Username:                appStoreAppVersion.AppStore.ChartRepo.UserName,
+			Password:                appStoreAppVersion.AppStore.ChartRepo.Password,
+			AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,
 		}
 	}
 	installReleaseRequest := &gRPC.InstallReleaseRequest{
@@ -338,10 +339,11 @@ func (impl *EAModeDeploymentServiceImpl) updateApplicationWithChartInfo(ctx cont
 		}
 	} else {
 		chartRepository = &gRPC.ChartRepository{
-			Name:     appStoreApplicationVersion.AppStore.ChartRepo.Name,
-			Url:      appStoreApplicationVersion.AppStore.ChartRepo.Url,
-			Username: appStoreApplicationVersion.AppStore.ChartRepo.UserName,
-			Password: appStoreApplicationVersion.AppStore.ChartRepo.Password,
+			Name:                    appStoreApplicationVersion.AppStore.ChartRepo.Name,
+			Url:                     appStoreApplicationVersion.AppStore.ChartRepo.Url,
+			Username:                appStoreApplicationVersion.AppStore.ChartRepo.UserName,
+			Password:                appStoreApplicationVersion.AppStore.ChartRepo.Password,
+			AllowInsecureConnection: appStoreApplicationVersion.AppStore.ChartRepo.AllowInsecureConnection,
 		}
 	}
 
diff --git a/pkg/appStore/installedApp/service/FullMode/resource/NotesService.go b/pkg/appStore/installedApp/service/FullMode/resource/NotesService.go
@@ -101,10 +101,11 @@ func (impl *InstalledAppResourceServiceImpl) findNotesForArgoApplication(install
 			ValuesYaml:   installedAppVerison.ValuesYaml,
 			K8SVersion:   k8sServerVersion.String(),
 			ChartRepository: &gRPC.ChartRepository{
-				Name:     appStoreAppVersion.AppStore.ChartRepo.Name,
-				Url:      appStoreAppVersion.AppStore.ChartRepo.Url,
-				Username: appStoreAppVersion.AppStore.ChartRepo.UserName,
-				Password: appStoreAppVersion.AppStore.ChartRepo.Password,
+				Name:                    appStoreAppVersion.AppStore.ChartRepo.Name,
+				Url:                     appStoreAppVersion.AppStore.ChartRepo.Url,
+				Username:                appStoreAppVersion.AppStore.ChartRepo.UserName,
+				Password:                appStoreAppVersion.AppStore.ChartRepo.Password,
+				AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,
 			},
 			ReleaseIdentifier: &gRPC.ReleaseIdentifier{
 				ReleaseNamespace: installedAppVerison.InstalledApp.Environment.Namespace,

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ message ChartRepository {`
`281`	`281`	`string url = 2;`
`282`	`282`	`string username = 3;`
`283`	`283`	`string password = 4;`
	`284`	`+ bool allowInsecureConnection = 5;`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`message InstallReleaseRequest {`
Original file line number	Diff line number	Diff line change
`@@ -1020,10 +1020,11 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart`
`1020`	`1020`	`}`
`1021`	`1021`	`} else {`
`1022`	`1022`	`chartRepository = &gRPC.ChartRepository{`
`1023`		`- Name: appStoreAppVersion.AppStore.ChartRepo.Name,`
`1024`		`- Url: appStoreAppVersion.AppStore.ChartRepo.Url,`
`1025`		`- Username: appStoreAppVersion.AppStore.ChartRepo.UserName,`
`1026`		`- Password: appStoreAppVersion.AppStore.ChartRepo.Password,`
	`1023`	`+ Name: appStoreAppVersion.AppStore.ChartRepo.Name,`
	`1024`	`+ Url: appStoreAppVersion.AppStore.ChartRepo.Url,`
	`1025`	`+ Username: appStoreAppVersion.AppStore.ChartRepo.UserName,`
	`1026`	`+ Password: appStoreAppVersion.AppStore.ChartRepo.Password,`
	`1027`	`+ AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,`
`1027`	`1028`	`}`
`1028`	`1029`	`}`
`1029`	`1030`
Original file line number	Diff line number	Diff line change
`@@ -924,10 +924,11 @@ func (impl *AppStoreDeploymentServiceImpl) linkHelmApplicationToChartStore(insta`
`924`	`924`	`}`
`925`	`925`	`if chartRepoInfo != nil {`
`926`	`926`	`updateReleaseRequest.ChartRepository = &bean4.ChartRepository{`
`927`		`- Name: chartRepoInfo.Name,`
`928`		`- Url: chartRepoInfo.Url,`
`929`		`- Username: chartRepoInfo.UserName,`
`930`		`- Password: chartRepoInfo.Password,`
	`927`	`+ Name: chartRepoInfo.Name,`
	`928`	`+ Url: chartRepoInfo.Url,`
	`929`	`+ Username: chartRepoInfo.UserName,`
	`930`	`+ Password: chartRepoInfo.Password,`
	`931`	`+ AllowInsecureConnection: chartRepoInfo.AllowInsecureConnection,`
`931`	`932`	`}`
`932`	`933`	`}`
`933`	`934`	`res, err := impl.helmAppService.UpdateApplicationWithChartInfo(ctx, installAppVersionRequest.ClusterId, updateReleaseRequest)`
Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,11 @@ func (impl EAModeDeploymentServiceImpl) InstallApp(installAppVersionRequest ap`
`126`	`126`	`}`
`127`	`127`	`} else {`
`128`	`128`	`chartRepository = &gRPC.ChartRepository{`
`129`		`- Name: appStoreAppVersion.AppStore.ChartRepo.Name,`
`130`		`- Url: appStoreAppVersion.AppStore.ChartRepo.Url,`
`131`		`- Username: appStoreAppVersion.AppStore.ChartRepo.UserName,`
`132`		`- Password: appStoreAppVersion.AppStore.ChartRepo.Password,`
	`129`	`+ Name: appStoreAppVersion.AppStore.ChartRepo.Name,`
	`130`	`+ Url: appStoreAppVersion.AppStore.ChartRepo.Url,`
	`131`	`+ Username: appStoreAppVersion.AppStore.ChartRepo.UserName,`
	`132`	`+ Password: appStoreAppVersion.AppStore.ChartRepo.Password,`
	`133`	`+ AllowInsecureConnection: appStoreAppVersion.AppStore.ChartRepo.AllowInsecureConnection,`
`133`	`134`	`}`
`134`	`135`	`}`
`135`	`136`	`installReleaseRequest := &gRPC.InstallReleaseRequest{`
`@@ -338,10 +339,11 @@ func (impl *EAModeDeploymentServiceImpl) updateApplicationWithChartInfo(ctx cont`
`338`	`339`	`}`
`339`	`340`	`} else {`
`340`	`341`	`chartRepository = &gRPC.ChartRepository{`
`341`		`- Name: appStoreApplicationVersion.AppStore.ChartRepo.Name,`
`342`		`- Url: appStoreApplicationVersion.AppStore.ChartRepo.Url,`
`343`		`- Username: appStoreApplicationVersion.AppStore.ChartRepo.UserName,`
`344`		`- Password: appStoreApplicationVersion.AppStore.ChartRepo.Password,`
	`342`	`+ Name: appStoreApplicationVersion.AppStore.ChartRepo.Name,`
	`343`	`+ Url: appStoreApplicationVersion.AppStore.ChartRepo.Url,`
	`344`	`+ Username: appStoreApplicationVersion.AppStore.ChartRepo.UserName,`
	`345`	`+ Password: appStoreApplicationVersion.AppStore.ChartRepo.Password,`
	`346`	`+ AllowInsecureConnection: appStoreApplicationVersion.AppStore.ChartRepo.AllowInsecureConnection,`
`345`	`347`	`}`
`346`	`348`	`}`
`347`	`349`