fix: tidying

Author: snyk-will

lib/ecosystems/enrich_cyclonedx.go

@@ -68,7 +68,7 @@ func enrichCDXLicense(comp *cdx.Component, pkgVersionData *packages.VersionWithD
 	}
 }
 
-func enrichCDXExternalReference(comp *cdx.Component, ref *string, refType cdx.ExternalReferenceType) {
+func enrichExternalReference(comp *cdx.Component, ref *string, refType cdx.ExternalReferenceType) {
 	if ref == nil {
 		return
 	}
@@ -86,7 +86,7 @@ func enrichCDXExternalReference(comp *cdx.Component, ref *string, refType cdx.Ex
 	}
 }
 
-func enrichCDXProperty(comp *cdx.Component, name string, value string) {
+func enrichProperty(comp *cdx.Component, name string, value string) {
 	prop := cdx.Property{
 		Name:  name,
 		Value: value,
@@ -99,41 +99,41 @@ func enrichCDXProperty(comp *cdx.Component, name string, value string) {
 }
 
 func enrichCDXHomepage(comp *cdx.Component, data *packages.Package) {
-	enrichCDXExternalReference(comp, data.Homepage, cdx.ERTypeWebsite)
+	enrichExternalReference(comp, data.Homepage, cdx.ERTypeWebsite)
 }
 
 func enrichCDXRegistryURL(comp *cdx.Component, data *packages.Package) {
-	enrichCDXExternalReference(comp, data.RegistryUrl, cdx.ERTypeDistribution)
+	enrichExternalReference(comp, data.RegistryUrl, cdx.ERTypeDistribution)
 }
 
 func enrichCDXRepositoryURL(comp *cdx.Component, data *packages.Package) {
-	enrichCDXExternalReference(comp, data.RepositoryUrl, cdx.ERTypeVCS)
+	enrichExternalReference(comp, data.RepositoryUrl, cdx.ERTypeVCS)
 }
 
 func enrichCDXDocumentationURL(comp *cdx.Component, data *packages.Package) {
-	enrichCDXExternalReference(comp, data.DocumentationUrl, cdx.ERTypeDocumentation)
+	enrichExternalReference(comp, data.DocumentationUrl, cdx.ERTypeDocumentation)
 }
 
 func enrichCDXFirstReleasePublishedAt(comp *cdx.Component, data *packages.Package) {
 	if data.FirstReleasePublishedAt == nil {
 		return
 	}
 	timestamp := data.FirstReleasePublishedAt.UTC().Format(time.RFC3339)
-	enrichCDXProperty(comp, "ecosystems:first_release_published_at", timestamp)
+	enrichProperty(comp, "ecosystems:first_release_published_at", timestamp)
 }
 
 func enrichCDXLatestReleasePublishedAt(comp *cdx.Component, data *packages.Package) {
 	if data.LatestReleasePublishedAt == nil {
 		return
 	}
 	timestamp := data.LatestReleasePublishedAt.UTC().Format(time.RFC3339)
-	enrichCDXProperty(comp, "ecosystems:latest_release_published_at", timestamp)
+	enrichProperty(comp, "ecosystems:latest_release_published_at", timestamp)
 }
 
 func enrichCDXRepoArchived(comp *cdx.Component, data *packages.Package) {
 	if data.RepoMetadata != nil {
 		if archived, ok := (*data.RepoMetadata)["archived"].(bool); ok && archived {
-			enrichCDXProperty(comp, "ecosystems:repository_archived", "true")
+			enrichProperty(comp, "ecosystems:repository_archived", "true")
 		}
 	}
 }
@@ -143,7 +143,7 @@ func enrichCDXLocation(comp *cdx.Component, data *packages.Package) {
 		meta := *data.RepoMetadata
 		if ownerRecord, ok := meta["owner_record"].(map[string]interface{}); ok {
 			if location, ok := ownerRecord["location"].(string); ok {
-				enrichCDXProperty(comp, "ecosystems:owner_location", location)
+				enrichProperty(comp, "ecosystems:owner_location", location)
 			}
 		}
 	}
@@ -188,7 +188,7 @@ func enrichCDXTopics(comp *cdx.Component, data *packages.Package) {
 		if topics, ok := meta["topics"].([]interface{}); ok {
 			for _, topic := range topics {
 				if s, ok := topic.(string); ok {
-					enrichCDXProperty(comp, "ecosystems:topic", s)
+					enrichProperty(comp, "ecosystems:topic", s)
 				}
 			}
 		}

lib/ecosystems/enrich_cyclonedx_test.go

@@ -255,7 +255,7 @@ func TestEnrichExternalReferenceWithNilURL(t *testing.T) {
 	component := &cdx.Component{}
 	packageData := &packages.Package{Homepage: nil}
 
-	enrichCDXExternalReference(component, packageData.Homepage, cdx.ERTypeWebsite)
+	enrichExternalReference(component, packageData.Homepage, cdx.ERTypeWebsite)
 
 	assert.Nil(t, component.ExternalReferences)
 }
@@ -264,7 +264,7 @@ func TestEnrichExternalReferenceWithNonNullURL(t *testing.T) {
 	component := &cdx.Component{}
 	packageData := packages.Package{Homepage: pointerToString(t, "https://example.com")}
 
-	enrichCDXExternalReference(component, packageData.Homepage, cdx.ERTypeWebsite)
+	enrichExternalReference(component, packageData.Homepage, cdx.ERTypeWebsite)
 
 	expected := &[]cdx.ExternalReference{
 		{URL: "https://example.com", Type: cdx.ERTypeWebsite},