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

[8.11](backport #3086) Replace all secret references in input map #3089

Merged
merged 6 commits into from
Nov 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2023

This is an automatic backport of pull request #3086 done by Mergify.
Cherry-pick of 0718a55 has failed:

On branch mergify/bp/8.11/pr-3086
Your branch is up to date with 'origin/8.11'.

You are currently cherry-picking commit 0718a55.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1699380976-Replace-any-secret-ref-in-input-map.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/policy/secret.go
	both modified:   internal/pkg/policy/secret_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Use a more generic approach to go through input objects and replace
secret references.

(cherry picked from commit 0718a55)

# Conflicts:
#	internal/pkg/policy/secret.go
#	internal/pkg/policy/secret_test.go
@mergify mergify bot requested a review from a team as a code owner November 8, 2023 15:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 8, 2023
@elasticmachine
Copy link
Contributor

elasticmachine commented Nov 8, 2023

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-11-14T22:26:00.353+0000

  • Duration: 18 min 42 sec

Test stats 🧪

Test Results
Failed 0
Passed 838
Skipped 1
Total 839

Steps errors 1

Expand to view the steps failures

test
  • Took 2 min 25 sec . View more details here
  • Description: make test-e2e

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@juliaElastic
Copy link
Contributor

@michel-laterman Could you check the build failures?

@@ -72,6 +72,7 @@ func getPolicyInputsWithSecrets(ctx context.Context, fields map[string]json.RawM
for _, input := range inputs {
newInput := make(map[string]interface{})
for k, v := range input {
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

found the issue, looks like a bad backport, i'll fix it

@michel-laterman
Copy link
Contributor

I thin the e2e tests are failing due to the (e2e) build image not being found as it's an outdated snapshot that can be resolved by merging #3007

Copy link
Contributor Author

mergify bot commented Nov 13, 2023

This pull request has not been merged yet. Could you please review and merge it @michel-laterman? 🙏

@michel-laterman michel-laterman removed the conflicts There is a conflict in the backported pull request label Nov 14, 2023
Copy link

@michel-laterman michel-laterman enabled auto-merge (squash) November 15, 2023 17:19
@michel-laterman michel-laterman merged commit 637cc48 into 8.11 Nov 15, 2023
9 checks passed
@michel-laterman michel-laterman deleted the mergify/bp/8.11/pr-3086 branch November 15, 2023 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants