Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

salt: use tojson when splicing in complex structures #2151

Merged
merged 1 commit into from
Dec 18, 2019

Conversation

NicolasT
Copy link
Contributor

Sometimes we use a complex structure as an interpolated value in an SLS
file. Whilst this works, this is merely by accident, and Salt 2019.2
changes the behaviour: complex values would be spliced in using their
unicode representation, including u"" markers.

As such, use a proper tojson filter in the Jinja templates instead.

See: #650
See: #650
See: https://docs.saltstack.com/en/latest/topics/releases/2019.2.0.html#non-backward-compatible-change-to-yaml-renderer

Sometimes we use a complex structure as an interpolated value in an SLS
file. Whilst this works, this is merely by accident, and Salt 2019.2
changes the behaviour: complex values would be spliced in using their
`unicode` representation, including `u""` markers.

As such, use a proper `tojson` filter in the Jinja templates instead.

See: #650
See: #650
See: https://docs.saltstack.com/en/latest/topics/releases/2019.2.0.html#non-backward-compatible-change-to-yaml-renderer
@NicolasT NicolasT added kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages moonshot complexity:easy Something that requires less than a day to fix labels Dec 18, 2019
@NicolasT NicolasT requested a review from a team as a code owner December 18, 2019 14:09
@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

Hello nicolast,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

Integration data created

I have created the integration data for the additional destination branches.

  • this pull request will merge bugfix/use-tojson into
    development/2.4
  • w/2.5/bugfix/use-tojson will be merged into development/2.5

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@NicolasT
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

Build failed

The build for commit did not succeed in branch bugfix/use-tojson.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.4

  • ✔️ development/2.5

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2019

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.4

  • ✔️ development/2.5

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3

Please check the status of the associated issue None.

Goodbye nicolast.

@bert-e bert-e merged commit 0dbcbd1 into development/2.4 Dec 18, 2019
@bert-e bert-e deleted the bugfix/use-tojson branch December 18, 2019 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants