Merge pull request #774 from n2h9/revert-2a055d0

Revert "Merge pull request #757 from Malka123456/fix-model-equalfold"

Author: n2h9

registry/component.go

@@ -259,7 +259,7 @@ func (mch *ComponentCSVHelper) GetColumns() ([]string, error) {
 	return csvReader.ExtractCols(rowIndex)
 }
 
-func (mch *ComponentCSVHelper) ParseComponentsSheet(modelNames ...string) error {
+func (mch *ComponentCSVHelper) ParseComponentsSheet(modelName string) error {
 	ch := make(chan ComponentCSV, 1)
 	errorChan := make(chan error, 1)
 	csvReader, err := csv.NewCSVParser[ComponentCSV](mch.CSVPath, rowIndex, nil, func(_ []string, _ []string) bool {
@@ -283,18 +283,9 @@ func (mch *ComponentCSVHelper) ParseComponentsSheet(modelNames ...string) error
 		select {
 
 		case data := <-ch:
-			if len(modelNames) > 0 {
-			match := false
-			for _, m := range modelNames {
-				if strings.EqualFold(data.Model, m) {
-					match = true
-					break 
-				}
-			}
-			if !match {
+			if modelName != "" && data.Model != modelName {
 				continue
 			}
-		}
 			if mch.Components[data.Registrant] == nil {
 				mch.Components[data.Registrant] = make(map[string][]ComponentCSV, 0)
 			}

registry/model.go

@@ -29,8 +29,6 @@ import (
 	_model "github.com/meshery/schemas/models/v1beta1/model"
 	"github.com/meshery/schemas/models/v1beta1/subcategory"
 	log "github.com/sirupsen/logrus"
-	//showing error below import 
-	//"github.com/spf13/viper/internal/features"
 	"golang.org/x/sync/semaphore"
 	"google.golang.org/api/sheets/v4"
 )
@@ -243,7 +241,7 @@ func NewModelCSVHelper(sheetURL, spreadsheetName string, spreadsheetID int64, lo
 	}, nil
 }
 
-func (mch *ModelCSVHelper) ParseModelsSheet(parseForDocs bool, modelNames ...string) error {
+func (mch *ModelCSVHelper) ParseModelsSheet(parseForDocs bool, modelName string) error {
 	ch := make(chan ModelCSV, 1)
 	errorChan := make(chan error, 1)
 	csvReader, err := csv.NewCSVParser[ModelCSV](mch.CSVPath, rowIndex, nil, func(columns []string, currentRow []string) bool {
@@ -276,18 +274,9 @@ func (mch *ModelCSVHelper) ParseModelsSheet(parseForDocs bool, modelNames ...str
 		select {
 
 		case data := <-ch:
-			if len(modelNames) > 0 {
-			match := false
-			for _, m := range modelNames {
-				if strings.EqualFold(data.Model, m) {
-					match = true
-					break 
-				}
-			}
-			if !match {
+			if modelName != "" && data.Model != modelName {
 				continue
 			}
-		}
 			mch.Models = append(mch.Models, data)
 		case err := <-errorChan:
 			return files.ErrFileRead(err)
@@ -741,36 +730,36 @@ NewGen:
 
 	return &modelDef, false, nil
 }
-func parseModelSheet(url string, sheetGID int64, modelCSVFilePath string, modelNames ...string) (*ModelCSVHelper, error) {
+func parseModelSheet(url string, modelName string, sheetGID int64, modelCSVFilePath string) (*ModelCSVHelper, error) {
 	modelCSVHelper, err := NewModelCSVHelper(url, "Models", sheetGID, modelCSVFilePath)
 	if err != nil {
 		return nil, err
 	}
 
-	err = modelCSVHelper.ParseModelsSheet(false, modelNames...)
+	err = modelCSVHelper.ParseModelsSheet(false, modelName)
 	if err != nil {
 		return nil, ErrGenerateModel(err, "unable to start model generation")
 	}
 	return modelCSVHelper, nil
 }
-func parseComponentSheet(url string, componentSpredsheetGID int64, componentCSVFilePath string, modelNames ...string) (*ComponentCSVHelper, error) {
+func parseComponentSheet(url string, modelName string, componentSpredsheetGID int64, componentCSVFilePath string) (*ComponentCSVHelper, error) {
 	compCSVHelper, err := NewComponentCSVHelper(url, "Components", componentSpredsheetGID, componentCSVFilePath)
 	if err != nil {
 		return nil, err
 	}
 
-	err = compCSVHelper.ParseComponentsSheet(modelNames...)
+	err = compCSVHelper.ParseComponentsSheet(modelName)
 	if err != nil {
 		return nil, ErrGenerateModel(err, "unable to start model generation")
 	}
 	return compCSVHelper, nil
 }
-func parseRelationshipSheet(url string, relationshipSpredsheetGID int64, relationshipCSVFilePath string, modelNames ...string) (*RelationshipCSVHelper, error) {
+func parseRelationshipSheet(url string, modelName string, relationshipSpredsheetGID int64, relationshipCSVFilePath string) (*RelationshipCSVHelper, error) {
 	relationshipCSVHelper, err := NewRelationshipCSVHelper(url, "Relationships", relationshipSpredsheetGID, relationshipCSVFilePath)
 	if err != nil {
 		return nil, err
 	}
-	err = relationshipCSVHelper.ParseRelationshipsSheet(modelNames...)
+	err = relationshipCSVHelper.ParseRelationshipsSheet(modelName)
 	if err != nil {
 		return nil, ErrGenerateModel(err, "unable to start model generation")
 	}
@@ -800,7 +789,7 @@ func logModelGenerationSummary(modelToCompGenerateTracker *store.GenerticThreadS
 //  3. Handling Relationships: Relationships marked with * as the version are written to all versions, with the filenames updated in the sheet.
 //
 // If their is ever an error with the writing of file back to spreadsheet of column mismatch just update utils.ComponentCSV struct.
-func InvokeGenerationFromSheet(wg *sync.WaitGroup, path string, modelsheetID, componentSheetID int64, spreadsheeetID string, modelCSVFilePath, componentCSVFilePath, spreadsheeetCred, relationshipCSVFilePath string, relationshipSheetID int64, srv *sheets.Service, modelNames ...string) error {
+func InvokeGenerationFromSheet(wg *sync.WaitGroup, path string, modelsheetID, componentSheetID int64, spreadsheeetID string, modelName string, modelCSVFilePath, componentCSVFilePath, spreadsheeetCred, relationshipCSVFilePath string, relationshipSheetID int64, srv *sheets.Service) error {
 	weightedSem := semaphore.NewWeighted(20)
 	url := GoogleSpreadSheetURL + spreadsheeetID
 	totalAvailableModels := 0
@@ -817,21 +806,16 @@ func InvokeGenerationFromSheet(wg *sync.WaitGroup, path string, modelsheetID, co
 		totalAggregateModel = 0
 		totalAggregateComponents = 0
 	}()
-	modelCSVHelper, err := parseModelSheet(url, modelsheetID, modelCSVFilePath, modelNames...)
+	modelCSVHelper, err := parseModelSheet(url, modelName, modelsheetID, modelCSVFilePath)
 	if err != nil {
 		return err
 	}
 
-	//exit early if no matching model found
-	if len(modelCSVFilePath) > 0 && len(modelCSVHelper.Models) == 0 {
-		return fmt.Errorf("no models found matching: %v", modelNames)
-	}
-
-	componentCSVHelper, err := parseComponentSheet(url, componentSheetID, componentCSVFilePath, modelNames...)
+	componentCSVHelper, err := parseComponentSheet(url, modelName, componentSheetID, componentCSVFilePath)
 	if err != nil {
 		return err
 	}
-	relationshipCSVHelper, err := parseRelationshipSheet(url, relationshipSheetID, relationshipCSVFilePath, modelNames...)
+	relationshipCSVHelper, err := parseRelationshipSheet(url, modelName, relationshipSheetID, relationshipCSVFilePath)
 	if err != nil {
 		return err
 	}
@@ -855,17 +839,8 @@ func InvokeGenerationFromSheet(wg *sync.WaitGroup, path string, modelsheetID, co
 	// Iterate models from the spreadsheet
 	for _, model := range modelCSVHelper.Models {
 
-		if len(modelNames) > 0 {
-			match := false
-			for _, m := range modelNames {
-				if strings.EqualFold(m, model.Model) {
-					match = true
-					break 
-				}
-			}
-			if !match {
-				continue
-			}
+		if modelName != "" && modelName != model.Model {
+			continue
 		}
 		totalAvailableModels++
 		ctx := context.Background()
@@ -883,14 +858,11 @@ func InvokeGenerationFromSheet(wg *sync.WaitGroup, path string, modelsheetID, co
 			var err error
 
 			if utils.ReplaceSpacesAndConvertToLowercase(model.Registrant) == "meshery" {
-				for _, modelName := range modelNames {
 				err = GenerateDefsForCoreRegistrant(model, componentCSVHelper, path, modelName)
 				if err != nil {
 					LogError.Error(err)
-					continue
 				}
-				break
-			}
+				return
 			}
 
 			generator, err := generators.NewGenerator(model.Registrant, model.SourceURL, model.Model)
@@ -1055,7 +1027,7 @@ func GenerateDefsForCoreRegistrant(model ModelCSV, ComponentCSVHelper *Component
 		}
 		for _, comps := range models {
 			for _, comp := range comps {
-				if !strings.EqualFold(comp.Model, model.Model) {
+				if comp.Model != model.Model {
 					continue
 				}
 				var componentDef component.ComponentDefinition

registry/relationship.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"strings"
 	"path/filepath"
 
 	"github.com/meshery/meshkit/encoding"
@@ -70,7 +69,7 @@ func NewRelationshipCSVHelper(sheetURL, spreadsheetName string, spreadsheetID in
 		Relationships:  []RelationshipCSV{},
 	}, nil
 }
-func (mrh *RelationshipCSVHelper) ParseRelationshipsSheet(modelNames ...string) error {
+func (mrh *RelationshipCSVHelper) ParseRelationshipsSheet(modelName string) error {
 	ch := make(chan RelationshipCSV, 1)
 	errorChan := make(chan error, 1)
 	csvReader, err := csv.NewCSVParser[RelationshipCSV](mrh.CSVPath, rowIndex, nil, func(_ []string, _ []string) bool {
@@ -96,18 +95,9 @@ func (mrh *RelationshipCSVHelper) ParseRelationshipsSheet(modelNames ...string)
 	for {
 		select {
 		case data := <-ch:
-			if len(modelNames) > 0 {
-			match := false
-			for _, m := range modelNames {
-				if strings.EqualFold(data.Model, m) {
-					match = true
-					break 
-				}
-			}
-			if !match {
+			if modelName != "" && data.Model != modelName {
 				continue
 			}
-		}
 			data.RowIndex = currentRow
 			currentRow++
 			mrh.Relationships = append(mrh.Relationships, data)