fix: clean-up per comments

defenseunicorns · Jun 7, 2024 · b078281 · b078281
1 parent 244d2c9
commit b078281
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/src/pkg/common/oscal/component.go b/src/pkg/common/oscal/component.go
@@ -420,7 +420,6 @@ func ComponentDefinitionToRequirementMap(componentDefinition *oscalTypes_1_1_2.C
 		if component.ControlImplementations != nil {
 			for _, controlImplementation := range *component.ControlImplementations {
 				for _, requirement := range controlImplementation.ImplementedRequirements {
-					// TODO: should this be controlID (i.e., possibly combining multiple instances of the same control?)
 					requirementMap[requirement.UUID] = Requirement{
 						ImplementedRequirement: &requirement,
 						Component:              &component,

diff --git a/src/pkg/common/requirement-store/requirement-store.go b/src/pkg/common/requirement-store/requirement-store.go
@@ -41,16 +41,15 @@ func (r *RequirementStore) ResolveLulaValidations(validationStore *validationsto
 		if requirement.ImplementedRequirement.Links != nil {
 			for _, link := range *requirement.ImplementedRequirement.Links {
 				if common.IsLulaLink(link) {
-					id := common.TrimIdPrefix(link.Href)
-					_, err := validationStore.GetLulaValidation(id)
+					_, err := validationStore.GetLulaValidation(link.Href)
 					if err != nil {
 						message.Debugf("Error adding validation from link %s: %v", link.Href, err)
 						// Create new LulaValidation and add to validationStore
 						lulaValidation = types.CreateFailingLulaValidation("lula-validation-error")
 						lulaValidation.Result.Observations = map[string]string{
 							fmt.Sprintf("Error getting Lula validation %s", link.Href): err.Error(),
 						}
-						validationStore.AddLulaValidation(lulaValidation, id)
+						validationStore.AddLulaValidation(lulaValidation, link.Href)
 					}
 				}
 			}

diff --git a/src/pkg/domains/kubernetes/create.go b/src/pkg/domains/kubernetes/create.go
@@ -106,20 +106,6 @@ func CreateFromManifest(ctx context.Context, client klient.Client, resourceBytes
 		}
 	}
 
-	// decoder := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(resourceBytes), 4096)
-	// for {
-	// 	rawObj := &unstructured.Unstructured{}
-	// 	if err := decoder.Decode(rawObj); err != nil {
-	// 		if err == io.EOF {
-	// 			break
-	// 		}
-	// 		return nil, err
-	// 	}
-	// 	resource, err := createResource(ctx, client, rawObj)
-	// 	if err == nil {
-	// 		resources = append(resources, resource.Object)
-	// 	}
-	// }
 	return resources, nil
 }