From fc3f525ea86849c5696b995d320da02b91694b69 Mon Sep 17 00:00:00 2001 From: Vault Automation Date: Fri, 23 Jan 2026 04:18:29 -0800 Subject: [PATCH] Backport remove unused TestLicenseOptions into ce/main (#11929) * remove unused TestLicenseOptions (#11928) * go mod tidy --------- Co-authored-by: akshya96 <87045294+akshya96@users.noreply.github.com> Co-authored-by: akshya96 --- go.mod | 1 - go.sum | 2 -- vault/testing.go | 6 ------ 3 files changed, 9 deletions(-) diff --git a/go.mod b/go.mod index aae1bc86a9..454e3a8673 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,6 @@ require ( github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms/v2 v2.0.13 github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.9 github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.13 - github.com/hashicorp/go-licensing/v4 v4.0.0 github.com/hashicorp/go-memdb v1.3.5 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-pgmultiauth v1.0.0 diff --git a/go.sum b/go.sum index ff615bd0f7..41b2487e05 100644 --- a/go.sum +++ b/go.sum @@ -1425,8 +1425,6 @@ github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.9 h1:rlKOPHzZ41QeV/ github.com/hashicorp/go-kms-wrapping/wrappers/ocikms/v2 v2.0.9/go.mod h1:pHJfTvq97FAKCWxIJOHZWQmVfRXmUN6tmgEcgj3nC+M= github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.13 h1:UuDeq3nr0e+H9CrZM3dvpDGkWFSJYTtuTqVekn2za2k= github.com/hashicorp/go-kms-wrapping/wrappers/transit/v2 v2.0.13/go.mod h1:E2dYgXYNkvKe84PIxD9eJqqhFRA4guCTDweJR4i0gds= -github.com/hashicorp/go-licensing/v4 v4.0.0 h1:IOtq8ezthoi4hz4QydrI6SPh+4sO0SIH3EpQamr+X/0= -github.com/hashicorp/go-licensing/v4 v4.0.0/go.mod h1:7ka+DZIQedW+TJGW0bH+FNLftDXKV4Br1+9S4PiPyps= github.com/hashicorp/go-memdb v1.3.5 h1:b3taDMxCBCBVgyRrS1AZVHO14ubMYZB++QpNhBg+Nyo= github.com/hashicorp/go-memdb v1.3.5/go.mod h1:8IVKKBkVe+fxFgdFOYxzQQNjz+sWCyHCdIC/+5+Vy1Y= github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY= diff --git a/vault/testing.go b/vault/testing.go index ab0c9f9b0a..0fc4615fe7 100644 --- a/vault/testing.go +++ b/vault/testing.go @@ -33,7 +33,6 @@ import ( "github.com/armon/go-metrics" "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/go-licensing/v4" "github.com/hashicorp/go-secure-stdlib/reloadutil" kv "github.com/hashicorp/vault-plugin-secrets-kv" "github.com/hashicorp/vault/api" @@ -1835,11 +1834,6 @@ func (cluster *TestCluster) StartCore(t testing.TB, idx int, opts *TestClusterOp tcc.Logger().Info("restarted test core", "core", idx) } -type TestLicenseOptions struct { - PubKey ed25519.PublicKey - IssuerOptions licensing.IssuerOptions -} - func (testCluster *TestCluster) newCore(t testing.TB, idx int, coreConfig *CoreConfig, opts *TestClusterOptions, listeners []*TestListener, pubKey ed25519.PublicKey) (func(), *Core, CoreConfig, http.Handler) { localConfig := *coreConfig cleanupFunc := func() {}