Skip to content

Commit c399674

Browse files
ramonpetgrave64ramonpetgrave64
committed
lint
Signed-off-by: Ramon Petgrave <[email protected]>
1 parent 447cfe0 commit c399674

File tree

9 files changed

+30
-53
lines changed

9 files changed

+30
-53
lines changed

‎go.sum‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum
271271
github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
272272
github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg=
273273
github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM=
274-
github.com/go-rod/rod v0.116.1 h1:BDMZY3qm/14SmvHBV7DoFUhXeJ2MbUYgumQ88b+v2WE=
275-
github.com/go-rod/rod v0.116.1/go.mod h1:3Ash9fYwznqz9S1uLQgQRStur4fCXjoxxGW+ym6TYjU=
274+
github.com/go-rod/rod v0.116.2 h1:A5t2Ky2A+5eD/ZJQr1EfsQSe5rms5Xof/qj296e+ZqA=
275+
github.com/go-rod/rod v0.116.2/go.mod h1:H+CMO9SCNc2TJ2WfrG+pKhITz57uGNYU43qYHh438Mg=
276276
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
277277
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
278278
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
@@ -330,8 +330,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
330330
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
331331
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
332332
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
333-
github.com/google/go-containerregistry v0.20.0 h1:wRqHpOeVh3DnenOrPy9xDOLdnLatiGuuNRVelR2gSbg=
334-
github.com/google/go-containerregistry v0.20.0/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
335333
github.com/google/go-containerregistry v0.20.1 h1:eTgx9QNYugV4DN5mz4U8hiAGTi1ybXn0TPi4Smd8du0=
336334
github.com/google/go-containerregistry v0.20.1/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
337335
github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=
@@ -548,12 +546,8 @@ github.com/sigstore/protobuf-specs v0.3.2 h1:nCVARCN+fHjlNCk3ThNXwrZRqIommIeNKWw
548546
github.com/sigstore/protobuf-specs v0.3.2/go.mod h1:RZ0uOdJR4OB3tLQeAyWoJFbNCBFrPQdcokntde4zRBA=
549547
github.com/sigstore/rekor v1.3.6 h1:QvpMMJVWAp69a3CHzdrLelqEqpTM3ByQRt5B5Kspbi8=
550548
github.com/sigstore/rekor v1.3.6/go.mod h1:JDTSNNMdQ/PxdsS49DJkJ+pRJCO/83nbR5p3aZQteXc=
551-
github.com/sigstore/sigstore v1.8.7 h1:L7/zKauHTg0d0Hukx7qlR4nifh6T6O6UIt9JBwAmTIg=
552-
github.com/sigstore/sigstore v1.8.7/go.mod h1:MPiQ/NIV034Fc3Kk2IX9/XmBQdK60wfmpvgK9Z1UjRA=
553549
github.com/sigstore/sigstore v1.8.8 h1:B6ZQPBKK7Z7tO3bjLNnlCMG+H66tO4E/+qAphX8T/hg=
554550
github.com/sigstore/sigstore v1.8.8/go.mod h1:GW0GgJSCTBJY3fUOuGDHeFWcD++c4G8Y9K015pwcpDI=
555-
github.com/sigstore/sigstore-go v0.5.1 h1:5IhKvtjlQBeLnjKkzMELNG4tIBf+xXQkDzhLV77+/8Y=
556-
github.com/sigstore/sigstore-go v0.5.1/go.mod h1:TuOfV7THHqiDaUHuJ5+QN23RP/YoKmsbwJpY+aaYPN0=
557551
github.com/sigstore/sigstore-go v0.6.0 h1:X72BkR8kXFcdhF/V5GA2fpFvCz+VyZ6fI0YgTBn5feI=
558552
github.com/sigstore/sigstore-go v0.6.0/go.mod h1:+RyopI/FJDE6z5WVs2sQ2nkc+zsxxByDmbp8a4HoxbA=
559553
github.com/sigstore/sigstore/pkg/signature/kms/aws v1.8.3 h1:LTfPadUAo+PDRUbbdqbeSl2OuoFQwUFTnJ4stu+nwWw=
@@ -642,8 +636,8 @@ github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=
642636
github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=
643637
github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE=
644638
github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg=
645-
github.com/ysmood/leakless v0.8.0 h1:BzLrVoiwxikpgEQR0Lk8NyBN5Cit2b1z+u0mgL4ZJak=
646-
github.com/ysmood/leakless v0.8.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=
639+
github.com/ysmood/leakless v0.9.0 h1:qxCG5VirSBvmi3uynXFkcnLMzkphdh3xx5FtrORwDCU=
640+
github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=
647641
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
648642
github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
649643
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -690,8 +684,6 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
690684
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
691685
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
692686
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
693-
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
694-
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
695687
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
696688
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
697689
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -704,8 +696,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
704696
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
705697
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
706698
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
707-
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
708-
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
709699
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
710700
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
711701
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -736,8 +726,6 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
736726
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
737727
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
738728
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
739-
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
740-
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
741729
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
742730
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
743731
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -748,8 +736,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
748736
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
749737
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
750738
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
751-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
752-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
753739
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
754740
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
755741
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -779,8 +765,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
779765
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
780766
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
781767
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
782-
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
783-
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
784768
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
785769
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
786770
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -791,8 +775,6 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
791775
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
792776
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
793777
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
794-
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
795-
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
796778
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
797779
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
798780
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -805,8 +787,6 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
805787
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
806788
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
807789
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
808-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
809-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
810790
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
811791
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
812792
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=

