Compose services

[obeleh]

What does this PR do?

Ads functionality to manage docker-compose service definitions as proposed in #44911

What issues does this PR fix or reference?

#44911

New Behavior

the following salt calls:

• dockercompose.service_create
• dockercompose. service_upsert
• dockercompose.service_remove
• dockercompose.service_set_tag

Different in the behaviour with all other salt calls in this module is that this has to do a yaml.dumps because we're modifying content and not modifying strings. I've explicitly stated in the docstrings that this is the case:

This wil re-write your yaml file. Comments will be lost. Indentation is set to 2 spaces

Tests written?

No

Commits signed with GPG?

Yes

[rallytime]

re-run lint

[terminalmage]

Now that #45190 has been merged, we should wait for @rallytime to merge that forward into develop, and then this should be rebased so that we use salt.utils.yaml.dump() to do the yaml dumping.

[terminalmage]

Now that #45190 has been merged, we should wait for @rallytime to merge that forward into develop, and then this should be rebased so that we use salt.utils.yaml.dump() to do the yaml dumping.

[rallytime]

@obeleh The merge forward should be completed now. Can you address the comments above?

[obeleh]

Ok switched yaml implementation. I hoped however that I could change this:

services[service_name]['image'] = str('{0}:{1}'.format(image, tag))

into this:

services[service_name]['image'] ='{0}:{1}'.format(image, tag)

But I still get this error:

yaml.constructor.ConstructorError: could not determine a constructor for the tag 'tag:yaml.org,2002:python/unicode'
 in "/etc/docker-compose/docker-oversight.yml", line 32, column 12

[terminalmage]

I'll work on the yaml dumper, we shouldn't be adding that YAML tag in our custom dumper.

[terminalmage]

I'll work on the yaml dumper, we shouldn't be adding that YAML tag in our custom dumper.

[terminalmage]

We should be using safe_load here.

[terminalmage]

We should be using safe_load here.

[terminalmage]

no apostrophe necessary after its

[terminalmage]

Oh sorry, I marked this PR as approved but I had a few changes I wanted to see made before merging.

[terminalmage]

Accidentally marked as approved. See my earlier comments for a few changes that should be made.

[terminalmage]

Accidentally marked as approved. See my earlier comments for a few changes that should be made.

[terminalmage]

It turns out that using a regular dump here uses PyYAML's default dumper. Using our custom safe dumper, that YAML tag should not be present in the dumped output.

[terminalmage]

It turns out that using a regular dump here uses PyYAML's default dumper. Using our custom safe dumper, that YAML tag should not be present in the dumped output.

[terminalmage]

Please change this to safe_dump.

[terminalmage]

If you use safe_dump above, you can replace this with '{0}:{1}'.format(image, tag).

[rallytime]

@obeleh Can you come back to this PR and address the comments above?

[obeleh]

Sorry for the delay. At the time you asked for the change I was busy with other things. I've tested the change you suggested and it works. Hope everything is fine now :)

[rallytime]

re-run lint

[rallytime]

@obeleh There's a very small lint error here: https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/19740/violations/file/salt/modules/dockercompose.py/

Can you fix that?