Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saltstack-formulas/template-formula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.7.6
Choose a base ref
...
head repository: saltstack-formulas/template-formula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.0
Choose a head ref
  • 19 commits
  • 21 files changed
  • 4 contributors

Commits on Feb 28, 2019

  1. refactor(pkg): move pkg related components into separate directory

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    c21f82b View commit details
    Browse the repository at this point in the history

  2. feat(pkg): use require requisite between pkg states 

    * `tpldot` is the equivalent of `tpldir` but using `.` instead of `/`:
  - https://github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/jinja.py#L120
  - https://github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/templates.py#L145
* Implementation based on upstream issue:
  - saltstack/salt#10838 (comment)
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    6e7141b View commit details
    Browse the repository at this point in the history

  3. feat(pkg): add clean states

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    422c7ac View commit details
    Browse the repository at this point in the history

  4. refactor(tpldir): use topdir globally in place of tpldir 

    * `topdir` evaluates to the formula's root directory
* Maintains formula's portability by providing consistent navigation
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    2838bc9 View commit details
    Browse the repository at this point in the history

  5. refactor(topdir): use for include and require except init.sls 

    * Make all `init.sls` imports relative since unnecessary there
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    a218e91 View commit details
    Browse the repository at this point in the history

  6. refactor(components): split components into separate subdirs 

    * Plan based upon the following comments:
  - #48 (review)
  - #48 (comment)
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    d957055 View commit details
    Browse the repository at this point in the history

  7. refactor(include+require): use variable for duplicate values

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    4443518 View commit details
    Browse the repository at this point in the history

  8. docs(components): update for separation of pkg, config & service

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    726fcab View commit details
    Browse the repository at this point in the history

  9. docs(readme): add suggested improvement to template.service.clean

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    bf1039c View commit details
    Browse the repository at this point in the history

  10. refactor(tplroot): use tplroot instead of topdir to match tpldata 

    * Upstream feature request PR:
  - saltstack/salt#51814
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    b7356b0 View commit details
    Browse the repository at this point in the history

  11. refactor(pkg): change to package instead 

    * #48 (comment)

BREAKING CHANGE: Changing the `pkg` directory to `package` will break
implementations that are depending on `pkg` for `include` or `sls`-based
requisite purposes.
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    2cd82e5 View commit details
    Browse the repository at this point in the history

  12. refactor(states): set state IDs based on a dependable structure 

    * Based on:
  - #48 (comment)
  - #48 (comment)

Consistent structure using 5 parts to the state ID naming:

* 3 parts from the filename:
  - `template/package/install.sls`
* 2 parts from the state:
  - `pkg.installed`
* In the structure:
  - `<formula>-<subdir1>-<subdir2>-<state1>-<state2>`
* Putting together to get:
  - `template-package-install-pkg-installed`

BREAKING CHANGE: Wholesale state ID changes will break implementations
that are relying on the previous state IDs for requisite purposes.
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    6690ee6 View commit details
    Browse the repository at this point in the history

  13. docs(readme): fix typos

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    007159a View commit details
    Browse the repository at this point in the history

  14. revert(kitchen+travis): disable debian-8 due to 2019.2 bug 

    This reverts commit 178c710.

Fix is to use `debian:jessie-backports`, to fix in the next commit.
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    e8f0f7e View commit details
    Browse the repository at this point in the history

  15. ci(kitchen+travis): use debian:jessie-backports as debian-8 

    * Close #50.
