feat: Virtual cluster v3

Wire.go

@@ -25,6 +25,7 @@ import (
 	pubsub1 "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/devtron/api/apiToken"
 	appStoreRestHandler "github.com/devtron-labs/devtron/api/appStore"
+	chartProvider "github.com/devtron-labs/devtron/api/appStore/chartProvider"
 	appStoreDeployment "github.com/devtron-labs/devtron/api/appStore/deployment"
 	appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
 	appStoreValues "github.com/devtron-labs/devtron/api/appStore/values"
@@ -137,6 +138,7 @@ func InitializeApp() (*App, error) {
 		k8s.K8sApplicationWireSet,
 		chartRepo.ChartRepositoryWireSet,
 		appStoreDiscover.AppStoreDiscoverWireSet,
+		chartProvider.AppStoreChartProviderWireSet,
 		appStoreValues.AppStoreValuesWireSet,
 		appStoreDeployment.AppStoreDeploymentWireSet,
 		server.ServerWireSet,
@@ -224,21 +226,10 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(pipeline.CiCdPipelineOrchestrator), new(*pipeline.CiCdPipelineOrchestratorImpl)),
 		pipelineConfig.NewMaterialRepositoryImpl,
 		wire.Bind(new(pipelineConfig.MaterialRepository), new(*pipelineConfig.MaterialRepositoryImpl)),
-
 		router.NewMigrateDbRouterImpl,
 		wire.Bind(new(router.MigrateDbRouter), new(*router.MigrateDbRouterImpl)),
 		restHandler.NewMigrateDbRestHandlerImpl,
 		wire.Bind(new(restHandler.MigrateDbRestHandler), new(*restHandler.MigrateDbRestHandlerImpl)),
-		pipeline.NewDockerRegistryConfigImpl,
-		wire.Bind(new(pipeline.DockerRegistryConfig), new(*pipeline.DockerRegistryConfigImpl)),
-		dockerRegistry.NewDockerRegistryIpsConfigServiceImpl,
-		wire.Bind(new(dockerRegistry.DockerRegistryIpsConfigService), new(*dockerRegistry.DockerRegistryIpsConfigServiceImpl)),
-		dockerRegistryRepository.NewDockerArtifactStoreRepositoryImpl,
-		wire.Bind(new(dockerRegistryRepository.DockerArtifactStoreRepository), new(*dockerRegistryRepository.DockerArtifactStoreRepositoryImpl)),
-		dockerRegistryRepository.NewDockerRegistryIpsConfigRepositoryImpl,
-		wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
-		dockerRegistryRepository.NewOCIRegistryConfigRepositoryImpl,
-		wire.Bind(new(dockerRegistryRepository.OCIRegistryConfigRepository), new(*dockerRegistryRepository.OCIRegistryConfigRepositoryImpl)),
 		util.NewChartTemplateServiceImpl,
 		wire.Bind(new(util.ChartTemplateService), new(*util.ChartTemplateServiceImpl)),
 		util.NewChartDeploymentServiceImpl,
@@ -370,10 +361,6 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(router.GitProviderRouter), new(*router.GitProviderRouterImpl)),
 		restHandler.NewGitProviderRestHandlerImpl,
 		wire.Bind(new(restHandler.GitProviderRestHandler), new(*restHandler.GitProviderRestHandlerImpl)),
-		router.NewDockerRegRouterImpl,
-		wire.Bind(new(router.DockerRegRouter), new(*router.DockerRegRouterImpl)),
-		restHandler.NewDockerRegRestHandlerImpl,
-		wire.Bind(new(restHandler.DockerRegRestHandler), new(*restHandler.DockerRegRestHandlerImpl)),
 
 		router.NewNotificationRouterImpl,
 		wire.Bind(new(router.NotificationRouter), new(*router.NotificationRouterImpl)),
@@ -865,6 +852,23 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(repository5.ManifestPushConfigRepository), new(*repository5.ManifestPushConfigRepositoryImpl)),
 		app.NewGitOpsManifestPushServiceImpl,
 		wire.Bind(new(app.GitOpsPushService), new(*app.GitOpsManifestPushServiceImpl)),