‎internal/builders/docker/pkg/builder_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func Test_CreateBuildDefinition(t *testing.T) {
5353
}
5454

5555
if diff := cmp.Diff(got, want); diff != "" {
56-
t.Errorf(diff)
56+
t.Error(diff)
5757
}
5858
}
5959

@@ -206,7 +206,7 @@ func Test_inspectArtifacts(t *testing.T) {
206206
want := []intoto.Subject{s1, s2, s3, s4}
207207

208208
if diff := cmp.Diff(got, want); diff != "" {
209-
t.Errorf(diff)
209+
t.Error(diff)
210210
}
211211
}
212212

@@ -256,7 +256,7 @@ func Test_inspectArtifactsNoRoot(t *testing.T) {
256256
want := []intoto.Subject{s1, s2, s3, s4}
257257

258258
if diff := cmp.Diff(got, want); diff != "" {
259-
t.Errorf(diff)
259+
t.Error(diff)
260260
}
261261
}
262262

@@ -317,7 +317,7 @@ func Test_ParseProvenance(t *testing.T) {
317317
}
318318

319319
if diff := cmp.Diff(got, want); diff != "" {
320-
t.Errorf(diff)
320+
t.Error(diff)
321321
}
322322
}
323323

@@ -345,7 +345,7 @@ func Test_ProvenanceStatementSLSA1_ToDockerBuildConfig(t *testing.T) {
345345
ForceCheckout: true,
346346
}
347347
if diff := cmp.Diff(got, want); diff != "" {
348-
t.Errorf(diff)
348+
t.Error(diff)
349349
}
350350
}
351351

‎internal/builders/docker/pkg/common_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func Test_BuildDefinition(t *testing.T) {
6262
}
6363

6464
if diff := cmp.Diff(got, want); diff != "" {
65-
t.Errorf(diff)
65+
t.Error(diff)
6666
}
6767
}
6868

‎internal/builders/docker/pkg/config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func Test_LoadBuildConfigFromFile(t *testing.T) {
5252
}
5353

5454
if diff := cmp.Diff(got, want); diff != "" {
55-
t.Errorf(diff)
55+
t.Error(diff)
5656
}
5757
}
5858

@@ -85,6 +85,6 @@ func Test_NewDockerBuildConfig(t *testing.T) {
8585
}
8686

8787
if diff := cmp.Diff(got, want); diff != "" {
88-
t.Errorf(diff)
88+
t.Error(diff)
8989
}
9090
}

‎internal/builders/go/main_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func checkWorkingDir(t *testing.T, wd, expected string) {
4646
}
4747

4848
if expectedWd != wd {
49-
t.Errorf(cmp.Diff(wd, expectedWd))
49+
t.Error(cmp.Diff(wd, expectedWd))
5050
}
5151
}
5252

@@ -336,19 +336,19 @@ func Test_runBuild(t *testing.T) {
336336
}
337337

338338
if !cmp.Equal(subject, tt.subject) {
339-
t.Errorf(cmp.Diff(subject, tt.subject))
339+
t.Error(cmp.Diff(subject, tt.subject))
340340
}
341341

342342
commands := append([]string{goc, "build", "-mod=vendor"}, tt.commands...)
343343
if !cmp.Equal(cmd, commands) {
344-
t.Errorf(cmp.Diff(cmd, commands))
344+
t.Error(cmp.Diff(cmd, commands))
345345
}
346346

347347
checkWorkingDir(t, wd, tt.workingDir)
348348

349349
sorted := cmpopts.SortSlices(func(a, b string) bool { return a < b })
350350
if !cmp.Equal(env, tt.envs, sorted) {
351-
t.Errorf(cmp.Diff(env, tt.envs))
351+
t.Error(cmp.Diff(env, tt.envs))
352352
}
353353
})
354354
}

‎internal/builders/go/pkg/build_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func Test_isAllowedEnvVariable(t *testing.T) {
9696

9797
r := isAllowedEnvVariable(tt.variable)
9898
if !cmp.Equal(r, tt.expected) {
99-
t.Errorf(cmp.Diff(r, tt.expected))
99+
t.Error(cmp.Diff(r, tt.expected))
100100
}
101101
})
102102
}
@@ -140,7 +140,7 @@ func Test_getOutputBinaryPath(t *testing.T) {
140140
}
141141

