bugfix: don't set Hostname when HostnameItem is set

DocMarten commented 2 years ago

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
[x] [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

Currently there is no chance to use 'HostnameItem', because it is only used when 'Hostname' is not set.

### Option: HostnameItem
#   Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.

And Hostname is always set.

Pillar / config required to test the proposed changes

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

hatifnatt commented 2 years ago

@myii can you please take a look? CI errors definitely caused not by this PR. I can assume issue is caused by Salt version upgrade, but I don't have similar errors locally on 3004.

DocMarten commented 2 years ago

@hatifnatt how can we finish this pr?

hatifnatt commented 2 years ago

@DocMarten sorry for such a big delay, there was some strange CI errors I have waited for @myii feedback about them, but probably he missed my mention or don't have time to investigate. Currently there is only issues due old version of the packages. We can ignore them for this changes.

saltstack-formulas-travis commented 2 years ago

:tada: This PR is included in version 1.3.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

myii commented 2 years ago

... there was some strange CI errors I have waited for @myii feedback about them, but probably he missed my mention or don't have time to investigate. Currently there is only issues due old version of the packages. We can ignore them for this changes.

Pretty busy these days, so apologies for the delay and thanks for getting on with the merge.

Let me know if the CI errors persist.

hatifnatt commented 2 years ago

@myii that's what I'm talking about https://gitlab.com/saltstack-formulas/zabbix-formula/-/jobs/2586082794#L1881

Comment: Failed to configure repo 'deb https://repo.zabbix.com/zabbix/4.4/debian buster main': 'str' object has no attribute 'name'

But in recent pipeline this error doesn't occur https://gitlab.com/saltstack-formulas/zabbix-formula/-/jobs/2741026467#L5452

myii commented 2 years ago

But in recent pipeline this error doesn't occur https://gitlab.com/saltstack-formulas/zabbix-formula/-/jobs/2741026467#L5452

@hatifnatt Ah yes, there were a number of pkgrepo fixes recently. I'm pretty sure I mentioned that specific error when I reported it to the Salt developer I was in discussions with.

saltstack-formulas / zabbix-formula