fix: updated declaration syntax

defenseunicorns · Jan 14, 2025 · 296192f · 296192f
1 parent 1dcd78f
commit 296192f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/pkg/common/oscal/component.go b/src/pkg/common/oscal/component.go
@@ -384,9 +384,10 @@ func ComponentFromCatalog(command string, source string, catalog *oscalTypes.Cat
 		Version:      "0.0.1",
 	}
 
-	return &ComponentDefinition{
-		Model: componentDefinition,
-	}, nil
+	var compDef ComponentDefinition
+	compDef.Model = componentDefinition
+
+	return &compDef, nil
 
 }
 

diff --git a/src/pkg/common/oscal/component_test.go b/src/pkg/common/oscal/component_test.go
@@ -298,7 +298,7 @@ func TestMergeComponentDefinitions(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			component := oscal.ComponentDefinition{}
+			var component oscal.ComponentDefinition
 			err := component.NewModel(validBytes)
 			require.NoError(t, err)
 
@@ -519,7 +519,7 @@ func TestControlImplementationsToRequirementsMap(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			component := oscal.ComponentDefinition{}
+			var component oscal.ComponentDefinition
 
 			data := loadTestData(t, tt.filepath)
 			err := component.NewModel(data)
@@ -565,7 +565,7 @@ func TestFilterControlImplementations(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			component := oscal.ComponentDefinition{}
+			var component oscal.ComponentDefinition
 
 			data := loadTestData(t, tt.filepath)
 			err := component.NewModel(data)
@@ -593,7 +593,7 @@ func TestHandleExistingComponent(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("Handle Existing with no existing data", func(t *testing.T) {
-		component := oscal.ComponentDefinition{}
+		var component oscal.ComponentDefinition
 		component.NewModel(validComponentBytes)
 
 		tmpDir := t.TempDir()
@@ -607,7 +607,7 @@ func TestHandleExistingComponent(t *testing.T) {
 	})
 
 	t.Run("Handle Existing with existing data", func(t *testing.T) {
-		component := oscal.ComponentDefinition{}
+		var component oscal.ComponentDefinition
 		component.NewModel(validComponentBytes)
 
 		err := component.HandleExisting(validGeneratedComponentPath)