* saltstack/salt#51808
* vmware-archive/salt-pack#657 (comment)
    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    1b9d249 View commit details
    Browse the repository at this point in the history

  16. ci(kitchen): specify image explicitly for each platform

    @myii
    myii committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    b25fbdc View commit details
    Browse the repository at this point in the history

  17. Merge pull request #63 from myii/chore/use-jessie-backports 

    ci(kitchen+travis): use `debian:jessie-backports` as `debian-8`
    @myii
    myii authored Feb 28, 2019
    Configuration menu
    Copy the full SHA
    c6fc98f View commit details
    Browse the repository at this point in the history

  18. Merge pull request #48 from myii/PR_separate-formula-components 

    feat(pkg): separate components, use requisites and add `clean` states
    @aboe76
    aboe76 authored Feb 28, 2019
    Configuration menu
    Copy the full SHA
    22de380 View commit details
    Browse the repository at this point in the history

  19. chore(release): 1.0.0 [skip ci] 

    # [1.0.0](v0.7.6...v1.0.0) (2019-02-28)

### Code Refactoring

* **components:** split components into separate subdirs ([d957055](d957055)), closes [/github.com//pull/48#pullrequestreview-207182085](https://github.com//github.com/saltstack-formulas/template-formula/pull/48/issues/pullrequestreview-207182085) [/github.com//pull/48#discussion_r259805312](https://github.com//github.com/saltstack-formulas/template-formula/pull/48/issues/discussion_r259805312)
* **include+require:** use variable for duplicate values ([4443518](4443518))
* **pkg:** change to `package` instead ([2cd82e5](2cd82e5)), closes [/github.com//pull/48#discussion_r259951123](https://github.com//github.com/saltstack-formulas/template-formula/pull/48/issues/discussion_r259951123)
* **pkg:** move `pkg` related components into separate directory ([c21f82b](c21f82b))
* **states:** set state IDs based on a dependable structure ([6690ee6](6690ee6)), closes [/github.com//pull/48#discussion_r259953473](https://github.com//github.com/saltstack-formulas/template-formula/pull/48/issues/discussion_r259953473) [/github.com//pull/48#discussion_r259956996](https://github.com//github.com/saltstack-formulas/template-formula/pull/48/issues/discussion_r259956996)
* **topdir:** use for `include` and `require` except `init.sls` ([a218e91](a218e91))
* **tpldir:** use `topdir` globally in place of `tpldir` ([2838bc9](2838bc9))
* **tplroot:** use `tplroot` instead of `topdir` to match `tpldata` ([b7356b0](b7356b0))

### Continuous Integration

* **kitchen:** specify `image` explicitly for each platform ([b25fbdc](b25fbdc))
* **kitchen+travis:** use `debian:jessie-backports` as `debian-8` ([1b9d249](1b9d249)), closes [#50](#50) [/github.com/vmware-archive/salt-pack/issues/657#issuecomment-467932962](https://github.com//github.com/saltstack/salt-pack/issues/657/issues/issuecomment-467932962)

### Documentation

* **components:** update for separation of `pkg`, `config` & `service` ([726fcab](726fcab))
* **readme:** add suggested improvement to `template.service.clean` ([bf1039c](bf1039c))
* **readme:** fix typos ([007159a](007159a))

### Features

* **pkg:** add `clean` states ([422c7ac](422c7ac))
* **pkg:** use `require` requisite between `pkg` states ([6e7141b](6e7141b)), closes [/github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/jinja.py#L120](https://github.com//github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/jinja.py/issues/L120) [/github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/templates.py#L145](https://github.com//github.com/saltstack/salt/blob/0c78d7dc894058988d171a28a11bd4a9dbf60266/salt/utils/templates.py/issues/L145) [/github.com/saltstack/salt/issues/10838#issuecomment-391718086](https://github.com//github.com/saltstack/salt/issues/10838/issues/issuecomment-391718086)

### Reverts

* **kitchen+travis:** disable `debian-8` due to `2019.2` bug ([e8f0f7e](e8f0f7e))

### BREAKING CHANGES

* **states:** Wholesale state ID changes will break implementations
that are relying on the previous state IDs for requisite purposes.
* **pkg:** Changing the `pkg` directory to `package` will break
implementations that are depending on `pkg` for `include` or `sls`-based
requisite purposes.
    @semantic-release-bot
    semantic-release-bot committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    b91d304 View commit details
    Browse the repository at this point in the history
Loading