ansible/hetzner.hcloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/hetzner.hcloud.git synced 2026-02-04 16:11:49 +00:00
Code Activity

Fix sanity tests

Browse source
This commit is contained in:
Lukas Kämmerling 2021-04-08 12:20:20 +02:00
parent 737c14736e
commit 8c74ae070d
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/modules/hcloud_server.py
View file

@ -8,8 +8,6 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type
from dateutil import relativedelta
DOCUMENTATION = '''
---
module: hcloud_server
@ -262,6 +260,7 @@ hcloud_server:
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native
from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud
from datetime import timedelta
try:
from hcloud.volumes.domain import Volume
@ -401,19 +400,20 @@ class AnsibleHcloudServer(Hcloud):
else:
try:
image = self.client.images.get_by_id(self.module.params.get("image"))
except:
self.module.fail_json(msg=f"Image {self.module.params.get('image')} was not found")
except Exception:
self.module.fail_json(msg="Image %s was not found" % image.name)
if image.deprecated is not None:
available_until = image.deprecated + relativedelta.relativedelta(months=3)
available_until = image.deprecated + timedelta(days=180)
if self.module.params.get("allow_deprecated_image"):
self.module.warn(
f"You try to use a deprecated image. The image {image.name} will "
f"continue to be available until {available_until.strftime('%Y-%m-%d')}."
("You try to use a deprecated image. The image %s will " +
"continue to be available until %s.") % (image.name, available_until.strftime('%Y-%m-%d'))
)
else:
self.module.fail_json(msg=f"You try to use a deprecated image. The image {image.name} will "
f"continue to be available until {available_until.strftime('%Y-%m-%d')}. "
f"If you want to use this image use allow_deprecated_image=yes."
self.module.fail_json(msg=("You try to use a deprecated image. The image %s will " +
"continue to be available until %s. " +
"If you want to use this image use allow_deprecated_image=yes.") % (
image.name, available_until.strftime('%Y-%m-%d'))
)
return image

2
tests/integration/targets/hcloud_server/tasks/main.yml
View file

@ -48,7 +48,7 @@
assert:
that:
- result is failed
- 'result.msg == "You try to use a deprecated image. The image ubuntu-16.04 will continue to be available until 2021-06-24. If you want to use this image use allow_deprecated_image=yes."'
- 'result.msg == "You try to use a deprecated image. The image ubuntu-16.04 will continue to be available until 2021-06-20. If you want to use this image use allow_deprecated_image=yes."'
- name: test create server with check mode
hcloud_server: