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

Revert pr #16050 #16201

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Revert pr #16050 #16201

merged 1 commit into from
Jun 6, 2024

Conversation

andsel
Copy link
Contributor

@andsel andsel commented Jun 6, 2024

Release notes

Bugfix a regression which resulted in missed environment variables resolution inside pipelines.yml

What does this PR do?

Revert pr #16050, which avoided to replace environment variables (${VAR}) inside config.string in the pipelines.yml file, but that created a regression, because env vars is expected to be replaced in all the other yaml keys.

Why is it important/What is the impact to the user?

Environment variables has to be resolved in config/pipelines.yml. With previous PR #16050 was tried to fix a problem linked also to resolution, which generated errors (and prohibited LS to start) if env vars were referred in commented code inside config.string definition in pipelines.yml. The fix was to avoid resolution at all in pipelines.yml but that generated a regression, hence this revert PR.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files (and/or docker env variables)
  • I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

…es () inside config.string in the pipelines.yml file, but that created a regression, becuase env vars is expected to be replaced in all the other yaml keys
@andsel andsel self-assigned this Jun 6, 2024
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @andsel

Copy link
Member

@yaauie yaauie left a comment

Choose a reason for hiding this comment

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

I'm +1 to merging this revert on main and back-porting to 8.14, then following up to re-address the other issue separately.

@jsvd jsvd marked this pull request as ready for review June 6, 2024 19:19
Copy link
Member

@jsvd jsvd left a comment

Choose a reason for hiding this comment

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

LGTM

@jsvd jsvd merged commit efa8378 into elastic:main Jun 6, 2024
6 checks passed
@jsvd
Copy link
Member

jsvd commented Jun 6, 2024

@logstashmachine backport 8.14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants