chore: resource sql migration script

Wire.go

@@ -960,7 +960,7 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(repository9.DevtronResourceSearchableKeyRepository), new(*repository9.DevtronResourceSearchableKeyRepositoryImpl)),
 
 		devtronResource.NewDevtronResourceSearchableKeyServiceImpl,
-		wire.Bind(new(devtronResource.DevtronResourceService), new(*devtronResource.DevtronResourceSearchableKeyServiceImpl)),
+		wire.Bind(new(devtronResource.DevtronResourceSearchableKeyService), new(*devtronResource.DevtronResourceSearchableKeyServiceImpl)),
 
 		argocdServer.NewArgoClientWrapperServiceImpl,
 		wire.Bind(new(argocdServer.ArgoClientWrapperService), new(*argocdServer.ArgoClientWrapperServiceImpl)),

pkg/devtronResource/DevtronResourceService.go → pkg/devtronResource/DevtronResourceSearchableKeyService.go

@@ -6,7 +6,7 @@ import (
 	"go.uber.org/zap"
 )
 
-type DevtronResourceService interface {
+type DevtronResourceSearchableKeyService interface {
 	GetAllSearchableKeyNameIdMap() map[bean.DevtronResourceSearchableKeyName]int
 	GetAllSearchableKeyIdNameMap() map[int]bean.DevtronResourceSearchableKeyName
 }

pkg/resourceGroup/ResourceGroupService.go

@@ -42,23 +42,23 @@ type ResourceGroupService interface {
 	DeleteResourceGroup(resourceGroupId int, groupType ResourceGroupType, emailId string, checkAuthBatch func(emailId string, appObject []string, action string) map[string]bool) (bool, error)
 }
 type ResourceGroupServiceImpl struct {
-	logger                         *zap.SugaredLogger
-	resourceGroupRepository        resourceGroup.ResourceGroupRepository
-	resourceGroupMappingRepository resourceGroup.ResourceGroupMappingRepository
-	enforcerUtil                   rbac.EnforcerUtil
-	devtronResourceService         devtronResource.DevtronResourceService
+	logger                              *zap.SugaredLogger
+	resourceGroupRepository             resourceGroup.ResourceGroupRepository
+	resourceGroupMappingRepository      resourceGroup.ResourceGroupMappingRepository
+	enforcerUtil                        rbac.EnforcerUtil
+	devtronResourceSearchableKeyService devtronResource.DevtronResourceSearchableKeyService
 }
 
 func NewResourceGroupServiceImpl(logger *zap.SugaredLogger, resourceGroupRepository resourceGroup.ResourceGroupRepository,
 	resourceGroupMappingRepository resourceGroup.ResourceGroupMappingRepository, enforcerUtil rbac.EnforcerUtil,
-	devtronResourceService devtronResource.DevtronResourceService,
+	devtronResourceSearchableKeyService devtronResource.DevtronResourceSearchableKeyService,
 ) *ResourceGroupServiceImpl {
 	return &ResourceGroupServiceImpl{
-		logger:                         logger,
-		resourceGroupRepository:        resourceGroupRepository,
-		resourceGroupMappingRepository: resourceGroupMappingRepository,
-		enforcerUtil:                   enforcerUtil,
-		devtronResourceService:         devtronResourceService,
+		logger:                              logger,
+		resourceGroupRepository:             resourceGroupRepository,
+		resourceGroupMappingRepository:      resourceGroupMappingRepository,
+		enforcerUtil:                        enforcerUtil,
+		devtronResourceSearchableKeyService: devtronResourceSearchableKeyService,
 	}
 }
 
@@ -129,7 +129,7 @@ type ResourceGroupDto struct {
 
 func (impl *ResourceGroupServiceImpl) CreateResourceGroup(request *ResourceGroupDto) (*ResourceGroupDto, error) {
 
-	resourceKeyToId := impl.devtronResourceService.GetAllSearchableKeyNameIdMap()
+	resourceKeyToId := impl.devtronResourceSearchableKeyService.GetAllSearchableKeyNameIdMap()
 	err := impl.checkAuthForResourceGroup(request, casbin.ActionCreate)
 	if err != nil {
 		return nil, err
@@ -195,7 +195,7 @@ func (impl *ResourceGroupServiceImpl) CreateResourceGroup(request *ResourceGroup
 
 func (impl *ResourceGroupServiceImpl) UpdateResourceGroup(request *ResourceGroupDto) (*ResourceGroupDto, error) {
 
-	resourceKeyToId := impl.devtronResourceService.GetAllSearchableKeyNameIdMap()
+	resourceKeyToId := impl.devtronResourceSearchableKeyService.GetAllSearchableKeyNameIdMap()
 
 	// fetching existing resourceIds in resource group
 	mappings, err := impl.resourceGroupMappingRepository.FindByResourceGroupId(request.Id)
@@ -283,7 +283,7 @@ func (impl *ResourceGroupServiceImpl) UpdateResourceGroup(request *ResourceGroup
 }
 
 func (impl *ResourceGroupServiceImpl) GetActiveResourceGroupList(emailId string, checkAuthBatch func(emailId string, appObject []string, action string) map[string]bool, parentResourceId int, groupType ResourceGroupType) ([]*ResourceGroupDto, error) {
-	resourceKeyToId := impl.devtronResourceService.GetAllSearchableKeyNameIdMap()
+	resourceKeyToId := impl.devtronResourceSearchableKeyService.GetAllSearchableKeyNameIdMap()
 	resourceGroupDtos := make([]*ResourceGroupDto, 0)
 	var resourceGroupIds []int
 	resourceGroups, err := impl.resourceGroupRepository.FindActiveListByParentResource(parentResourceId, groupType.getResourceKey(resourceKeyToId))

pkg/resourceQualifiers/QualifierMappingService.go

@@ -14,16 +14,16 @@ type QualifierMappingService interface {
 }
 
 type QualifierMappingServiceImpl struct {
-	logger                     *zap.SugaredLogger
-	qualifierMappingRepository QualifiersMappingRepository
-	devtronResourceService     devtronResource.DevtronResourceService
+	logger                              *zap.SugaredLogger
+	qualifierMappingRepository          QualifiersMappingRepository
+	devtronResourceSearchableKeyService devtronResource.DevtronResourceSearchableKeyService
 }
 
-func NewQualifierMappingServiceImpl(logger *zap.SugaredLogger, qualifierMappingRepository QualifiersMappingRepository, devtronResourceService devtronResource.DevtronResourceService) (*QualifierMappingServiceImpl, error) {
+func NewQualifierMappingServiceImpl(logger *zap.SugaredLogger, qualifierMappingRepository QualifiersMappingRepository, devtronResourceSearchableKeyService devtronResource.DevtronResourceSearchableKeyService) (*QualifierMappingServiceImpl, error) {
 	return &QualifierMappingServiceImpl{
-		logger:                     logger,
-		qualifierMappingRepository: qualifierMappingRepository,
-		devtronResourceService:     devtronResourceService,
+		logger:                              logger,
+		qualifierMappingRepository:          qualifierMappingRepository,
+		devtronResourceSearchableKeyService: devtronResourceSearchableKeyService,
 	}, nil
 }
 
@@ -32,7 +32,7 @@ func (impl QualifierMappingServiceImpl) CreateQualifierMappings(qualifierMapping
 }
 
 func (impl QualifierMappingServiceImpl) GetQualifierMappings(resourceType ResourceType, scope *Scope, resourceIds []int) ([]*QualifierMapping, error) {
-	searchableKeyNameIdMap := impl.devtronResourceService.GetAllSearchableKeyNameIdMap()
+	searchableKeyNameIdMap := impl.devtronResourceSearchableKeyService.GetAllSearchableKeyNameIdMap()
 	return impl.qualifierMappingRepository.GetQualifierMappings(resourceType, scope, searchableKeyNameIdMap, resourceIds)
 }
 

pkg/variables/ScopedVariableService.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/argoproj/argo-workflows/v3/errors"
 	"github.com/caarlos0/env"
-	"github.com/devtron-labs/devtron/pkg/devtronResource"
 	"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/devtron-labs/devtron/pkg/variables/cache"
@@ -33,7 +32,6 @@ type ScopedVariableServiceImpl struct {
 	logger                   *zap.SugaredLogger
 	scopedVariableRepository repository2.ScopedVariableRepository
 	qualifierMappingService  resourceQualifiers.QualifierMappingService
-	devtronResourceService   devtronResource.DevtronResourceService
 	VariableNameConfig       *VariableConfig
 	VariableCache            *cache.VariableCacheObj
 }

scripts/sql/187_create_resource.down.sql

@@ -0,0 +1,7 @@
+DROP TABLE "public"."devtron_resource_object_audit";
+
+DROP TABLE "public"."devtron_resource_object";
+
+DROP TABLE "public"."devtron_resource_schema";
+
+DROP TABLE "public"."devtron_resource";