Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Default kvstore owner to nobody #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 10, 2021
Merged

Default kvstore owner to nobody #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
465a56b
Update client.py
ashah-splunk Nov 1, 2021
8dea5eb
Update client.py
ashah-splunk Nov 1, 2021
d6fc1a3
adding kvstore_owner as new property
ashah-splunk Nov 8, 2021
f958a9c
Update test_kvstore_conf.py
ashah-splunk Nov 8, 2021
ee65a75
reload the kvstore once owner is changed
ashah-splunk Nov 8, 2021
bc20898
Update client.py
ashah-splunk Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions splunklib/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ class Service(_BaseService):
def __init__(self, **kwargs):
super(Service, self).__init__(**kwargs)
self._splunk_version = None
self._kvstore_owner = None

@property
def apps(self):
Expand Down Expand Up @@ -675,12 +676,34 @@ def splunk_version(self):
self._splunk_version = tuple([int(p) for p in self.info['version'].split('.')])
return self._splunk_version

@property
def kvstore_owner(self):
"""Returns the KVStore owner for this instance of Splunk.

By default is the kvstore owner is not set, it will return "nobody"
:return: A string with the KVStore owner.
"""
if self._kvstore_owner is None:
self._kvstore_owner = "nobody"
return self._kvstore_owner

@kvstore_owner.setter
def kvstore_owner(self, value):
"""
kvstore is refreshed, when the owner value is changed
"""
self._kvstore_owner = value
self.kvstore

@property
def kvstore(self):
"""Returns the collection of KV Store collections.

sets the owner for the namespace, before retrieving the KVStore Collection

:return: A :class:`KVStoreCollections` collection of :class:`KVStoreCollection` entities.
"""
self.namespace['owner'] = self.kvstore_owner
return KVStoreCollections(self)

@property
Expand Down
2 changes: 1 addition & 1 deletion tests/test_kvstore_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
class KVStoreBatchTestCase(testlib.SDKTestCase):
def setUp(self):
super(KVStoreBatchTestCase, self).setUp()
self.service.namespace['owner'] = 'nobody'
#self.service.namespace['owner'] = 'nobody'
self.service.namespace['app'] = 'search'
confs = self.service.kvstore
if ('test' in confs):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_kvstore_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
class KVStoreConfTestCase(testlib.SDKTestCase):
def setUp(self):
super(KVStoreConfTestCase, self).setUp()
self.service.namespace['owner'] = 'nobody'
#self.service.namespace['owner'] = 'nobody'
self.service.namespace['app'] = 'search'
self.confs = self.service.kvstore
if ('test' in self.confs):
self.confs['test'].delete()

def test_owner_restriction(self):
self.service.namespace['owner'] = 'admin'
self.service.kvstore_owner = 'admin'
self.assertRaises(client.HTTPError, lambda: self.confs.list())
self.service.namespace['owner'] = 'nobody'
self.service.kvstore_owner = 'nobody'

def test_create_delete_collection(self):
self.confs.create('test')
Expand Down
2 changes: 1 addition & 1 deletion tests/test_kvstore_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
class KVStoreDataTestCase(testlib.SDKTestCase):
def setUp(self):
super(KVStoreDataTestCase, self).setUp()
self.service.namespace['owner'] = 'nobody'
#self.service.namespace['owner'] = 'nobody'
self.service.namespace['app'] = 'search'
self.confs = self.service.kvstore
if ('test' in self.confs):
Expand Down