From 123d0065773ac179db986b2999f987f57997a309 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Mon, 20 May 2024 11:44:49 -0500 Subject: [PATCH 1/3] remove deprecated centrify auth method --- command/base_predict_test.go | 1 - command/commands.go | 2 -- go.mod | 2 -- go.sum | 7 ------- helper/builtinplugins/registry.go | 11 +++-------- scripts/gen_openapi.sh | 1 - .../partials/deprecation/centrify-auth-method.mdx | 3 +-- 7 files changed, 4 insertions(+), 23 deletions(-) diff --git a/command/base_predict_test.go b/command/base_predict_test.go index 4c17651ecdb0..387b8f0b84f6 100644 --- a/command/base_predict_test.go +++ b/command/base_predict_test.go @@ -351,7 +351,6 @@ func TestPredict_Plugins(t *testing.T) { "aws", "azure", "cassandra-database-plugin", - "centrify", "cert", "cf", "consul", diff --git a/command/commands.go b/command/commands.go index af2e5dc42df0..f549f38ebbbf 100644 --- a/command/commands.go +++ b/command/commands.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/cli" hcpvlib "github.com/hashicorp/vault-hcp-lib" credAliCloud "github.com/hashicorp/vault-plugin-auth-alicloud" - credCentrify "github.com/hashicorp/vault-plugin-auth-centrify" credCF "github.com/hashicorp/vault-plugin-auth-cf" credGcp "github.com/hashicorp/vault-plugin-auth-gcp/plugin" credOIDC "github.com/hashicorp/vault-plugin-auth-jwt" @@ -218,7 +217,6 @@ var ( loginHandlers = map[string]LoginHandler{ "alicloud": &credAliCloud.CLIHandler{}, "aws": &credAws.CLIHandler{}, - "centrify": &credCentrify.CLIHandler{}, "cert": &credCert.CLIHandler{}, "cf": &credCF.CLIHandler{}, "gcp": &credGcp.CLIHandler{}, diff --git a/go.mod b/go.mod index e6770805e17d..18d6cb9c45da 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,6 @@ require ( github.com/hashicorp/vault-hcp-lib v0.0.0-20240402205111-2312b38227ab github.com/hashicorp/vault-plugin-auth-alicloud v0.17.0 github.com/hashicorp/vault-plugin-auth-azure v0.17.0 - github.com/hashicorp/vault-plugin-auth-centrify v0.15.1 github.com/hashicorp/vault-plugin-auth-cf v0.16.0 github.com/hashicorp/vault-plugin-auth-gcp v0.16.2 github.com/hashicorp/vault-plugin-auth-jwt v0.20.3 @@ -304,7 +303,6 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect github.com/circonus-labs/circonusllhist v0.1.3 // indirect diff --git a/go.sum b/go.sum index 99b44c96ae07..518c4940c7ca 100644 --- a/go.sum +++ b/go.sum @@ -1508,8 +1508,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166 h1:jQ93fKqb/wRmK/KiHpa7Tk9rmHeKXhp4j+5Sg/tENiY= -github.com/centrify/cloud-golang-sdk v0.0.0-20210923165758-a8c48d049166/go.mod h1:c/gmvyN8lq6lYtHvrqqoXrg2xyN65N0mBmbikxFWXNE= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -1904,7 +1902,6 @@ github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= @@ -2363,7 +2360,6 @@ github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= @@ -2524,8 +2520,6 @@ github.com/hashicorp/vault-plugin-auth-alicloud v0.17.0 h1:0SOkYxjMjph3Tbtv37+pA github.com/hashicorp/vault-plugin-auth-alicloud v0.17.0/go.mod h1:79KUWOxY6Ftoad7b+vEmyCmY6eYKdHiADTP0w0TunsE= github.com/hashicorp/vault-plugin-auth-azure v0.17.0 h1:nFsWQV+sMEdJCvKpVODNeTPP36n5bi6yiQpBOdBsQWw= github.com/hashicorp/vault-plugin-auth-azure v0.17.0/go.mod h1:bkIcQTa19JcR426IkSoGEmXX5Yi7nfLp/6M965zvuww= -github.com/hashicorp/vault-plugin-auth-centrify v0.15.1 h1:6StAr5tltpySNgyUwWC8czm9ZqkO7NIZfcRmxxtFwQ8= -github.com/hashicorp/vault-plugin-auth-centrify v0.15.1/go.mod h1:xXs4I5yLxbQ5VHcpvSxkRhShCTXd8Zyrni8qnFrfQ4Y= github.com/hashicorp/vault-plugin-auth-cf v0.16.0 h1:t4+0LY6002NQvY6c0c43ikZjxqReCHUiy7+YXiMRbKo= github.com/hashicorp/vault-plugin-auth-cf v0.16.0/go.mod h1:q+Lt3FhtFlP+pulKSjrbnR8ecu4vY9TlgPvs+nnBey8= github.com/hashicorp/vault-plugin-auth-gcp v0.16.2 h1:HC1PpXxGNzfu7IUfN7Ok7dIMV29R8a/2EJ5uDnrpxz0= @@ -2578,7 +2572,6 @@ github.com/hashicorp/vault/vault/hcp_link/proto v0.0.0-20230201201504-b741fa893d github.com/hashicorp/vault/vault/hcp_link/proto v0.0.0-20230201201504-b741fa893d77/go.mod h1:a2crHoMWwY6aiL8GWT8hYj7vKD64uX0EdRPbnsHF5wU= github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw= github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= diff --git a/helper/builtinplugins/registry.go b/helper/builtinplugins/registry.go index 978321c8ad3c..feaa7a100d38 100644 --- a/helper/builtinplugins/registry.go +++ b/helper/builtinplugins/registry.go @@ -8,7 +8,6 @@ import ( credAliCloud "github.com/hashicorp/vault-plugin-auth-alicloud" credAzure "github.com/hashicorp/vault-plugin-auth-azure" - credCentrify "github.com/hashicorp/vault-plugin-auth-centrify" credCF "github.com/hashicorp/vault-plugin-auth-cf" credGcp "github.com/hashicorp/vault-plugin-auth-gcp/plugin" credJWT "github.com/hashicorp/vault-plugin-auth-jwt" @@ -102,13 +101,9 @@ func newRegistry() *registry { Factory: removedFactory, DeprecationStatus: consts.Removed, }, - "approle": {Factory: credAppRole.Factory}, - "aws": {Factory: credAws.Factory}, - "azure": {Factory: credAzure.Factory}, - "centrify": { - Factory: credCentrify.Factory, - DeprecationStatus: consts.Deprecated, - }, + "approle": {Factory: credAppRole.Factory}, + "aws": {Factory: credAws.Factory}, + "azure": {Factory: credAzure.Factory}, "cert": {Factory: credCert.Factory}, "cf": {Factory: credCF.Factory}, "gcp": {Factory: credGcp.Factory}, diff --git a/scripts/gen_openapi.sh b/scripts/gen_openapi.sh index ef2acca0a0b3..b0c3bba1ee77 100755 --- a/scripts/gen_openapi.sh +++ b/scripts/gen_openapi.sh @@ -54,7 +54,6 @@ vault auth enable "alicloud" vault auth enable "approle" vault auth enable "aws" vault auth enable "azure" -vault auth enable "centrify" vault auth enable "cert" vault auth enable "cf" vault auth enable "gcp" diff --git a/website/content/partials/deprecation/centrify-auth-method.mdx b/website/content/partials/deprecation/centrify-auth-method.mdx index f15b8a9b9d8d..3bc502320708 100644 --- a/website/content/partials/deprecation/centrify-auth-method.mdx +++ b/website/content/partials/deprecation/centrify-auth-method.mdx @@ -4,5 +4,4 @@ | :-------: | :---------------------: | :--------------: | | SEP 2023 | CY24 Q2 | CY24 Q2 -The Centrify auth method can still be used as an external plugin, but Vault -no longer provides official support for the plugin. \ No newline at end of file +Vault no longer provides official support for the Centrify auth method plugin. From b551fed8d3ed14f6a4cf55994de7be395be43328 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Mon, 20 May 2024 11:47:51 -0500 Subject: [PATCH 2/3] changelog --- changelog/27130.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/27130.txt diff --git a/changelog/27130.txt b/changelog/27130.txt new file mode 100644 index 000000000000..ba3352c4128e --- /dev/null +++ b/changelog/27130.txt @@ -0,0 +1,3 @@ +```release-note:change +auth/centrify: Remove the deprecated Centrify auth method plugin +``` From 1f2b23827cf02d239774813ca6f9635f748dece9 Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Mon, 20 May 2024 12:33:10 -0500 Subject: [PATCH 3/3] fix test --- helper/builtinplugins/registry_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/builtinplugins/registry_test.go b/helper/builtinplugins/registry_test.go index 0602ec8bee05..dda57921abf6 100644 --- a/helper/builtinplugins/registry_test.go +++ b/helper/builtinplugins/registry_test.go @@ -98,7 +98,7 @@ func Test_RegistryKeyCounts(t *testing.T) { { name: "number of auth plugins", pluginType: consts.PluginTypeCredential, - want: 19, + want: 18, entWant: 1, }, {