Skip to content
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

Jump to bottom

[2.7] docker_swarm_service: Pass correct types on secrets/configs gid,uid,mode #55617

Merged
merged 3 commits into from
Apr 24, 2019
Merged

[2.7] docker_swarm_service: Pass correct types on secrets/configs gid,uid,mode #55617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3e2488
Pass correct types on secrets/configs gid,uid,mode
hannseman Apr 22, 2019
dd86b6a
Add changelog fragment
hannseman Apr 22, 2019
1eb795c
Fix idempotency
hannseman Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/55617-docker_swarm_service_use_correct_secrets_configs_types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "docker_swarm_service - Change the type of options ``gid`` and ``uid`` to ``str`` and ``mode`` to ``int`` on ``secrets`` and ``configs``."
24 changes: 12 additions & 12 deletions lib/ansible/modules/cloud/docker/docker_swarm_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@
required: false
description:
- List of dictionaries describing the service secrets.
- Every item must be a dictionary exposing the keys secret_id, secret_name, filename, uid (defaults to 0), gid (defaults to 0), mode (defaults to 0o444)
- Every item must be a dictionary exposing the keys secret_id, secret_name, filename, uid (defaults to 0), gid (defaults to 0), mode (defaults to 0444)
- Maps docker service --secret option.
- Requires API version >= 1.25
default: []
configs:
required: false
description:
- List of dictionaries describing the service configs.
- Every item must be a dictionary exposing the keys config_id, config_name, filename, uid (defaults to 0), gid (defaults to 0), mode (defaults to 0o444)
- Every item must be a dictionary exposing the keys config_id, config_name, filename, uid (defaults to 0), gid (defaults to 0), mode (defaults to 0444)
- Maps docker service --config option.
- Requires API version >= 1.30
default: []
Expand Down Expand Up @@ -654,9 +654,9 @@ def from_ansible_params(ap, old_service):
service_c['config_id'] = param_m['config_id']
service_c['config_name'] = str(param_m['config_name'])
service_c['filename'] = param_m.get('filename', service_c['config_name'])
service_c['uid'] = int(param_m.get('uid', "0"))
service_c['gid'] = int(param_m.get('gid', "0"))
service_c['mode'] = param_m.get('mode', 0o444)
service_c['uid'] = str(param_m.get('uid', "0"))
service_c['gid'] = str(param_m.get('gid', "0"))
service_c['mode'] = int(param_m.get('mode', 0o444))
s.configs.append(service_c)

s.secrets = []
Expand All @@ -665,9 +665,9 @@ def from_ansible_params(ap, old_service):
service_s['secret_id'] = param_m['secret_id']
service_s['secret_name'] = str(param_m['secret_name'])
service_s['filename'] = param_m.get('filename', service_s['secret_name'])
service_s['uid'] = int(param_m.get('uid', "0"))
service_s['gid'] = int(param_m.get('gid', "0"))
service_s['mode'] = param_m.get('mode', 0o444)
service_s['uid'] = str(param_m.get('uid', "0"))
service_s['gid'] = str(param_m.get('gid', "0"))
service_s['mode'] = int(param_m.get('mode', 0o444))
s.secrets.append(service_s)
return s

Expand Down Expand Up @@ -984,17 +984,17 @@ def get_service(self, name):
'config_id': config_data['ConfigID'],
'config_name': config_data['ConfigName'],
'filename': config_data['File'].get('Name'),
'uid': int(config_data['File'].get('UID')),
'gid': int(config_data['File'].get('GID')),
'uid': config_data['File'].get('UID'),
'gid': config_data['File'].get('GID'),
'mode': config_data['File'].get('Mode')
})
for secret_data in raw_data['Spec']['TaskTemplate']['ContainerSpec'].get('Secrets', []):
ds.secrets.append({
'secret_id': secret_data['SecretID'],
'secret_name': secret_data['SecretName'],
'filename': secret_data['File'].get('Name'),
'uid': int(secret_data['File'].get('UID')),
'gid': int(secret_data['File'].get('GID')),
'uid': secret_data['File'].get('UID'),
'gid': secret_data['File'].get('GID'),
'mode': secret_data['File'].get('Mode')
})
networks_names_ids = self.get_networks_names_ids()
Expand Down