fix golangci-lint errors

Author: thomas-fossati

.golangci.yml

@@ -26,7 +26,6 @@ linters-settings:
   gofmt:
     simplify: false    
   goimports:
-    local-prefixes: github.com/fxamacker/cbor
   golint:
     min-confidence: 0
   govet:

common.go

@@ -77,7 +77,7 @@ func codeStringer(code interface{}, dict codeDictionary, codeName string) string
 func codeToCBOR(code interface{}, dict stringDictionary) ([]byte, error) {
 	v := code
 
-	// always try to minimise bandwidth
+	// always try to minimize bandwidth
 	if err := codifyString(&v, dict); err != nil {
 		return nil, err
 	}
@@ -88,7 +88,7 @@ func codeToCBOR(code interface{}, dict stringDictionary) ([]byte, error) {
 func codeToJSON(code interface{}, dict codeDictionary) ([]byte, error) {
 	v := code // make a copy we can clobber
 
-	// always try to maximise expressiveness
+	// always try to maximize expressiveness
 	// however, avoid encoding unknown codes
 	if err := stringifyCode(&v, dict, ""); err != nil {
 		return nil, err
@@ -100,7 +100,7 @@ func codeToJSON(code interface{}, dict codeDictionary) ([]byte, error) {
 func codeToXMLAttr(attrName xml.Name, code interface{}, dict codeDictionary) (xml.Attr, error) {
 	v := code // make a copy we can clobber
 
-	// always try to maximise expressiveness
+	// always try to maximize expressiveness
 	// however, avoid encoding unknown codes
 	if err := stringifyCode(&v, dict, ""); err != nil {
 		return xml.Attr{}, err
@@ -116,7 +116,7 @@ func xToCode(enc encoder, from []byte, dict stringDictionary, to *interface{}) e
 		return err
 	}
 
-	// try to make internal representation as homogeneus as possible
+	// try to make internal representation as homogeneous as possible
 	if err := codifyString(to, dict); err != nil {
 		return err
 	}

doc.go

@@ -4,7 +4,7 @@ Identification (SWID) Tags as defined by ISO/IEC 19770-2:2015 as well as by
 their "concise" counterpart (CoSWID) defined by draft-ietf-sacm-coswid.
 
 The library aims at using the most space-efficient encoding when using CBOR
-and the most expressive one when using XML and JSON, preferring to serialise
+and the most expressive one when using XML and JSON, preferring to serialize
 strings rather tham of their equivalent code-points. When decoding, the most
 space efficient representation is used. In dealing with unknown code-points,
 we follow the Postel principle: refusing to encode unknown protocol entities,
@@ -26,7 +26,7 @@ This will generate a Tag with a minimal structure. You can then use the API
 to add additional information and meta data to the tag.
 
 You will need to add one or more "entity" entries, representing the
-organisation(s) responsible for the information contained in the tag.
+organization(s) responsible for the information contained in the tag.
 All entities have an associated "role" and a recommended "registration id":
 
 	entity, err := NewEntity(
@@ -76,15 +76,15 @@ And subsequently added to the tag's "payload":
 Note that the same data structures could be added to an "evidence" instead,
 were the tag describing a "live" system rather than a software package.
 
-Once the tag is complete, it can be serialised using one of the CBOR, XML or
+Once the tag is complete, it can be serialized using one of the CBOR, XML or
 JSON marshalers:
 
 	data, err := tag.ToXML() // or tag.ToCBOR(), or tag.ToJSON()
 
 
 Consuming Tags
 
-A tag can be de-serialised using one of the "From" interfaces. For example,
+A tag can be de-serialized using one of the "From" interfaces. For example,
 to decode a CoSWID tag from a memory buffer:
 
 	var tag SoftwareIdentity

entity.go

@@ -56,7 +56,7 @@ type Entity struct {
 	Thumbprint *HashEntry `cbor:"34,keyasint,omitempty" json:"thumbprint,omitempty" xml:"thumbprint,omitempty"`
 }
 
-// NewEntity instantiates a new Entity object initialised with the given
+// NewEntity instantiates a new Entity object initialized with the given
 // entityName and roles
 func NewEntity(entityName string, roles ...interface{}) (*Entity, error) {
 	e := Entity{

evidence.go

@@ -18,7 +18,7 @@ type Evidence struct {
 	DeviceID string `cbor:"36,keyasint,omitempty" json:"device-id,omitempty" xml:"deviceId,attr,omitempty"`
 }
 
-// NewEvidence instantiates a new Evidence object initialised with the given
+// NewEvidence instantiates a new Evidence object initialized with the given
 // deviceID
 func NewEvidence(deviceID string) *Evidence {
 	return &Evidence{

link.go

@@ -105,7 +105,7 @@ type Link struct {
 	Use *Use `cbor:"42,keyasint,omitempty" json:"use,omitempty" xml:"use,attr,omitempty"`
 }
 
-// NewLink instantiates a new Link object initialised with the supplied href and
+// NewLink instantiates a new Link object initialized with the supplied href and
 // link relation
 func NewLink(href string, rel Rel) (*Link, error) {
 	l := Link{

processes_test.go

@@ -88,7 +88,7 @@ func TestProcesses_UnmarshalCBOR(t *testing.T) {
 			expectedErr: nil,
 		},
 		{
-			name: "accept array with one element (non optimised)",
+			name: "accept array with one element (non optimized)",
 			/*
 			   81          # array(1)
 			      a1       # map(1)
@@ -128,7 +128,7 @@ func TestProcesses_UnmarshalCBOR(t *testing.T) {
 			expectedErr: nil,
 		},
 		{
-			name: "one scalar element (optimised encoding)",
+			name: "one scalar element (optimized encoding)",
 			/*
 			   a1       # map(1)
 			      18 1b # unsigned(27)
@@ -162,7 +162,7 @@ func benchmarkProcessesMarshal(i int, b *testing.B) {
 
 	for n := 0; n < b.N; n++ {
 		if _, e := ps.MarshalCBOR(); e != nil {
-			b.Fatalf("marshalling failed: %v", e)
+			b.Fatalf("marshaling failed: %v", e)
 		}
 	}
 }

resource_extension.go

@@ -20,7 +20,7 @@ type PSAMeasuredSoftwareComponent struct {
 }
 
 // NewPSAMeasuredSoftwareComponentResource returns a Resource of type
-// PSAMeasuredSoftwareComponent initialised according to the supplied
+// PSAMeasuredSoftwareComponent initialized according to the supplied
 // measurement value and signer ID
 func NewPSAMeasuredSoftwareComponentResource(
 	measurementValue HashEntry, signerID HashEntry,

roundtripper.go

@@ -11,22 +11,20 @@ import (
 
 // marshal + unmarshal
 func roundTripper(t *testing.T, tv interface{}, expectedCBOR []byte) interface{} {
-	// don't allow TZ info to get lost in the encoding / decoding process
-	// em, err := cbor.EncOptions{Time: cbor.TimeRFC3339, TimeTag: cbor.EncTagRequired}.EncMode()
-	em, err := cbor.EncOptions{TimeTag: cbor.EncTagRequired}.EncMode()
+	encMode, err := cbor.EncOptions{TimeTag: cbor.EncTagRequired}.EncMode()
 	require.Nil(t, err)
 
-	data, err := em.Marshal(tv)
+	data, err := encMode.Marshal(tv)
 
 	assert.Nil(t, err)
 	t.Logf("CBOR(hex): %x\n", data)
 	assert.Equal(t, expectedCBOR, data)
 
-	dm, err := cbor.DecOptions{TimeTag: cbor.DecTagOptional}.DecMode()
+	decMode, err := cbor.DecOptions{TimeTag: cbor.DecTagOptional}.DecMode()
 	require.Nil(t, err)
 
 	actual := reflect.New(reflect.TypeOf(tv))
-	err = dm.Unmarshal(data, actual.Interface())
+	err = decMode.Unmarshal(data, actual.Interface())
 
 	assert.Nil(t, err)
 	assert.Equal(t, tv, actual.Elem().Interface())

softwareidentity.go

@@ -151,35 +151,35 @@ func NewTag(tagID interface{}, softwareName, softwareVersion string) (*SoftwareI
 	return &t, nil
 }
 
-// ToXML serialises the receiver SoftwareIdentity to SWID
+// ToXML serializes the receiver SoftwareIdentity to SWID
 func (t SoftwareIdentity) ToXML() ([]byte, error) {
 	return xml.Marshal(t)
 }
 
-// ToJSON serialises the receiver SoftwareIdentity to CoSWID using the JSON
+// ToJSON serializes the receiver SoftwareIdentity to CoSWID using the JSON
 // formatter
 func (t SoftwareIdentity) ToJSON() ([]byte, error) {
 	return json.Marshal(t)
 }
 
-// ToCBOR serialises the receiver SoftwareIdentity to CoSWID
+// ToCBOR serializes the receiver SoftwareIdentity to CoSWID
 func (t SoftwareIdentity) ToCBOR() ([]byte, error) {
 	return em.Marshal(t)
 }
 
-// FromXML deserialises the supplied XML encoded SWID into the receiver
+// FromXML deserializes the supplied XML encoded SWID into the receiver
 // SoftwareIdentity
 func (t *SoftwareIdentity) FromXML(data []byte) error {
 	return xml.Unmarshal(data, t)
 }
 
-// FromJSON deserialises the supplied JSON encoded CoSWID into the receiver
+// FromJSON deserializes the supplied JSON encoded CoSWID into the receiver
 // SoftwareIdentity
 func (t *SoftwareIdentity) FromJSON(data []byte) error {
 	return json.Unmarshal(data, t)
 }
 
-// FromCBOR deserialises the supplied CBOR encoded CoSWID into the receiver
+// FromCBOR deserializes the supplied CBOR encoded CoSWID into the receiver
 // SoftwareIdentity
 func (t *SoftwareIdentity) FromCBOR(data []byte) error {
 	return dm.Unmarshal(data, t)

softwareidentity_test.go

@@ -1,14 +1,18 @@
 package swid
 
-import "testing"
+import (
+	"testing"
 
-func makeACMEEntityWithRoles(roles ...interface{}) Entity {
+	"github.com/stretchr/testify/require"
+)
+
+func makeACMEEntityWithRoles(t *testing.T, roles ...interface{}) Entity {
 	e := Entity{
 		EntityName: "ACME Ltd",
 		RegID:      "acme.example",
 	}
 
-	e.SetRoles(roles...)
+	require.Nil(t, e.SetRoles(roles...))
 
 	return e
 }
@@ -19,7 +23,7 @@ func TestTag_RoundtripPSABundle(t *testing.T) {
 		SoftwareName:    "Roadrunner software bundle",
 		SoftwareVersion: "1.0.0",
 		Entities: Entities{
-			makeACMEEntityWithRoles(
+			makeACMEEntityWithRoles(t,
 				RoleTagCreator,
 				RoleSoftwareCreator,
 				RoleAggregator,
@@ -136,7 +140,7 @@ func TestTag_RoundtripPSAComponent(t *testing.T) {
 		SoftwareName:    "Roadrunner boot loader",
 		SoftwareVersion: "1.0.0",
 		Entities: Entities{
-			makeACMEEntityWithRoles(
+			makeACMEEntityWithRoles(t,
 				RoleTagCreator,
 				RoleAggregator,
 			),