From 251f88279ced27cbcdca5fa535082628983b56ee Mon Sep 17 00:00:00 2001 From: Brian Joerger Date: Mon, 30 Jun 2025 15:57:31 -0700 Subject: [PATCH] followup: Remove piv-go v1 (#56108) * Update e ref. * Remove piv-go v1. --- e | 2 +- e_imports.go | 3 --- go.mod | 1 - go.sum | 2 -- integrations/event-handler/go.mod | 1 - integrations/event-handler/go.sum | 2 -- integrations/terraform-mwi/go.mod | 1 - integrations/terraform-mwi/go.sum | 2 -- integrations/terraform/go.mod | 1 - integrations/terraform/go.sum | 2 -- 10 files changed, 1 insertion(+), 16 deletions(-) diff --git a/e b/e index d26dd7f68cc..e86f64e4e60 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit d26dd7f68cc5e71b152b7685f26811e8dc646d27 +Subproject commit e86f64e4e601b6bfa8d6d9e46a021666ea961896 diff --git a/e_imports.go b/e_imports.go index 363008a5923..919bc3cf522 100644 --- a/e_imports.go +++ b/e_imports.go @@ -73,9 +73,6 @@ import ( _ "github.com/ghodss/yaml" _ "github.com/go-jose/go-jose/v3" _ "github.com/go-jose/go-jose/v3/json" - - // TODO(Joerger): Remove once /e uses v2 - _ "github.com/go-piv/piv-go/piv" _ "github.com/go-piv/piv-go/v2/piv" _ "github.com/gogo/protobuf/proto" _ "github.com/golang-jwt/jwt/v5" diff --git a/go.mod b/go.mod index 534f054e56b..654505c1b67 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,6 @@ require ( github.com/go-ldap/ldap/v3 v3.4.11 github.com/go-logr/logr v1.4.3 github.com/go-mysql-org/go-mysql v1.9.1 // replaced - github.com/go-piv/piv-go v1.11.0 github.com/go-piv/piv-go/v2 v2.3.0 github.com/go-resty/resty/v2 v2.16.5 github.com/go-webauthn/webauthn v0.11.2 diff --git a/go.sum b/go.sum index 3244e104ba7..c03185fda85 100644 --- a/go.sum +++ b/go.sum @@ -1309,8 +1309,6 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= -github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= -github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index b63c49cecd7..ce3d0349452 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -157,7 +157,6 @@ require ( github.com/go-openapi/strfmt v0.23.0 // indirect github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect - github.com/go-piv/piv-go v1.11.0 // indirect github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.3.0 // indirect github.com/go-webauthn/webauthn v0.13.0 // indirect diff --git a/integrations/event-handler/go.sum b/integrations/event-handler/go.sum index 625b0979134..c6274f98a14 100644 --- a/integrations/event-handler/go.sum +++ b/integrations/event-handler/go.sum @@ -361,8 +361,6 @@ github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZ github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= -github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= diff --git a/integrations/terraform-mwi/go.mod b/integrations/terraform-mwi/go.mod index 89d896c7c7b..28e8a008485 100644 --- a/integrations/terraform-mwi/go.mod +++ b/integrations/terraform-mwi/go.mod @@ -216,7 +216,6 @@ require ( github.com/go-openapi/strfmt v0.23.0 // indirect github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect - github.com/go-piv/piv-go v1.11.0 // indirect github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect diff --git a/integrations/terraform-mwi/go.sum b/integrations/terraform-mwi/go.sum index 425bf4be6b0..1fc73b5d180 100644 --- a/integrations/terraform-mwi/go.sum +++ b/integrations/terraform-mwi/go.sum @@ -533,8 +533,6 @@ github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZ github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= -github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index df6fe85b6eb..9cf4caca541 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -182,7 +182,6 @@ require ( github.com/go-openapi/strfmt v0.23.0 // indirect github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect - github.com/go-piv/piv-go v1.11.0 // indirect github.com/go-piv/piv-go/v2 v2.3.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.3.0 // indirect diff --git a/integrations/terraform/go.sum b/integrations/terraform/go.sum index 91315298401..6b3baaa2501 100644 --- a/integrations/terraform/go.sum +++ b/integrations/terraform/go.sum @@ -533,8 +533,6 @@ github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZ github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-piv/piv-go v1.11.0 h1:5vAaCdRTFSIW4PeqMbnsDlUZ7odMYWnHBDGdmtU/Zhg= -github.com/go-piv/piv-go v1.11.0/go.mod h1:NZ2zmjVkfFaL/CF8cVQ/pXdXtuj110zEKGdJM6fJZZM= github.com/go-piv/piv-go/v2 v2.3.0 h1:kKkrYlgLQTMPA6BiSL25A7/x4CEh2YCG7rtb/aTkx+g= github.com/go-piv/piv-go/v2 v2.3.0/go.mod h1:ShZi74nnrWNQEdWzRUd/3cSig3uNOcEZp+EWl0oewnI= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=