Fix linting issues and update dependencies

- Remove replace directive for veraison/swid since PR #45 is merged
- Update to latest veraison/swid version with Valid() methods
- Fix invalid UUID in test data to use proper RFC4122 format
- Apply go fmt formatting to test files
- Update example test outputs to match corrected UUID values
- Fix test error message expectations

All tests now pass across all packages.

Signed-off-by: Sukuna0007Abhi <[email protected]>

Author: Sukuna0007Abhi

coev/coswid_evidence_test.go

@@ -13,7 +13,7 @@ import (
 
 func TestCoSWIDEvidenceMap_Valid_Success(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
-	
+
 	evidenceMap := CoSWIDEvidenceMap{
 		Evidence: swid.Evidence{
 			DeviceID: "test-device-123",
@@ -27,7 +27,7 @@ func TestCoSWIDEvidenceMap_Valid_Success(t *testing.T) {
 
 func TestCoSWIDEvidenceMap_Valid_WithTagID(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
-	
+
 	evidenceMap := CoSWIDEvidenceMap{
 		TagID: swid.NewTagID("test-tag-id"),
 		Evidence: swid.Evidence{
@@ -55,7 +55,7 @@ func TestCoSWIDEvidenceMap_Valid_InvalidEvidence(t *testing.T) {
 func TestCoSWIDEvidenceMap_Valid_InvalidTagID(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
 	emptyTagID := &swid.TagID{} // Empty TagID - should be invalid
-	
+
 	evidenceMap := CoSWIDEvidenceMap{
 		TagID: emptyTagID,
 		Evidence: swid.Evidence{
@@ -71,7 +71,7 @@ func TestCoSWIDEvidenceMap_Valid_InvalidTagID(t *testing.T) {
 
 func TestCoSWIDEvidence_Valid_Success(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
-	
+
 	evidence := CoSWIDEvidence{
 		CoSWIDEvidenceMap{
 			Evidence: swid.Evidence{
@@ -96,12 +96,12 @@ func TestCoSWIDEvidence_Valid_EmptySlice(t *testing.T) {
 
 	err := evidence.Valid()
 	assert.Error(t, err, "Empty evidence slice should fail validation")
-	assert.Contains(t, err.Error(), "no evidence entries to validate")
+	assert.Contains(t, err.Error(), "must contain at least one entry")
 }
 
 func TestCoSWIDEvidence_Valid_InvalidEntry(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
-	
+
 	evidence := CoSWIDEvidence{
 		CoSWIDEvidenceMap{
 			Evidence: swid.Evidence{
@@ -120,4 +120,4 @@ func TestCoSWIDEvidence_Valid_InvalidEntry(t *testing.T) {
 	err := evidence.Valid()
 	assert.Error(t, err, "Evidence slice with invalid entry should fail validation")
 	assert.Contains(t, err.Error(), "evidence[1] validation failed")
-}
+}

coev/example_test.go

@@ -137,8 +137,8 @@ func Example_encode_CoSWIDTriples() {
 	}
 
 	// Output:
-	// a100a1048182a101d902264702deadbeefdead81a200500001000100010001000100010001000101a21823c1001824782442414438303942312d373033322d343344392d384639342d424631323845354430363144
-	// {"ev-triples":{"coswid-triples":[{"environment":{"instance":{"type":"ueid","value":"At6tvu/erQ=="}},"coswid-evidence":[{"tagId":"00010001-0001-0001-0001-000100010001","evidence":{"date":"1970-01-01T00:00:00Z","device-id":"BAD809B1-7032-43D9-8F94-BF128E5D061D"}}]}]}}
+	// a100a1048182a101d902264702deadbeefdead81a2005031fb5abf023e4992aa4e95f9c1503bfa01a21823c1001824782442414438303942312d373033322d343344392d384639342d424631323845354430363144
+	// {"ev-triples":{"coswid-triples":[{"environment":{"instance":{"type":"ueid","value":"At6tvu/erQ=="}},"coswid-evidence":[{"tagId":"31fb5abf-023e-4992-aa4e-95f9c1503bfa","evidence":{"date":"1970-01-01T00:00:00Z","device-id":"BAD809B1-7032-43D9-8F94-BF128E5D061D"}}]}]}}
 }
 
 func Example_encode_AttestKeyTriples() {
@@ -345,7 +345,7 @@ func Example_decode_JSON() {
                 },
                 "coswid-evidence": [
                     {
-                        "tagId": "00010001-0001-0001-0001-000100010001",
+                        "tagId": "31fb5abf-023e-4992-aa4e-95f9c1503bfa",
                         "evidence": {
                             "date": "1970-01-01T00:00:00Z",
                             "device-id": "BAD809B1-7032-43D9-8F94-BF128E5D061D"

coev/test_vars.go

@@ -15,7 +15,7 @@ var (
 	TestUUIDString = "31fb5abf-023e-4992-aa4e-95f9c1503bfa"
 	TestUUID       = comid.UUID(uuid.Must(uuid.Parse(TestUUIDString)))
 	TestProfile    = "https://abc.com"
-	TestTag        = "00010001-0001-0001-0001-000100010001"
+	TestTag        = "31fb5abf-023e-4992-aa4e-95f9c1503bfa"
 	TestDeviceID   = "BAD809B1-7032-43D9-8F94-BF128E5D061D"
 	TestKey        = true
 	TestDate, _    = time.Parse(time.RFC3339, "1970-01-01T00:00:00Z")

cots/abbreviated_swid_evidence_test.go

@@ -13,7 +13,7 @@ import (
 
 func TestAbbreviatedSwidTag_Valid_WithEvidence_Success(t *testing.T) {
 	validDate := time.Date(2023, time.January, 1, 12, 0, 0, 0, time.UTC)
-	
+
 	tag, err := NewTag("test-tag-id", "Test Software", "1.0.0")
 	assert.NoError(t, err)
 
@@ -74,4 +74,4 @@ func TestAbbreviatedSwidTag_Valid_WithoutEvidence(t *testing.T) {
 	// Evidence is nil - should still pass validation
 	err = tag.Valid()
 	assert.NoError(t, err, "Tag without Evidence should pass validation")
-}
+}

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/veraison/cmw v0.2.0
 	github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff
 	github.com/veraison/go-cose v1.2.1
-	github.com/veraison/swid v1.1.0
+	github.com/veraison/swid v1.1.1-0.20251003121634-fd1f7f1e1897
 )
 
 require (
@@ -35,5 +35,3 @@ require (
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/veraison/swid => github.com/Sukuna0007Abhi/swid v0.0.0-20250925122336-8afdc02a02bd

go.sum

@@ -1,7 +1,5 @@
 fortio.org/safecast v1.0.0 h1:dr3131WPX8iS1pTf76+39WeXbTrerDYLvi9s7Oi3wiY=
 fortio.org/safecast v1.0.0/go.mod h1:xZmcPk3vi4kuUFf+tq4SvnlVdwViqf6ZSZl91Jr9Jdg=
-github.com/Sukuna0007Abhi/swid v0.0.0-20250925122336-8afdc02a02bd h1:OkZZFlwgYDiZ33QEbqXHutScfJ5T0uYzAMTsfJDE3gs=
-github.com/Sukuna0007Abhi/swid v0.0.0-20250925122336-8afdc02a02bd/go.mod h1:d5jt76uMNbTfQ+f2qU4Lt8RvWOTsv6PFgstIM1QdMH0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -50,6 +48,10 @@ github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff h1:r6I2eJL/z8dp5flsQI
 github.com/veraison/eat v0.0.0-20210331113810-3da8a4dd42ff/go.mod h1:+kxt8iuFiVvKRs2VQ1Ho7bbAScXAB/kHFFuP5Biw19I=
 github.com/veraison/go-cose v1.2.1 h1:Gj4x20D0YP79J2+cK3anjGEMwIkg2xX+TKVVGUXwNAc=
 github.com/veraison/go-cose v1.2.1/go.mod h1:t6V8WJzHm1PD5HNsuDjW3KLv577uWb6UTzbZGvdQHD8=
+github.com/veraison/swid v1.1.0 h1:jEf/jobG6j7r9W9HSj2jDi1IGGs7aMKyDgfGEMxQ6is=
+github.com/veraison/swid v1.1.0/go.mod h1:d5jt76uMNbTfQ+f2qU4Lt8RvWOTsv6PFgstIM1QdMH0=
+github.com/veraison/swid v1.1.1-0.20251003121634-fd1f7f1e1897 h1:ze1ulqK70S7PRignyZzFDBJHNVEDyISk5FDv9Uh3UFw=
+github.com/veraison/swid v1.1.1-0.20251003121634-fd1f7f1e1897/go.mod h1:d5jt76uMNbTfQ+f2qU4Lt8RvWOTsv6PFgstIM1QdMH0=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=