142142
if !cmp.Equal(r, tt.path) {
143-
t.Errorf(cmp.Diff(r, tt.path))
143+
t.Error(cmp.Diff(r, tt.path))
144144
}
145145
})
146146
}
@@ -183,7 +183,7 @@ func Test_isAllowedArg(t *testing.T) {
183183

184184
r := isAllowedArg(tt.argument)
185185
if !cmp.Equal(r, tt.expected) {
186-
t.Errorf(cmp.Diff(r, tt.expected))
186+
t.Error(cmp.Diff(r, tt.expected))
187187
}
188188
})
189189
}
@@ -491,7 +491,7 @@ func Test_generateOutputFilename(t *testing.T) {
491491
}
492492

493493
if fn != tt.expected.fn {
494-
t.Errorf(cmp.Diff(fn, tt.expected.fn))
494+
t.Error(cmp.Diff(fn, tt.expected.fn))
495495
}
496496
})
497497
}
@@ -619,7 +619,7 @@ func Test_SetArgEnvVariables(t *testing.T) {
619619

620620
sorted := cmpopts.SortSlices(func(a, b string) bool { return a < b })
621621
if !cmp.Equal(b.argEnv, tt.expected.env, sorted) {
622-
t.Errorf(cmp.Diff(b.argEnv, tt.expected.env))
622+
t.Error(cmp.Diff(b.argEnv, tt.expected.env))
623623
}
624624
})
625625
}
@@ -731,7 +731,7 @@ func Test_generateEnvVariables(t *testing.T) {
731731
expectedFlags := tt.expected.flags
732732
sorted := cmpopts.SortSlices(func(a, b string) bool { return a < b })
733733
if !cmp.Equal(flags, expectedFlags, sorted) {
734-
t.Errorf(cmp.Diff(flags, expectedFlags))
734+
t.Error(cmp.Diff(flags, expectedFlags))
735735
}
736736
})
737737
}
@@ -905,7 +905,7 @@ func Test_generateLdflags(t *testing.T) {
905905
}
906906
// Note: generated env variables contain the process's env variables too.
907907
if !cmp.Equal(ldflags, tt.outldflags) {
908-
t.Errorf(cmp.Diff(ldflags, tt.outldflags))
908+
t.Error(cmp.Diff(ldflags, tt.outldflags))
909909
}
910910
})
911911
}
@@ -980,7 +980,7 @@ func Test_generateFlags(t *testing.T) {
980980
// Note: generated env variables contain the process's env variables too.
981981
sorted := cmpopts.SortSlices(func(a, b string) bool { return a < b })
982982
if !cmp.Equal(flags, expectedFlags, sorted) {
983-
t.Errorf(cmp.Diff(flags, expectedFlags))
983+
t.Error(cmp.Diff(flags, expectedFlags))
984984
}
985985
})
986986
}
@@ -1056,7 +1056,7 @@ func Test_generateCommand(t *testing.T) {
10561056

10571057
sorted := cmpopts.SortSlices(func(a, b string) bool { return a < b })
10581058
if !cmp.Equal(command, expectedCommand, sorted) {
1059-
t.Errorf(cmp.Diff(command, expectedCommand))
1059+
t.Error(cmp.Diff(command, expectedCommand))
10601060
}
10611061
}
10621062
})

‎internal/builders/go/pkg/config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func Test_ConfigFromFile(t *testing.T) {
199199
}
200200

201201
if !cmp.Equal(*cfg, tt.config) {
202-
t.Errorf(cmp.Diff(*cfg, tt.config))
202+
t.Error(cmp.Diff(*cfg, tt.config))
203203
}
204204
})
205205
}

‎internal/utils/marshal_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func Test_MarshalToString(t *testing.T) {
5555
t.Errorf("MarshalToString: %v", err)
5656
}
5757
if !cmp.Equal(r, tt.expected) {
58-
t.Errorf(cmp.Diff(r, tt.expected))
58+
t.Error(cmp.Diff(r, tt.expected))
5959
}
6060
})
6161
}
@@ -101,7 +101,7 @@ func Test_UnmarshalList(t *testing.T) {
101101
}
102102

103103
if !cmp.Equal(r, tt.expected) {
104-
t.Errorf(cmp.Diff(r, tt.expected))
104+
t.Error(cmp.Diff(r, tt.expected))
105105
}
106106
})
107107
}

‎signing/sigstore/bundle.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ import (
2828
)
2929

3030
// BundleSigner is used to produce Sigstore Bundles from provenance statements.
31-
type BundleSigner struct {
32-
fulcioAddr string
33-
rekorAddr string
34-
}
31+
type BundleSigner struct{}
3532

3633
type sigstoreBundleAtt struct {
3734
cert []byte
@@ -104,7 +101,7 @@ func (s *BundleSigner) Sign(ctx context.Context, statement *intoto.Statement) (s
104101
" https://search.sigstore.dev/?logIndex=%[1]d", logIndex)
105102

106103
// marshall to json.
107-
bundleWrapper := &sigstoreBundle.ProtobufBundle{
104+
bundleWrapper := &sigstoreBundle.Bundle{
108105
Bundle: innerBundle,
109106
}
110107
bundleBytes, err := bundleWrapper.MarshalJSON()

0 commit comments

Comments
 (0)