+
+		// start: docker registry wire set injection
+		router.NewDockerRegRouterImpl,
+		wire.Bind(new(router.DockerRegRouter), new(*router.DockerRegRouterImpl)),
+		restHandler.NewDockerRegRestHandlerExtendedImpl,
+		wire.Bind(new(restHandler.DockerRegRestHandler), new(*restHandler.DockerRegRestHandlerExtendedImpl)),
+		pipeline.NewDockerRegistryConfigImpl,
+		wire.Bind(new(pipeline.DockerRegistryConfig), new(*pipeline.DockerRegistryConfigImpl)),
+		dockerRegistry.NewDockerRegistryIpsConfigServiceImpl,
+		wire.Bind(new(dockerRegistry.DockerRegistryIpsConfigService), new(*dockerRegistry.DockerRegistryIpsConfigServiceImpl)),
+		dockerRegistryRepository.NewDockerArtifactStoreRepositoryImpl,
+		wire.Bind(new(dockerRegistryRepository.DockerArtifactStoreRepository), new(*dockerRegistryRepository.DockerArtifactStoreRepositoryImpl)),
+		dockerRegistryRepository.NewDockerRegistryIpsConfigRepositoryImpl,
+		wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
+		dockerRegistryRepository.NewOCIRegistryConfigRepositoryImpl,
+		wire.Bind(new(dockerRegistryRepository.OCIRegistryConfigRepository), new(*dockerRegistryRepository.OCIRegistryConfigRepositoryImpl)),
+		// end: docker registry wire set injection
 	)
 	return &App{}, nil
 }

api/appStore/AppStoreRouter.go

