From 74e1d708e615e7cc5aba343c3ba40360807adf65 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 17 Apr 2025 23:44:22 +0900
Subject: [PATCH] Remove sahara class

It was formally deprecated during the 2024.2 cycle[1].

[1] 7651af1cb3105395175bbb237ffdc0b5878d95a1

Change-Id: Ied60b5efe996462774484d98aa3156f662c4b14c
---
 manifests/clients/sahara.pp                   | 48 -----------------
 .../notes/remove-sahara-3dfd15ae038ab838.yaml |  4 ++
 spec/classes/heat_clients_sahara_spec.rb      | 51 -------------------
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 manifests/clients/sahara.pp
 create mode 100644 releasenotes/notes/remove-sahara-3dfd15ae038ab838.yaml
 delete mode 100644 spec/classes/heat_clients_sahara_spec.rb

diff --git a/manifests/clients/sahara.pp b/manifests/clients/sahara.pp
deleted file mode 100644
index f291eb23..00000000
--- a/manifests/clients/sahara.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Class heat::clients::sahara
-#
-#  DEPRECATED !!
-#  sahara client configuration
-#
-# == Parameters
-#
-# [*endpoint_type*]
-#   (Optional) Type of endpoint in Identity service catalog to use for
-#   communication with the OpenStack service.
-#   Defaults to $facts['os_service_default'].
-#
-# [*ca_file*]
-#   (Optional) Optional CA cert file to use in SSL communications.
-#   Defaults to $facts['os_service_default'].
-#
-# [*cert_file*]
-#   (Optional) Optional PEM-formatted certificate chain file.
-#   Defaults to $facts['os_service_default'].
-#
-# [*key_file*]
-#   (Optional) Optional PEM-formatted file that contains the private key.
-#   Defaults to $facts['os_service_default'].
-#
-# [*insecure*]
-#   (Optional) If set, then the server's certificate will not be verified.
-#   Defaults to $facts['os_service_default'].
-#
-class heat::clients::sahara (
-  $endpoint_type = $facts['os_service_default'],
-  $ca_file       = $facts['os_service_default'],
-  $cert_file     = $facts['os_service_default'],
-  $key_file      = $facts['os_service_default'],
-  $insecure      = $facts['os_service_default'],
-) {
-
-  include heat::deps
-
-  warning('The heat::clients::sahara class is deprecated.')
-
-  heat::clients::base { 'clients_sahara':
-    endpoint_type => $endpoint_type,
-    ca_file       => $ca_file,
-    cert_file     => $cert_file,
-    key_file      => $key_file,
-    insecure      => $insecure,
-  }
-}
diff --git a/releasenotes/notes/remove-sahara-3dfd15ae038ab838.yaml b/releasenotes/notes/remove-sahara-3dfd15ae038ab838.yaml
new file mode 100644
index 00000000..24796f28
--- /dev/null
+++ b/releasenotes/notes/remove-sahara-3dfd15ae038ab838.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``heat::clients::sahara`` class has been removed.
diff --git a/spec/classes/heat_clients_sahara_spec.rb b/spec/classes/heat_clients_sahara_spec.rb
deleted file mode 100644
index c4908829..00000000
--- a/spec/classes/heat_clients_sahara_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'heat::clients::sahara' do
-  shared_examples 'heat::clients::sahara' do
-    context 'with defaults' do
-      it 'configures defaults' do
-        is_expected.to contain_heat__clients__base('clients_sahara').with(
-          :endpoint_type => '<SERVICE DEFAULT>',
-          :ca_file       => '<SERVICE DEFAULT>',
-          :cert_file     => '<SERVICE DEFAULT>',
-          :key_file      => '<SERVICE DEFAULT>',
-          :insecure      => '<SERVICE DEFAULT>',
-        )
-      end
-    end
-
-    context 'with parameters' do
-      let :params do
-        {
-          :endpoint_type => 'publicURL',
-          :ca_file       => '/path/to/ca.cert',
-          :cert_file     => '/path/to/certfile',
-          :key_file      => '/path/to/key',
-          :insecure      => false,
-        }
-      end
-
-      it 'configures client parameters' do
-        is_expected.to contain_heat__clients__base('clients_sahara').with(
-          :endpoint_type => 'publicURL',
-          :ca_file       => '/path/to/ca.cert',
-          :cert_file     => '/path/to/certfile',
-          :key_file      => '/path/to/key',
-          :insecure      => false,
-        )
-      end
-    end
-  end
-
-  on_supported_os({
-    :supported_os => OSDefaults.get_supported_os
-  }).each do |os,facts|
-    context "on #{os}" do
-      let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
-      end
-
-      it_behaves_like 'heat::clients::sahara'
-    end
-  end
-end