mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-25 06:10:22 -07:00
Fixes bug converning filenames with dots (#33493)
The name detminator was incorrect. This fixes it and fixes unit tests related things that were broken downstream
This commit is contained in:
parent
1f1f1c9d04
commit
212340bf0c
4 changed files with 17 additions and 16 deletions
|
@ -248,11 +248,10 @@ class KeyParameters(Parameters):
|
|||
|
||||
@property
|
||||
def key_filename(self):
|
||||
fname, fext = os.path.splitext(self.name)
|
||||
if fext == '':
|
||||
return fname + '.key'
|
||||
else:
|
||||
if self.name.endswith('.key'):
|
||||
return self.name
|
||||
else:
|
||||
return self.name + '.key'
|
||||
|
||||
@property
|
||||
def key_checksum(self):
|
||||
|
@ -308,11 +307,10 @@ class CertParameters(Parameters):
|
|||
|
||||
@property
|
||||
def cert_filename(self):
|
||||
fname, fext = os.path.splitext(self.name)
|
||||
if fext == '':
|
||||
return fname + '.crt'
|
||||
else:
|
||||
if self.name.endswith('.crt'):
|
||||
return self.name
|
||||
else:
|
||||
return self.name + '.crt'
|
||||
|
||||
@property
|
||||
def cert_src(self):
|
||||
|
|
|
@ -167,11 +167,10 @@ class Parameters(AnsibleF5Parameters):
|
|||
|
||||
@property
|
||||
def key_filename(self):
|
||||
fname, fext = os.path.splitext(self.name)
|
||||
if fext == '':
|
||||
return fname + '.key'
|
||||
else:
|
||||
if self.name.endswith('.key'):
|
||||
return self.name
|
||||
else:
|
||||
return self.name + '.key'
|
||||
|
||||
@property
|
||||
def key_checksum(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue