merging-extra-lint

Signed-off-by: Akhilesh Kr. Yadav <[email protected]>
veraison · Jan 13, 2025 · 33723e5 · 33723e5
1 parent 7a7c630
commit 33723e5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/corim/unsignedcorim.go b/corim/unsignedcorim.go
@@ -88,13 +88,13 @@ func (o *UnsignedCorim) SetID(v interface{}) *UnsignedCorim {
 }
 
 // GetID retrieves the corim-id from the unsigned-corim-map as a string
-func (o UnsignedCorim) GetID() string {
-	return o.ID.String()
+func (o *UnsignedCorim) GetID() string {
+    return o.ID.String()
 }
 
 // AddComid appends the CBOR encoded (and appropriately tagged) CoMID to the
 // tags array of the unsigned-corim-map
-func (o *UnsignedCorim) AddComid(c comid.Comid) *UnsignedCorim {
+func (o *UnsignedCorim) AddComid(c *comid.Comid) *UnsignedCorim {
 	if o != nil {
 		if c.Valid() != nil {
 			return nil
@@ -105,7 +105,7 @@ func (o *UnsignedCorim) AddComid(c comid.Comid) *UnsignedCorim {
 			return nil
 		}
 
-		taggedComid := append(ComidTag, comidCBOR...)
+		taggedComid := append(ComidTag, comidCBOR...) //nolint:gocritic
 
 		o.Tags = append(o.Tags, taggedComid)
 	}
@@ -114,7 +114,7 @@ func (o *UnsignedCorim) AddComid(c comid.Comid) *UnsignedCorim {
 
 // AddCots appends the CBOR encoded (and appropriately tagged) CoTS to the
 // tags array of the unsigned-corim-map
-func (o *UnsignedCorim) AddCots(c cots.ConciseTaStore) *UnsignedCorim {
+func (o *UnsignedCorim) AddCots(c *cots.ConciseTaStore) *UnsignedCorim {
 	if o != nil {
 		if c.Valid() != nil {
 			return nil
@@ -125,7 +125,7 @@ func (o *UnsignedCorim) AddCots(c cots.ConciseTaStore) *UnsignedCorim {
 			return nil
 		}
 
-		taggedCots := append(cots.CotsTag, cotsCBOR...)
+		taggedCots := append(cots.CotsTag, cotsCBOR...) //nolint:gocritic
 
 		o.Tags = append(o.Tags, taggedCots)
 	}
@@ -134,7 +134,7 @@ func (o *UnsignedCorim) AddCots(c cots.ConciseTaStore) *UnsignedCorim {
 
 // AddCoswid appends the CBOR encoded (and appropriately tagged) CoSWID to the
 // tags array of the unsigned-corim-map
-func (o *UnsignedCorim) AddCoswid(c swid.SoftwareIdentity) *UnsignedCorim {
+func (o *UnsignedCorim) AddCoswid(c *swid.SoftwareIdentity) *UnsignedCorim {
 	if o != nil {
 		// Currently the swid package doesn't offer an interface
 		// for validating the supplied CoSWID, so -- for now --
@@ -146,7 +146,7 @@ func (o *UnsignedCorim) AddCoswid(c swid.SoftwareIdentity) *UnsignedCorim {
 			return nil
 		}
 
-		taggedCoswid := append(CoswidTag, coswidCBOR...)
+		taggedCoswid := append(CoswidTag, coswidCBOR...) //nolint:gocritic
 
 		o.Tags = append(o.Tags, taggedCoswid)
 	}
@@ -232,7 +232,7 @@ func (o *UnsignedCorim) AddEntity(name string, regID *string, roles ...Role) *Un
 }
 
 // Valid checks the validity (according to the spec) of the target unsigned CoRIM
-func (o UnsignedCorim) Valid() error {
+func (o *UnsignedCorim) Valid() error {
 	if o.ID == (swid.TagID{}) {
 		return fmt.Errorf("empty id")
 	}
@@ -275,11 +275,11 @@ func (o UnsignedCorim) Valid() error {
 		}
 	}
 
-	return o.Extensions.validCorim(&o)
+o)
 }
 
 // ToCBOR serializes the target unsigned CoRIM to CBOR
-func (o UnsignedCorim) ToCBOR() ([]byte, error) {
+func (o *UnsignedCorim) ToCBOR() ([]byte, error) {
 	// If extensions have been registered, the collection will exist, but
 	// might be empty. If that is the case, set it to nil to avoid
 	// marshaling an empty list (and let the marshaller omit the claim
@@ -299,7 +299,7 @@ func (o *UnsignedCorim) FromCBOR(data []byte) error {
 }
 
 // ToJSON serializes the target unsigned CoRIM to JSON
-func (o UnsignedCorim) ToJSON() ([]byte, error) {
+func (o *UnsignedCorim) ToJSON() ([]byte, error) {
 	// If extensions have been registered, the collection will exist, but
 	// might be empty. If that is the case, set it to nil to avoid
 	// marshaling an empty list (and let the marshaller omit the claim

diff --git a/corim/unsignedcorim_test.go b/corim/unsignedcorim_test.go
@@ -56,7 +56,7 @@ func TestUnsignedCorim_AddComid_and_marshal(t *testing.T) {
 	tv := NewUnsignedCorim().SetID("test corim id")
 	require.NotNil(t, tv)
 
-	c := comid.Comid{}
+	c := &comid.Comid{}
 	err := c.FromJSON([]byte(comid.PSARefValJSONTemplate))
 	require.Nil(t, err)
 
@@ -76,7 +76,7 @@ func TestUnsignedCorim_AddCots_and_marshal(t *testing.T) {
 	tv := NewUnsignedCorim().SetID("test corim id with CoTS")
 	require.NotNil(t, tv)
 
-	c := cots.ConciseTaStore{}
+	c := &cots.ConciseTaStore{}
 
 	err := c.FromJSON([]byte(cots.ConciseTaStoreTemplateSingleOrg))
 	require.Nil(t, err)
@@ -102,7 +102,7 @@ func TestUnsignedCorim_AddCoswid_and_marshal(t *testing.T) {
 	err := c.FromXML(data)
 	require.Nil(t, err)
 
-	assert.NotNil(t, tv.AddCoswid(c))
+	assert.NotNil(t, tv.AddCoswid(&c))
 
 	actual, err := tv.ToCBOR()
 	assert.Nil(t, err)
@@ -191,7 +191,7 @@ func TestUnsignedCorim_Valid_ok(t *testing.T) {
 		SetID("invalid.tags.corim").
 		AddDependentRim("http://endorser.example/addon.corim", nil).
 		SetProfile("https://arm.com/psa/iot/2.0.0").
-		AddComid(*c).
+		AddComid(c).
 		SetRimValidity(time.Now().Add(time.Hour), nil).
 		AddEntity("ACME Ltd.", nil, RoleManifestCreator)
 
@@ -325,7 +325,7 @@ func TestUnsignedCorim_ToJSON(t *testing.T) {
 		SetID("invalid.tags.corim").
 		AddDependentRim("http://endorser.example/addon.corim", nil).
 		SetProfile("https://arm.com/psa/iot/2.0.0").
-		AddComid(*c)
+		AddComid(c)
 
 	require.NotNil(t, tv)
 
@@ -368,7 +368,7 @@ func TestUnsignedCorim_ToCBOR(t *testing.T) {
 		SetID("invalid.tags.corim").
 		AddDependentRim("http://endorser.example/addon.corim", nil).
 		SetProfile("https://arm.com/psa/iot/2.0.0").
-		AddComid(*c)
+		AddComid(c)
 
 	require.NotNil(t, tv)