paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated ovhapi module
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Paul 2022-12-11 15:22:48 +01:00
parent 0412f86d26
commit bfd8b6cf72
2 changed files with 74 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
states/_modules/ovhapi.py
View File

@ -21,7 +21,7 @@ def _config():
return config return config
def _auth(): def authenticate():
cfg = _config() cfg = _config()
client = ovh.Client( client = ovh.Client(
endpoint=cfg['endpoint'], endpoint=cfg['endpoint'],
@ -33,17 +33,19 @@ def _auth():
return client return client
def domain_get_zone(zone=""): def domain_get_zone(zone="",
client=None):
''' '''
Get DNS zone extraction Get DNS zone extraction
zone zone
Zone name to fetch Zone name to fetch
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
client = _auth()
try: try:
results = client.get(f'/domain/zone/{zone}/export') results = client.get(f'/domain/zone/{zone}/export')
except APIError: except APIError:
@ -52,7 +54,11 @@ def domain_get_zone(zone=""):
return results return results
def domain_get_record(zone="", fieldType="", subDomain="", target=""): def domain_get_record(zone="",
fieldType="",
subDomain="",
target="",
client=None):
''' '''
Record of the zone Record of the zone
@ -64,11 +70,12 @@ def domain_get_record(zone="", fieldType="", subDomain="", target=""):
Filter the value of subDomain property (like) Filter the value of subDomain property (like)
target target
Resource record target Resource record target
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
client = _auth()
try: try:
records = client.get(f'/domain/zone/{zone}/record', records = client.get(f'/domain/zone/{zone}/record',
fieldType=fieldType, fieldType=fieldType,
@ -87,7 +94,8 @@ def domain_post_record(zone="",
fieldType="", fieldType="",
subDomain="", subDomain="",
target="", target="",
ttl=0): ttl=0,
client=None):
''' '''
Create a new DNS record Create a new DNS record
@ -101,11 +109,12 @@ def domain_post_record(zone="",
Resource record target Resource record target
ttl ttl
Resource record ttl Resource record ttl
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
client = _auth()
try: try:
req = client.post(f'/domain/zone/{zone}/record', req = client.post(f'/domain/zone/{zone}/record',
fieldType=fieldType, fieldType=fieldType,
@ -122,7 +131,9 @@ def domain_put_record(zone="",
fieldType="", fieldType="",
subDomain="", subDomain="",
target="", target="",
ttl=0): ttl=0,
current=None,
client=None):
''' '''
Update a DNS record Update a DNS record
@ -136,31 +147,29 @@ def domain_put_record(zone="",
Resource record target Resource record target
ttl ttl
Resource record ttl Resource record ttl
current
Current DNS record
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
client = _auth()
try: try:
records = client.get(f'/domain/zone/{zone}/record', client.put(f'/domain/zone/{zone}/record/{current["id"]}',
fieldType=fieldType, subDomain=subDomain,
subDomain=subDomain) target=target,
if len(records) > 0: ttl=ttl)
for rec in records: changed = client.get(f'/domain/zone/{zone}/record/{current["id"]}')
res = client.get(f'/domain/zone/{zone}/record/{rec}')
if res['target'] == target:
req = client.put(f'/domain/zone/{zone}/record/{rec}',
subDomain=subDomain,
target=target,
ttl=ttl)
return req
except APIError: except APIError:
return "Query failed in OVH API" return "Query failed in OVH API"
return changed
return "Error updating record"
def domain_delete_record(zone="", fieldType="", subDomain=""): def domain_delete_record(zone="",
fieldType="",
subDomain="",
client=None):
''' '''
Delete a DNS record (Don't forget to refresh the zone) Delete a DNS record (Don't forget to refresh the zone)
@ -170,12 +179,13 @@ def domain_delete_record(zone="", fieldType="", subDomain=""):
Filter the value of fieldType property (like) Filter the value of fieldType property (like)
subDomain subDomain
Filter the value of subDomain property (like) Filter the value of subDomain property (like)
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
results = [] results = []
client = _auth()
try: try:
records = client.get(f'/domain/zone/{zone}/record', records = client.get(f'/domain/zone/{zone}/record',
fieldType=fieldType, fieldType=fieldType,
@ -192,17 +202,19 @@ def domain_delete_record(zone="", fieldType="", subDomain=""):
return results return results
def domain_refresh_zone(zone=""): def domain_refresh_zone(zone="",
client=None):
''' '''
Apply zone modification on DNS servers Apply zone modification on DNS servers
zone zone
The internal name of your zone The internal name of your zone
client
Client to use against API
''' '''
if zone == "": if zone == "":
raise ArgumentValueError("Zone is not defined") raise ArgumentValueError("Zone is not defined")
client = _auth()
try: try:
req = client.post(f'/domain/zone/{zone}/refresh') req = client.post(f'/domain/zone/{zone}/refresh')
except APIError: except APIError:

61
states/_states/ovhapi.py
View File

@ -1,5 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
from salt.utils.dictdiffer import deep_diff
def _error(ret, err_msg): def _error(ret, err_msg):
ret['result'] = False ret['result'] = False
ret['comment'] = err_msg ret['comment'] = err_msg
@ -39,40 +41,47 @@ def domain_record_present(name=None,
if type(target) is not str: if type(target) is not str:
return _error(ret, 'Must provide target to ovhapi.domain_record_present') return _error(ret, 'Must provide target to ovhapi.domain_record_present')
# check if record exists client = __salt__['ovhapi.authenticate']()
cur_record = __salt__['ovhapi.domain_get_record'](zone=zone,
fieldType=recordtype,
subDomain=recordname,
target=target)
if cur_record:
new_record = __salt__['ovhapi.domain_put_record'](zone=zone,
fieldType=recordtype,
subDomain=recordname,
target=target)
ret['changes'] = { # check if record exists
"diff": f"old record: {cur_record}, new record: {new_record}" current_record = __salt__['ovhapi.domain_get_record'](zone=zone,
} fieldType=recordtype,
res_output = f"Updated record {recordname}" subDomain=recordname,
target=target,
client=client)
if current_record:
new_record = __salt__['ovhapi.domain_put_record'](zone=zone,
fieldType=recordtype,
subDomain=recordname,
target=target,
current=current_record,
client=client)
diff = deep_diff(current_record,new_record)
if diff == {}:
ret['comment'] = f"No updates on record {recordname}"
else:
ret['changes'] = {
"diff": diff
}
ret['comment'] = f"Updated record {recordname}"
else: else:
new_record = __salt__['ovhapi.domain_post_record'](zone=zone, new_record = __salt__['ovhapi.domain_post_record'](zone=zone,
subDomain=recordname, subDomain=recordname,
fieldType=recordtype, fieldType=recordtype,
target=target, target=target,
ttl=ttl) ttl=ttl,
client=client)
ret['changes'] = { ret['changes'] = {
"diff": f"new record: {new_record}" "diff": f"{new_record}"
} }
res_output = f"Created record {recordname}" ret['comment'] = f"Created record {recordname}"
ret['comment'] = f'Result is {res_output}'
return ret return ret
def domain_zone_refresh(name="", zone=""): def domain_zone_refresh(name="", zone=""):
res_output = ""
ret = { ret = {
'name': name, 'name': name,
'changes': {}, 'changes': {},
@ -80,8 +89,8 @@ def domain_zone_refresh(name="", zone=""):
'comment': 'Zone is refreshed' 'comment': 'Zone is refreshed'
} }
res_output = __salt__['ovhapi.domain_refresh_zone'](zone=zone) client = __salt__['ovhapi.authenticate']()
ret['comment'] = __salt__['ovhapi.domain_refresh_zone'](zone=zone,
ret['comment'] = f'Result is {res_output}' client=client)
return ret return ret