@@ -18,6 +18,7 @@
 package appStore
 
 import (
+	chartProvider "github.com/devtron-labs/devtron/api/appStore/chartProvider"
 	appStoreDeployment "github.com/devtron-labs/devtron/api/appStore/deployment"
 	appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
 	appStoreValues "github.com/devtron-labs/devtron/api/appStore/values"
@@ -33,17 +34,21 @@ type AppStoreRouterImpl struct {
 	appStoreValuesRouter              appStoreValues.AppStoreValuesRouter
 	appStoreDiscoverRouter            appStoreDiscover.AppStoreDiscoverRouter
 	appStoreDeploymentRouter          appStoreDeployment.AppStoreDeploymentRouter
+	chartProviderRouter               chartProvider.ChartProviderRouter
 	appStoreStatusTimelineRestHandler AppStoreStatusTimelineRestHandler
 }
 
 func NewAppStoreRouterImpl(restHandler InstalledAppRestHandler,
-	appStoreValuesRouter appStoreValues.AppStoreValuesRouter, appStoreDiscoverRouter appStoreDiscover.AppStoreDiscoverRouter,
+	appStoreValuesRouter appStoreValues.AppStoreValuesRouter,
+	appStoreDiscoverRouter appStoreDiscover.AppStoreDiscoverRouter,
+	chartProviderRouter chartProvider.ChartProviderRouter,
 	appStoreDeploymentRouter appStoreDeployment.AppStoreDeploymentRouter,
 	appStoreStatusTimelineRestHandler AppStoreStatusTimelineRestHandler) *AppStoreRouterImpl {
 	return &AppStoreRouterImpl{
 		deployRestHandler:                 restHandler,
 		appStoreValuesRouter:              appStoreValuesRouter,
 		appStoreDiscoverRouter:            appStoreDiscoverRouter,
+		chartProviderRouter:               chartProviderRouter,
 		appStoreDeploymentRouter:          appStoreDeploymentRouter,
 		appStoreStatusTimelineRestHandler: appStoreStatusTimelineRestHandler,
 	}
@@ -69,6 +74,11 @@ func (router AppStoreRouterImpl) Init(configRouter *mux.Router) {
 	router.appStoreDiscoverRouter.Init(appStoreDiscoverSubRouter)
 	// discover router ends
 
+	// chart provider router starts
+	chartProviderSubRouter := configRouter.PathPrefix("/chart-provider").Subrouter()
+	router.chartProviderRouter.Init(chartProviderSubRouter)
+	// chart provider router ends
+
 	configRouter.Path("/application/exists").
 		HandlerFunc(router.deployRestHandler.CheckAppExists).Methods("POST")
 	configRouter.Path("/group/install").

api/appStore/chartProvider/ChartProviderRestHandler.go

@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2020 Devtron Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package chartProvider
+
+import (
+	"encoding/json"
+	"github.com/devtron-labs/devtron/api/restHandler/common"
+	"github.com/devtron-labs/devtron/pkg/appStore/chartProvider"
+	"github.com/devtron-labs/devtron/pkg/user"
+	"github.com/devtron-labs/devtron/pkg/user/casbin"
+	"go.uber.org/zap"
+	"gopkg.in/go-playground/validator.v9"
+	"net/http"
+	"strconv"
+)
+
+type ChartProviderRestHandler interface {
+	GetChartProviderList(w http.ResponseWriter, r *http.Request)
+	ToggleChartProvider(w http.ResponseWriter, r *http.Request)
+	SyncChartProvider(w http.ResponseWriter, r *http.Request)
+}
+
+type ChartProviderRestHandlerImpl struct {
+	Logger               *zap.SugaredLogger
+	chartProviderService chartProvider.ChartProviderService
+	validator            *validator.Validate
+	userAuthService      user.UserService
+	enforcer             casbin.Enforcer
+}
+
+func NewChartProviderRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService, validator *validator.Validate, chartProviderService chartProvider.ChartProviderService,
+	enforcer casbin.Enforcer) *ChartProviderRestHandlerImpl {
+	return &ChartProviderRestHandlerImpl{
+		Logger:               Logger,
+		validator:            validator,
+		chartProviderService: chartProviderService,
+		userAuthService:      userAuthService,
+		enforcer:             enforcer,
+	}
+}
+
+func (handler *ChartProviderRestHandlerImpl) GetChartProviderList(w http.ResponseWriter, r *http.Request) {
+	userId, err := handler.userAuthService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
+		return
+	}
+	handler.Logger.Infow("request payload, GetChartProviderList", "userId", userId)
+
+	res, err := handler.chartProviderService.GetChartProviderList()
+	if err != nil {
+		handler.Logger.Errorw("service err, GetChartProviderList", "err", err, "userId", userId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, res, http.StatusOK)
+}
+
+func (handler *ChartProviderRestHandlerImpl) ToggleChartProvider(w http.ResponseWriter, r *http.Request) {
+	decoder := json.NewDecoder(r.Body)
+	userId, err := handler.userAuthService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
+		return
+	}
+	var request chartProvider.ChartProviderRequestDto
+	err = decoder.Decode(&request)
+	if err != nil {
+		handler.Logger.Errorw("request err, ToggleChartProvider", "err", err, "payload", request)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	err = handler.validator.Struct(request)
+	if err != nil {
+		handler.Logger.Errorw("validation err, ToggleChartProvider", "err", err, "payload", request)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	handler.Logger.Infow("request payload, ToggleChartProvider", "payload", request, "userId", userId)
+	token := r.Header.Get("token")
+	//RBAC starts
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*"); !ok {
+		handler.Logger.Infow("user forbidden to toggle chart provider", "userId", userId)
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
+		return
+	}
+	//RBAC ends
+	request.UserId = userId
+	err = ValidateRequestObjectForChartRepoId(&request)
+	if err != nil {
+		handler.Logger.Errorw("request err, ToggleChartProvider", "err", err, "ChartRepoId", request.Id)
+		common.WriteJsonResp(w, err, "Invalid ChartRepoId", http.StatusBadRequest)
+		return
+	}
+	err = handler.chartProviderService.ToggleChartProvider(&request)
+	if err != nil {
+		handler.Logger.Errorw("service err, ToggleChartProvider", "err", err, "userId", userId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, nil, http.StatusOK)
+}
+
+func (handler *ChartProviderRestHandlerImpl) SyncChartProvider(w http.ResponseWriter, r *http.Request) {
+	decoder := json.NewDecoder(r.Body)
+	userId, err := handler.userAuthService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
+		return
+	}
+	var request chartProvider.ChartProviderRequestDto
+	err = decoder.Decode(&request)
+	if err != nil {
+		handler.Logger.Errorw("request err, SyncChartProvider", "err", err, "payload", request)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	err = handler.validator.Struct(request)
+	if err != nil {
+		handler.Logger.Errorw("validation err, SyncChartProvider", "err", err, "payload", request)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	handler.Logger.Infow("request payload, SyncChartProvider", "payload", request, "userId", userId)
+	token := r.Header.Get("token")
+	//RBAC starts
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*"); !ok {
+		handler.Logger.Infow("user forbidden to sync chart provider", "userId", userId)
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
+		return
+	}
+	//RBAC ends
+	request.UserId = userId
+	err = ValidateRequestObjectForChartRepoId(&request)
+	if err != nil {
+		handler.Logger.Errorw("request err, ToggleChartProvider", "err", err, "ChartRepoId", request.Id)
+		common.WriteJsonResp(w, err, "Invalid ChartRepoId", http.StatusBadRequest)
+		return
+	}
+	err = handler.chartProviderService.SyncChartProvider(&request)
+	if err != nil {
+		handler.Logger.Errorw("service err, SyncChartProvider", "err", err, "userId", userId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, nil, http.StatusOK)
+}
+
+func ValidateRequestObjectForChartRepoId(request *chartProvider.ChartProviderRequestDto) error {
+	if !request.IsOCIRegistry {
+		chartRepoId, err := strconv.Atoi(request.Id)
+		if err != nil || chartRepoId <= 0 {
+			return err
+		}
+		request.ChartRepoId = chartRepoId
+	}
+	return nil
+}

api/appStore/chartProvider/ChartProviderRouter.go

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 Devtron Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package chartProvider
+
+import (
+	"github.com/gorilla/mux"
+)
+
+type ChartProviderRouter interface {
+	Init(configRouter *mux.Router)
+}
+
+type ChartProviderRouterImpl struct {
+	chartProviderRestHandler ChartProviderRestHandler
+}
+
+func NewChartProviderRouterImpl(chartProviderRestHandler ChartProviderRestHandler) *ChartProviderRouterImpl {
+	return &ChartProviderRouterImpl{
+		chartProviderRestHandler: chartProviderRestHandler,
+	}
+}
+
+func (router ChartProviderRouterImpl) Init(configRouter *mux.Router) {
+	configRouter.Path("/list").
+		HandlerFunc(router.chartProviderRestHandler.GetChartProviderList).Methods("GET")
+	configRouter.Path("/update").
+		HandlerFunc(router.chartProviderRestHandler.ToggleChartProvider).Methods("POST")
+	configRouter.Path("/sync-chart").
+		HandlerFunc(router.chartProviderRestHandler.SyncChartProvider).Methods("POST")
+}

api/appStore/chartProvider/wire_appStoreChartProvider.go

@@ -0,0 +1,14 @@
+package chartProvider
+
+import (
+	chartProviderService "github.com/devtron-labs/devtron/pkg/appStore/chartProvider"
+	"github.com/google/wire"
+)
+
+var AppStoreChartProviderWireSet = wire.NewSet(
+	chartProviderService.NewChartProviderServiceImpl,
+	wire.Bind(new(chartProviderService.ChartProviderService), new(*chartProviderService.ChartProviderServiceImpl)),
+	NewChartProviderRestHandlerImpl,
+	wire.Bind(new(ChartProviderRestHandler), new(*ChartProviderRestHandlerImpl)),
+	NewChartProviderRouterImpl,
+	wire.Bind(new(ChartProviderRouter), new(*ChartProviderRouterImpl)))

api/appStore/discover/AppStoreRestHandler.go

@@ -83,6 +83,15 @@ func (handler *AppStoreRestHandlerImpl) FindAllApps(w http.ResponseWriter, r *ht
 			}
 		}
 	}
+	var registryIds []string
+	registryIdsStrArr := v.Get("registryId")
+	if len(registryIdsStrArr) > 0 {
+		registryIdStrArr := strings.Split(registryIdsStrArr, ",")
+		for _, registryId := range registryIdStrArr {
+			registryIds = append(registryIds, registryId)
+		}
+	}
+
 	appStoreName := strings.ToLower(v.Get("appStoreName"))
 
 	offset := 0
@@ -95,7 +104,12 @@ func (handler *AppStoreRestHandlerImpl) FindAllApps(w http.ResponseWriter, r *ht
 	if len(sizeStr) > 0 {
 		size, _ = strconv.Atoi(sizeStr)
 	}
-	filter := &appStoreBean.AppStoreFilter{IncludeDeprecated: deprecated, ChartRepoId: chartRepoIds, AppStoreName: appStoreName}
+	filter := &appStoreBean.AppStoreFilter{
+		IncludeDeprecated: deprecated,
+		ChartRepoId:       chartRepoIds,
+		RegistryId:        registryIds,
+		AppStoreName:      appStoreName,
+	}
 	if size > 0 {
 		filter.Size = size
 		filter.Offset = offset

api/chartRepo/ChartRepositoryRestHandler.go

@@ -286,7 +286,11 @@ func (handler *ChartRepositoryRestHandlerImpl) TriggerChartSyncManual(w http.Res
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
-	err2 := handler.chartRepositoryService.TriggerChartSyncManual()
+	chartProviderConfig := &chartRepo.ChartProviderConfig{
+		ChartProviderId: "*",
+		IsOCIRegistry:   true,
+	}
+	err2 := handler.chartRepositoryService.TriggerChartSyncManual(chartProviderConfig)
 	if err2 != nil {
 		common.WriteJsonResp(w, err2, nil, http.StatusInternalServerError)
 	} else {