openstack/puppet-keystone
Code Issues Proposed changes

Drop unused provider/keystone/util

Browse Source 
The split_domain function in the module is not used.

Change-Id: I6991d99c3fb7aed5d559e0e4b90f1bd5d028f099
This commit is contained in:
Takashi Kajinami 2024-10-10 22:11:02 +09:00
parent 8fd44a2b96
commit 88aaad7897
4 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/puppet/provider/keystone.rb
View File

@ -1,7 +1,6 @@
require 'puppet/provider/openstack'
require 'puppet/provider/openstack/auth'
require 'puppet/provider/openstack/credentials'
require File.join(File.dirname(__FILE__), '..','..', 'puppet/provider/keystone/util')
class Puppet::Provider::Keystone < Puppet::Provider::Openstack

25
lib/puppet/provider/keystone/util.rb
View File

@ -1,25 +0,0 @@
module Util
# Splits the rightmost part of a string using '::' as delimiter
# Returns an array of both parts or nil if either is empty.
# An empty rightmost part is ignored and converted as 'string::' => 'string'
#
# Examples:
# "foo" -> ["foo", nil]
# "foo::" -> ["foo", nil]
# "foo::bar" -> ["foo", "bar"]
# "foo::bar::" -> ["foo", "bar"]
# "::foo" -> [nil, "foo"]
# "::foo::" -> [nil, "foo"]
# "foo::bar::baz" -> ["foo::bar", "baz"]
# "foo::bar::baz::" -> ["foo::bar", "baz"]
#
def self.split_domain(str)
left, right = nil, nil
unless str.nil?
left, delimiter, right = str.gsub(/::$/, '').rpartition('::')
left, right = right, nil if delimiter.empty?
left = nil if left.empty?
end
return [left, right]
end
end

1
lib/puppet/provider/keystone_user_role/openstack.rb
View File

@ -1,5 +1,4 @@
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone/util')
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet_x/keystone/composite_namevar')
Puppet::Type.type(:keystone_user_role).provide(

29
spec/unit/provider/keystone/util_spec.rb
View File

@ -1,29 +0,0 @@
require 'puppet'
require 'spec_helper'
require 'puppet/provider/keystone'
require 'puppet/provider/keystone/util'
describe "split_domain method" do
it 'should handle nil and empty strings' do
expect(Util.split_domain('')).to eq([nil, nil])
expect(Util.split_domain(nil)).to eq([nil, nil])
end
it 'should return name and no domain' do
expect(Util.split_domain('foo')).to eq(['foo', nil])
expect(Util.split_domain('foo::')).to eq(['foo', nil])
end
it 'should return name and domain' do
expect(Util.split_domain('foo::bar')).to eq(['foo', 'bar'])
expect(Util.split_domain('foo::bar::')).to eq(['foo', 'bar'])
expect(Util.split_domain('::foo::bar')).to eq(['::foo', 'bar'])
expect(Util.split_domain('::foo::bar::')).to eq(['::foo', 'bar'])
expect(Util.split_domain('foo::bar::baz')).to eq(['foo::bar', 'baz'])
expect(Util.split_domain('foo::bar::baz::')).to eq(['foo::bar', 'baz'])
expect(Util.split_domain('::foo::bar::baz')).to eq(['::foo::bar', 'baz'])
expect(Util.split_domain('::foo::bar::baz::')).to eq(['::foo::bar', 'baz'])
end
it 'should return domain only' do
expect(Util.split_domain('::foo')).to eq([nil, 'foo'])
expect(Util.split_domain('::foo::')).to eq([nil, 'foo'])
end
end