fix(repo): reorder dependencies to prevent errors

[javierbertoli]

PR progress checklist (to be filled in by reviewers)

• Changes to documentation are appropriate (or tick if not required)
• Changes to tests are appropriate (or tick if not required)
• Reviews completed

---

What type of PR is this?

Primary type

• [build] Changes related to the build system
• [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
• [ci] Changes to the continuous integration configuration
• [feat] A new feature
• [fix] A bug fix
• [perf] A code change that improves performance
• [refactor] A code change that neither fixes a bug nor adds a feature
• [revert] A change used to revert a previous commit
• [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

• [docs] Documentation changes
• [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

When installing a postgresql-client using upstream's repo, the formula fails to install the repo because a require_in dependency expects the postgresql-server package. This PR moves the dependency to the server/init.sls state.

Pillar / config required to test the proposed changes

The issue can be reproduced using this pillar

postgres:
  use_upstream_repo: true
  version: 11

and this command

salt-call --local state.apply postgres.client

Debug log showing how the proposed changes work

Documentation checklist

• Updated the README (e.g. Available states).
• Updated pillar.example.

Testing checklist

• Included in Kitchen (i.e. under state_top).
• Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
• Updated the relevant test pillar.

Additional context

[sticky-note]

This is the exact contrary of this #300
which was introduced because when use_upstream_repo: True on FreeBSD the require: postgresql-repo fails to find the right due probably to this line

postgres-formula/postgres/upstream.sls

Line 4 in 7d46b27

{%- if 'pkg_repo' in postgres -%}

Not sure of what I am saying, I had the exact same problem today but this PR need to be double checked

[vutny]

This statement probably needs additional expression, the same as in upstream.sls:

Suggested change

	{%- if postgres.use_upstream_repo == true %}
	{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}

Because if "upstream" is flag is on, but there are no repo definition for particular distro, the requisite will fail.

[javierbertoli]

@sticky-note, I added the changes @vutny suggests and also added the same check in a few other places where postgres.use_upstream_repo was being checked but pkg_repo was not.

I think the changes in this PR should be OK for all the platforms, but I don't have a FreeBSD around to try it. Can you try it and give us your feedback?

[vutny]

Thanks @javierbertoli , I just have minor comment about MacOS case.

[vutny]

Looks good to me, thank you @javierbertoli !

[sticky-note]

Ok, it seems to have no issue in this manner. Thanks @javierbertoli

[javierbertoli]

Thanks to you both!

[saltstack-formulas-travis]

🎉 This PR is included in version 0.41.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