Merge pull request #940 from ZupIT/removing-unused-chart

Removing unused chart

.github/workflows/compass-ci.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Run Unit tests
         working-directory: ./compass
         run: |
-          go test -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/health,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=coverage.cov
+          go test -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=coverage.cov
 
       - name: Tests coverage
         uses: codecov/codecov-action@v1

compass/Makefile

@@ -32,9 +32,9 @@ tests-dep-up:
 tests-dep-down:
 				docker-compose -f $(COMPOSE_TESTS) down
 cover:
-				$(GOTEST) -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/health,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=cover.out
+				$(GOTEST) -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=cover.out
 				$(GOTOOL) cover -func=cover.out
 cover-browser:
-				$(GOTEST) -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/health,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=cover.out
+				$(GOTEST) -v -coverpkg ./internal/action,./internal/datasource,./internal/dispatcher,./internal/metric,./internal/metricsgroup,./internal/metricsgroupaction,./internal/moove,./internal/plugin ./internal/tests/ -coverprofile=cover.out
 				$(GOTOOL) cover -html=cover.out -o cover.html
 				open cover.html

compass/cmd/main.go

@@ -32,7 +32,6 @@ import (
 	"github.com/ZupIT/charlescd/compass/internal/configuration"
 	"github.com/ZupIT/charlescd/compass/internal/datasource"
 	"github.com/ZupIT/charlescd/compass/internal/dispatcher"
-	"github.com/ZupIT/charlescd/compass/internal/health"
 	"github.com/ZupIT/charlescd/compass/internal/metric"
 	"github.com/ZupIT/charlescd/compass/internal/metricsgroup"
 	"github.com/ZupIT/charlescd/compass/internal/metricsgroupaction"
@@ -82,8 +81,6 @@ func main() {
 	actionMain := action.NewMain(db, pluginMain)
 	metricsGroupActionMain := metricsgroupaction.NewMain(db, pluginMain, actionMain)
 	metricsgroupMain := metricsgroup.NewMain(db, metricMain, datasourceMain, pluginMain, metricsGroupActionMain)
-	mooveClient := moove.NewAPIClient(configuration.GetConfiguration("MOOVE_URL"), 15*time.Second)
-	healthMain := health.NewMain(db, datasourceMain, pluginMain, mooveClient)
 	metricDispatcher := dispatcher.NewDispatcher(metricMain)
 	actionDispatcher := dispatcher.NewActionDispatcher(metricsgroupMain, actionMain, pluginMain, metricMain, metricsGroupActionMain)
 
@@ -101,7 +98,6 @@ func main() {
 		metricsGroupActionMain,
 		metricsgroupMain,
 		mooveMain,
-		healthMain,
 	)
 
 	api.Start(router)

compass/internal/datasource/datasource.go

@@ -22,7 +22,6 @@ import (
 	"database/sql"
 	"encoding/json"
 	"io"
-	"strconv"
 	"time"
 
 	"github.com/ZupIT/charlescd/compass/internal/util"
@@ -35,7 +34,6 @@ type DataSource struct {
 	util.BaseModel
 	Name        string     `json:"name"`
 	PluginSrc   string     `json:"pluginSrc"`
-	Health      bool       `json:"healthy"`
 	Data        []byte     `json:"data" gorm:"type:bytea"`
 	WorkspaceID uuid.UUID  `json:"workspaceId"`
 	DeletedAt   *time.Time `json:"-"`
@@ -45,7 +43,6 @@ type Request struct {
 	util.BaseModel
 	Name        string          `json:"name"`
 	PluginSrc   string          `json:"pluginSrc"`
-	Health      bool            `json:"healthy"`
 	Data        json.RawMessage `json:"data"`
 	WorkspaceID uuid.UUID       `json:"workspaceId"`
 	DeletedAt   *time.Time      `json:"-"`
@@ -55,7 +52,6 @@ type Response struct {
 	util.BaseModel
 	Name        string          `json:"name"`
 	PluginSrc   string          `json:"pluginSrc"`
-	Health      bool            `json:"healthy"`
 	Data        json.RawMessage `json:"data"`
 	WorkspaceID uuid.UUID       `json:"workspaceId"`
 	DeletedAt   *time.Time      `json:"-"`
@@ -112,20 +108,15 @@ func (main Main) Parse(dataSource io.ReadCloser) (Request, errors.Error) {
 	return *newDataSource, nil
 }
 
-func (main Main) FindAllByWorkspace(workspaceID uuid.UUID, health string) ([]Response, errors.Error) {
+func (main Main) FindAllByWorkspace(workspaceID uuid.UUID) ([]Response, errors.Error) {
 	var rows *sql.Rows
 	var err error
 	dataSources := make([]Response, 0)
 
-	if health == "" {
-		rows, err = main.db.Raw(workspaceDatasourceQuery, workspaceID).Rows()
-	} else {
-		healthValue, _ := strconv.ParseBool(health)
-		rows, err = main.db.Raw(workspaceAndHealthDatasourceQuery, workspaceID, healthValue).Rows()
-	}
+	rows, err = main.db.Raw(workspaceDatasourceQuery, workspaceID).Rows()
 	if err != nil {
-		return []Response{}, errors.NewError("Find all error", err.Error()).
-			WithOperations("FindAllByWorkspace.Raw")
+        return []Response{}, errors.NewError("Find all error", err.Error()).
+		WithOperations("FindAllByWorkspace.Raw")
 	}
 
 	for rows.Next() {
@@ -148,7 +139,7 @@ func (main Main) FindById(id string) (Response, errors.Error) {
 	row := main.db.Raw(datasourceDecryptedQuery, id).Row()
 
 	dbError := row.Scan(&dataSource.ID, &dataSource.Name, &dataSource.CreatedAt, &dataSource.Data,
-		&dataSource.WorkspaceID, &dataSource.Health, &dataSource.DeletedAt, &dataSource.PluginSrc)
+		&dataSource.WorkspaceID, &dataSource.DeletedAt, &dataSource.PluginSrc)
 	if dbError != nil {
 		return Response{}, errors.NewError("Find by id error", dbError.Error()).
 			WithOperations("FindById.ScanRows")
@@ -157,20 +148,6 @@ func (main Main) FindById(id string) (Response, errors.Error) {
 	return dataSource.toResponse(), nil
 }
 
-func (main Main) FindHealthByWorkspaceId(workspaceID uuid.UUID) (Response, errors.Error) {
-	dataSource := DataSource{}
-	row := main.db.Raw(decryptedWorkspaceAndHealthDatasourceQuery, workspaceID, true).Row()
-
-	dbError := row.Scan(&dataSource.ID, &dataSource.Name, &dataSource.CreatedAt, &dataSource.Data,
-		&dataSource.WorkspaceID, &dataSource.Health, &dataSource.DeletedAt, &dataSource.PluginSrc)
-	if dbError != nil {
-		return Response{}, errors.NewError("Find error", dbError.Error()).
-			WithOperations("FindHealthByWorkspaceId.Row")
-	}
-
-	return dataSource.toResponse(), nil
-}
-
 func (main Main) Delete(id string) errors.Error {
 	db := main.db.Model(&DataSource{}).Where("id = ?", id).Delete(&DataSource{})
 	if db.Error != nil {
@@ -230,38 +207,17 @@ func (main Main) TestConnection(pluginSrc string, datasourceData json.RawMessage
 	return nil
 }
 
-func (main Main) VerifyHealthAtWorkspace(workspaceId string) (bool, errors.Error) {
-	var count int8
-	result := main.db.Table("data_sources").Where("workspace_id = ? AND health = true AND deleted_at IS NULL", workspaceId).Count(&count)
-	if result.Error != nil {
-		return false, errors.NewError("Verify health error", result.Error.Error()).
-			WithOperations("VerifyHealthAtWorkspace.Count")
-	}
-
-	return count != 0, nil
-}
-
 func (main Main) Save(dataSource Request) (Response, errors.Error) {
-	if dataSource.Health == true {
-		hasHealth, err := main.VerifyHealthAtWorkspace(dataSource.WorkspaceID.String())
-		if err != nil {
-			return Response{}, err.WithOperations("Save.Count")
-		}
 
-		if hasHealth {
-			return Response{}, errors.NewError("Cannot save", "Has datasource health in workspace").
-				WithOperations("Save.VerifyHealthAtWorkspace")
-		}
-	}
 	id := uuid.New().String()
 	entity := DataSource{}
 
-	row := main.db.Exec(Insert(id, dataSource.Name, dataSource.PluginSrc, dataSource.Data, dataSource.Health, dataSource.WorkspaceID)).
+	row := main.db.Exec(Insert(id, dataSource.Name, dataSource.PluginSrc, dataSource.Data,  dataSource.WorkspaceID)).
 		Raw(datasourceSaveQuery, id).
 		Row()
 
 	dbError := row.Scan(&entity.ID, &entity.Name, &entity.CreatedAt,
-		&entity.WorkspaceID, &entity.Health, &entity.DeletedAt, &entity.PluginSrc)
+		&entity.WorkspaceID, &entity.DeletedAt, &entity.PluginSrc)
 	if dbError != nil {
 		return Response{}, errors.NewError("Save error", dbError.Error()).
 			WithOperations("Save.Scan")
@@ -275,7 +231,6 @@ func (entity DataSource) toResponse() Response {
 		BaseModel:   entity.BaseModel,
 		Name:        entity.Name,
 		PluginSrc:   entity.PluginSrc,
-		Health:      entity.Health,
 		Data:        entity.Data,
 		WorkspaceID: entity.WorkspaceID,
 		DeletedAt:   entity.DeletedAt,

compass/internal/datasource/main.go

@@ -31,8 +31,7 @@ import (
 
 type UseCases interface {
 	Parse(dataSource io.ReadCloser) (Request, errors.Error)
-	FindAllByWorkspace(workspaceID uuid.UUID, health string) ([]Response, errors.Error)
-	FindHealthByWorkspaceId(workspaceID uuid.UUID) (Response, errors.Error)
+	FindAllByWorkspace(workspaceID uuid.UUID) ([]Response, errors.Error)
 	FindById(id string) (Response, errors.Error)
 	Save(dataSource Request) (Response, errors.Error)
 	Delete(id string) errors.Error

compass/internal/datasource/queries.go

@@ -10,7 +10,6 @@ const datasourceSaveQuery = `SELECT id,
 	  							name,
 	  							created_at,
 	  							workspace_id,
-	  							health,
 	  							deleted_at,
 	  							plugin_src
 						FROM data_sources
@@ -22,7 +21,6 @@ var datasourceDecryptedQuery = fmt.Sprintf(`SELECT id,
 	  							created_at,
 	  							PGP_SYM_DECRYPT(data, '%s'),
 	  							workspace_id,
-	  							health,
 	  							deleted_at,
 	  							plugin_src
 						FROM data_sources
@@ -33,34 +31,12 @@ const workspaceDatasourceQuery = `SELECT id,
 	  							name,
 	  							created_at,
 	  							workspace_id,
-	  							health,
 	  							deleted_at,
 	  							plugin_src FROM "data_sources" WHERE "workspace_id" = ? AND "deleted_at" IS NULL`
 
-const workspaceAndHealthDatasourceQuery = `SELECT id,
-												name,
-	  											created_at,
-	  											workspace_id,
-	  											health,
-	  											plugin_src
-											FROM data_sources
-											WHERE workspace_id = ?
-											AND health = ?`
 
-var decryptedWorkspaceAndHealthDatasourceQuery = fmt.Sprintf(`SELECT id,
-	  												name,
-	  												created_at,
-	  												PGP_SYM_DECRYPT(data, '%s'),
-	  												workspace_id,
-	  												health,
-	  												deleted_at,
-	  												plugin_src
-												FROM data_sources
-												WHERE workspace_id = ?
-												AND health = ?`, configuration.GetConfiguration("ENCRYPTION_KEY"))
-
-func Insert(id, name, pluginSrc string, data []byte, health bool, workspaceId uuid.UUID) string {
-	return fmt.Sprintf(`INSERT INTO data_sources (id, name, data, workspace_id, health, deleted_at, plugin_src)
-							VALUES ('%s', '%s', PGP_SYM_ENCRYPT('%s', '%s', 'cipher-algo=aes256'), '%s', %t, null, '%s');`,
-		id, name, data, configuration.GetConfiguration("ENCRYPTION_KEY"), workspaceId, health, pluginSrc)
+func Insert(id, name, pluginSrc string, data []byte, workspaceId uuid.UUID) string {
+	return fmt.Sprintf(`INSERT INTO data_sources (id, name, data, workspace_id, deleted_at, plugin_src)
+							VALUES ('%s', '%s', PGP_SYM_ENCRYPT('%s', '%s', 'cipher-algo=aes256'), '%s', null, '%s');`,
+		id, name, data, configuration.GetConfiguration("ENCRYPTION_KEY"), workspaceId, pluginSrc)
 }