Fix build failures after latest refresh of the OSCAL repository

docker-archive · Feb 5, 2020 · 97c7ad1 · 97c7ad1
1 parent 6699b3c
commit 97c7ad1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/generator/manipulation.go b/generator/manipulation.go
@@ -67,7 +67,7 @@ func ProcessAlterations(alterations []profile.Alter, c *catalog.Catalog) *catalo
 }
 
 // ProcessSetParam processes set-param of a profile
-func ProcessSetParam(setParams []profile.Set, c *catalog.Catalog, catalogHelper impl.Catalog) *catalog.Catalog {
+func ProcessSetParam(setParams []profile.SetParameter, c *catalog.Catalog, catalogHelper impl.Catalog) *catalog.Catalog {
 	for _, sp := range setParams {
 		ctrlID := catalogHelper.GetControl(sp.ParamId)
 		for i, g := range c.Groups {

diff --git a/generator/mapper.go b/generator/mapper.go
@@ -50,7 +50,7 @@ func CreateCatalogsFromProfile(profileArg *profile.Profile) ([]*catalog.Catalog,
 				if profileArg.Modify != nil {
 					nc := impl.NISTCatalog{}
 					importedCatalog = ProcessAlterations(alterations, importedCatalog)
-					importedCatalog = ProcessSetParam(profileArg.Modify.Settings, importedCatalog, &nc)
+					importedCatalog = ProcessSetParam(profileArg.Modify.ParameterSettings, importedCatalog, &nc)
 				}
 				newCatalog, err := GetMappedCatalogControlsFromImport(importedCatalog, profileImport, &catalogHelper)
 				if err != nil {

diff --git a/generator/profile.go b/generator/profile.go
@@ -26,8 +26,8 @@ func findAlter(p *profile.Profile, call profile.Call) (*profile.Alter, bool, err
 
 	if p.Modify == nil {
 		p.Modify = &profile.Modify{
-			Alterations: []profile.Alter{},
-			Settings:    []profile.Set{},
+			Alterations:       []profile.Alter{},
+			ParameterSettings: []profile.SetParameter{},
 		}
 	}
 	for _, alt := range p.Modify.Alterations {
@@ -105,8 +105,8 @@ func GetAlters(p *profile.Profile) ([]profile.Alter, error) {
 			found := false
 			if p.Modify == nil {
 				p.Modify = &profile.Modify{
-					Alterations: []profile.Alter{},
-					Settings:    []profile.Set{},
+					Alterations:       []profile.Alter{},
+					ParameterSettings: []profile.SetParameter{},
 				}
 			}
 			for _, alt := range p.Modify.Alterations {