Updated pkg to use new schema

Signed-off-by: Eddie Knight <knight@linux.com>

Author: eddie-knight

cmd/pkg/baseline/generator.go

@@ -8,7 +8,6 @@ import (
 	"html/template"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/ossf/security-baseline/pkg/types"
 )
@@ -43,18 +42,12 @@ func (g *Generator) ExportMarkdown(b *types.Baseline, path string) error {
 	// Create and parse the template
 	tmpl, err := template.New("baseline").Funcs(template.FuncMap{
 		// Template function to remove newlines and collapse text
-		"collapseNewlines": func(s string) string {
-			return strings.ReplaceAll(s, "\n", " ")
-		},
+		"collapseNewlines": collapseNewlines,
 		"addLinks": func(s string) string {
 			return addLinksTemplateFunction(b.Lexicon, s)
 		},
-		"asLink": func(s string) string {
-			return asLinkTemplateFunction(s)
-		},
-		"subtract": func(a, b int) int {
-			return a - b
-		},
+		"asLink":   asLinkTemplateFunction,
+		"maxLevel": maxLevel,
 	}).Parse(string(templateContent))
 	if err != nil {
 		return fmt.Errorf("error parsing template: %w", err)

cmd/pkg/baseline/loader.go

@@ -13,6 +13,7 @@ import (
 )
 
 const LexiconFilename = "lexicon.yaml"
+const FrameworksFilename = "frameworks.yaml"
 
 // Loader is an object that reads the baseline data
 type Loader struct {
@@ -34,7 +35,13 @@ func (l *Loader) Load() (*types.Baseline, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error reading lexicon: %w", err)
 	}
+	frameworks, err := l.loadFramework()
+	if err != nil {
+		return nil, fmt.Errorf("error reading frameworks: %w", err)
+	}
+
 	b.Lexicon = lexicon
+	b.Frameworks = frameworks
 
 	for _, catCode := range types.Categories {
 		cat, err := l.loadCategory(catCode)
@@ -66,6 +73,24 @@ func (l *Loader) loadLexicon() ([]types.LexiconEntry, error) {
 	return lexicon, nil
 }
 
+// loadLexicon
+func (l *Loader) loadFramework() ([]types.FrameworkEntry, error) {
+	file, err := os.Open(filepath.Join(l.DataPath, FrameworksFilename))
+	if err != nil {
+		return nil, fmt.Errorf("error opening file: %w", err)
+	}
+	defer file.Close()
+
+	var frameworks types.Frameworks
+
+	decoder := yaml.NewDecoder(file)
+	decoder.KnownFields(true)
+	if err := decoder.Decode(&frameworks); err != nil {
+		return nil, fmt.Errorf("error decoding YAML: %v", err)
+	}
+	return frameworks.Frameworks, nil
+}
+
 // loadCategory loads a category definition from its YAML source
 func (l *Loader) loadCategory(catCode string) (*types.Category, error) {
 	file, err := os.Open(filepath.Join(l.DataPath, fmt.Sprintf("OSPS-%s.yaml", catCode)))

cmd/pkg/baseline/template-functions.go

@@ -6,11 +6,16 @@ package baseline
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/ossf/security-baseline/pkg/types"
 )
 
+func collapseNewlines(s string) string {
+	return strings.ReplaceAll(s, "\n", " ")
+}
+
 func containsSynonym(list []string, entryTerm, term string) bool {
 	if strings.EqualFold(entryTerm, term) {
 		return true
@@ -74,3 +79,23 @@ func addLinksTemplateFunction(lexicon []types.LexiconEntry, text string) string
 func asLinkTemplateFunction(text string) string {
 	return "#" + strings.ToLower(strings.ReplaceAll(text, " ", "-"))
 }
+
+// loop through maturityLevels
+// to see if any are higher than the targetMaturity
+func maxLevel(maturityLevels []string, targetMaturity int) bool {
+	var out bool
+	for _, maturity := range maturityLevels {
+		maturityInt, err := strconv.Atoi(maturity[len(maturity)-1:])
+		if err != nil {
+			fmt.Println(err)
+			return false
+		}
+		if maturityInt == targetMaturity {
+			out = true
+		}
+		if maturityInt < targetMaturity {
+			return false
+		}
+	}
+	return out
+}

cmd/pkg/baseline/validator.go

@@ -30,7 +30,7 @@ func (v *Validator) Check(b *types.Baseline) error {
 			if entry.ID == "" {
 				errs = append(errs, fmt.Errorf("missing ID for 'control' %s", entry.ID))
 			}
-			if entry.ControlText == "" {
+			if entry.Title == "" {
 				errs = append(errs, fmt.Errorf("missing 'control' text for %s", entry.ID))
 			}
 			// For after all fields are populated:

cmd/pkg/types/types.go

@@ -62,3 +62,7 @@ type FrameworkEntry struct {
 	Version string `yaml:"version"`
 	URL     string `yaml:"url"`
 }
+
+type Frameworks struct {
+	Frameworks []FrameworkEntry `yaml:"mapping-references"`
+}