From 7e821025b2c171991eb93dd88a1e68ca2e66d74f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 29 Sep 2022 09:09:30 +0900
Subject: [PATCH] authtoken: Remove deprecated auth_plugin

The parameter was deprecated during Victoria cycle[1] in favor of
the auth_type parameter.

[1] 5722f7149c678fcb79cf792a9eda53537e080cb8

Change-Id: Ibc261c2e2ba9fa9ba547ad5d0f736c1b7230c579
---
 manifests/proxy/authtoken.pp                  | 22 +------------------
 ...uthtoken-auth_plugin-43478ec4f2df8ec8.yaml |  5 +++++
 spec/classes/swift_proxy_authtoken_spec.rb    |  2 --
 3 files changed, 6 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/remove-authtoken-auth_plugin-43478ec4f2df8ec8.yaml

diff --git a/manifests/proxy/authtoken.pp b/manifests/proxy/authtoken.pp
index 9df0989a..3af8463c 100644
--- a/manifests/proxy/authtoken.pp
+++ b/manifests/proxy/authtoken.pp
@@ -85,12 +85,6 @@
 #  "public", "internal" or "admin".
 #  Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*auth_plugin*]
-#   (Optional) The plugin for authentication
-#   Defaults to undef
-#
 # == Authors
 #
 #   Dan Bode dan@puppetlabs.com
@@ -117,8 +111,6 @@ class swift::proxy::authtoken(
   $service_token_roles_required = $::os_service_default,
   $service_type                 = $::os_service_default,
   $interface                    = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $auth_plugin                  = undef,
 ) inherits swift::params {
 
   include swift::deps
@@ -131,13 +123,6 @@ Please set password parameter')
     $password_real = $password
   }
 
-  if $auth_plugin != undef {
-    warning('auth_plugin is deprecated. please use auth_type instead')
-    $auth_type_real = $auth_plugin
-  } else {
-    $auth_type_real = $auth_type
-  }
-
   if is_service_default($system_scope) {
     $project_name_real = $project_name
     $project_domain_id_real = $project_domain_id
@@ -151,7 +136,7 @@ Please set password parameter')
     'filter:authtoken/paste.filter_factory':         value => 'keystonemiddleware.auth_token:filter_factory';
     'filter:authtoken/www_authenticate_uri':         value => $www_authenticate_uri;
     'filter:authtoken/auth_url':                     value => $auth_url;
-    'filter:authtoken/auth_type':                    value => $auth_type_real;
+    'filter:authtoken/auth_type':                    value => $auth_type;
     'filter:authtoken/username':                     value => $username;
     'filter:authtoken/user_domain_id':               value => $user_domain_id;
     'filter:authtoken/password':                     value => $password_real, secret => true;
@@ -167,9 +152,4 @@ Please set password parameter')
     'filter:authtoken/service_type':                 value => $service_type;
     'filter:authtoken/interface':                    value => $interface,
   }
-
-  # cleanup the deprecated parameter
-  swift_proxy_config {
-    'filter:authtoken/auth_plugin': ensure => 'absent';
-  }
 }
diff --git a/releasenotes/notes/remove-authtoken-auth_plugin-43478ec4f2df8ec8.yaml b/releasenotes/notes/remove-authtoken-auth_plugin-43478ec4f2df8ec8.yaml
new file mode 100644
index 00000000..28bc394c
--- /dev/null
+++ b/releasenotes/notes/remove-authtoken-auth_plugin-43478ec4f2df8ec8.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``swift::proxy::authtoken::auth_plugin`` parameter has been removed.
+    Use the ``auth_type`` parameter instead.
diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb
index 13f62f6e..6721bf6f 100644
--- a/spec/classes/swift_proxy_authtoken_spec.rb
+++ b/spec/classes/swift_proxy_authtoken_spec.rb
@@ -22,7 +22,6 @@ describe 'swift::proxy::authtoken' do
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_type').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/interface').with_value('<SERVICE DEFAULT>') }
-      it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_ensure('absent') }
     end
 
     describe "when overriding parameters" do
@@ -60,7 +59,6 @@ describe 'swift::proxy::authtoken' do
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_token_roles_required').with_value(true) }
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_type').with_value('identity') }
       it { is_expected.to contain_swift_proxy_config('filter:authtoken/interface').with_value('internal') }
-      it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_ensure('absent') }
     end
 
     describe 'when overriding www_authenticate_uri' do