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

[Security Solution][Serverless Quality Gate] Restoring overrides functionality #196536

Merged
merged 4 commits into from
Oct 16, 2024

Conversation

dkirchan
Copy link
Contributor

@dkirchan dkirchan commented Oct 16, 2024

Summary

Due to a bug introduced in a previous PR, the override value was never using the process.env.KIBANA_MKI_IMAGE_COMMIT environment variable.

The reason is that in the command line arguments argparse, commit value had the default of '' so the commit was never null or undefined.

    .option('commit', {
          alias: 'c',
          type: 'string',
          default: '',
        })

Restored the check to see if the string is also empty.

@dkirchan dkirchan added release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.16.0 labels Oct 16, 2024
@dkirchan dkirchan self-assigned this Oct 16, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@dkirchan dkirchan added v9.0.0 backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Oct 16, 2024
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Metrics [docs]

✅ unchanged

History

cc @dkirchan

@dkirchan dkirchan merged commit cbe5d9a into main Oct 16, 2024
43 checks passed
@dkirchan dkirchan deleted the sec-eng-prod-dbg-overrides branch October 16, 2024 20:47
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/11373607594

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 16, 2024
…tionality (elastic#196536)

## Summary

Due to a bug introduced in a previous PR, the `override` value was never
using the `process.env.KIBANA_MKI_IMAGE_COMMIT` environment variable.

The reason is that in the command line arguments argparse, commit value
had the default of `''` so the commit was never null or undefined.

```
    .option('commit', {
          alias: 'c',
          type: 'string',
          default: '',
        })
```

Restored the check to see if the string is also empty.

(cherry picked from commit cbe5d9a)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 16, 2024
…s functionality (#196536) (#196608)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution][Serverless Quality Gate] Restoring overrides
functionality (#196536)](#196536)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"dkirchan","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-16T20:47:27Z","message":"[Security
Solution][Serverless Quality Gate] Restoring overrides functionality
(#196536)\n\n## Summary\r\n\r\nDue to a bug introduced in a previous PR,
the `override` value was never\r\nusing the
`process.env.KIBANA_MKI_IMAGE_COMMIT` environment variable.\r\n\r\nThe
reason is that in the command line arguments argparse, commit
value\r\nhad the default of `''` so the commit was never null or
undefined.\r\n\r\n```\r\n .option('commit', {\r\n alias: 'c',\r\n type:
'string',\r\n default: '',\r\n })\r\n```\r\n\r\nRestored the check to
see if the string is also
empty.","sha":"cbe5d9a8fb57bf808d69c3ca35c0fefca7ef54e2","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:
SecuritySolution","backport:prev-minor","v8.16.0"],"title":"[Security
Solution][Serverless Quality Gate] Restoring overrides
functionality","number":196536,"url":"https://github.com/elastic/kibana/pull/196536","mergeCommit":{"message":"[Security
Solution][Serverless Quality Gate] Restoring overrides functionality
(#196536)\n\n## Summary\r\n\r\nDue to a bug introduced in a previous PR,
the `override` value was never\r\nusing the
`process.env.KIBANA_MKI_IMAGE_COMMIT` environment variable.\r\n\r\nThe
reason is that in the command line arguments argparse, commit
value\r\nhad the default of `''` so the commit was never null or
undefined.\r\n\r\n```\r\n .option('commit', {\r\n alias: 'c',\r\n type:
'string',\r\n default: '',\r\n })\r\n```\r\n\r\nRestored the check to
see if the string is also
empty.","sha":"cbe5d9a8fb57bf808d69c3ca35c0fefca7ef54e2"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196536","number":196536,"mergeCommit":{"message":"[Security
Solution][Serverless Quality Gate] Restoring overrides functionality
(#196536)\n\n## Summary\r\n\r\nDue to a bug introduced in a previous PR,
the `override` value was never\r\nusing the
`process.env.KIBANA_MKI_IMAGE_COMMIT` environment variable.\r\n\r\nThe
reason is that in the command line arguments argparse, commit
value\r\nhad the default of `''` so the commit was never null or
undefined.\r\n\r\n```\r\n .option('commit', {\r\n alias: 'c',\r\n type:
'string',\r\n default: '',\r\n })\r\n```\r\n\r\nRestored the check to
see if the string is also
empty.","sha":"cbe5d9a8fb57bf808d69c3ca35c0fefca7ef54e2"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: dkirchan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.16.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants