[BUG] pillar docker:pkg:version ignored

[realbodo]

Your setup

Formula commit hash / release tag

9b8b16e

Versions reports (master & minion)

# salt --versions-report
Salt Version:
           Salt: 2017.7.8
 
Dependency Versions:
           cffi: Not Installed
       cherrypy: Not Installed
       dateutil: 2.5.3
      docker-py: Not Installed
          gitdb: Not Installed
      gitpython: Not Installed
          ioflo: Not Installed
         Jinja2: 2.9.4
        libgit2: Not Installed
        libnacl: Not Installed
       M2Crypto: 0.24.0
           Mako: Not Installed
   msgpack-pure: Not Installed
 msgpack-python: 0.4.8
   mysql-python: Not Installed
      pycparser: Not Installed
       pycrypto: 2.6.1
   pycryptodome: Not Installed
         pygit2: Not Installed
         Python: 2.7.13 (default, Sep 26 2018, 18:42:22)
   python-gnupg: 0.3.9
         PyYAML: 3.12
          PyZMQ: 16.0.2
           RAET: Not Installed
          smmap: Not Installed
        timelib: 0.2.4
        Tornado: 4.4.3
            ZMQ: 4.2.1
 
System Versions:
           dist: debian 9.13 
         locale: UTF-8
        machine: x86_64
        release: 4.9.0-13-amd64
         system: Linux
        version: debian 9.13 

Pillar / config used

docker:
  pkg:
    version: "5:19.03.10~3-0~debian-stretch"

---

Bug details

Describe the bug

A specific package version defined in pillar docker:pkg:version will not be installed.
However, docker-formula installs latest docker-package, or the version defined in pillar docker:version.

Steps to reproduce the bug

# salt-call state.apply docker test=true 
          ID: docker-package
    Function: pkg.installed
        Name: docker-ce
      Result: None
     Comment: The following packages would be installed/updated: docker-ce=5:19.03.12~3-0~debian-stretch
     Started: 11:36:56.213617
    Duration: 2281.043 ms
     Changes:   

5:19.03.123-0debian-stretch is currently latest:

# apt-cache policy docker-ce
docker-ce:
  Installed: 5:19.03.10~3-0~debian-stretch
  Candidate: 5:19.03.12~3-0~debian-stretch
  Version table:
     5:19.03.12~3-0~debian-stretch 500
        500 http://download.docker.com/linux/debian stretch/stable amd64 Packages
     5:19.03.11~3-0~debian-stretch 500
        500 http://download.docker.com/linux/debian stretch/stable amd64 Packages
 *** 5:19.03.10~3-0~debian-stretch 500
        500 http://download.docker.com/linux/debian stretch/stable amd64 Packages
        100 /var/lib/dpkg/status

Expected behaviour

formula should install package version defined in pillar docker.pkg.version, as documented in pillar.example

Attempts to fix the bug

Additional context

in docker/install.sls you can find

{%- set docker_pkg_version = docker.version | default(docker.pkg.version) %}

However, in docker/defaults.yaml, docker.version defaults to an empty string, is therefore not undefined, and | default(..) will never be reached.

Once docker:version has been removed from defaults.yaml, formula works as expected, and the version specified in pillar docker.pkg.version gets installed.

[noelmcloughlin]

Fixed in merged #256