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

terraform: enable build tag (backport #13841) #14240

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2024

Motivation/summary

I'd like to honour the CI details so we can tag any cloud resources with the Build ID or so, this will help to identify if the resources were created when running the terraform locally or in the CI.

For instance, currently

image

Then when https://github.com/elastic/apm-aws-lambda/actions/workflows/smoke-tests.yml runs I wanna see

image

Or something similar

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


This is an automatic backport of pull request #13841 done by [Mergify](https://mergify.com).

(cherry picked from commit b4c79b3)

# Conflicts:
#	testing/infra/terraform/modules/tags/output.tf
@mergify mergify bot requested a review from a team as a code owner October 2, 2024 16:18
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 2, 2024
Copy link
Contributor Author

mergify bot commented Oct 2, 2024

Cherry-pick of b4c79b3 has failed:

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

You are currently cherry-picking commit b4c79b3ab.
  (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:
	modified:   testing/infra/terraform/modules/tags/README.md
	modified:   testing/infra/terraform/modules/tags/vars.tf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/infra/terraform/modules/tags/output.tf

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

@mergify mergify bot mentioned this pull request Oct 2, 2024
2 tasks
@endorama endorama mentioned this pull request Oct 2, 2024
Copy link
Contributor

@inge4pres inge4pres left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼 thanks

@inge4pres inge4pres removed the conflicts There is a conflict in the backported pull request label Oct 2, 2024
@endorama endorama enabled auto-merge (squash) October 2, 2024 17:06
@endorama
Copy link
Member

endorama commented Oct 2, 2024

Oh, the cherry picked commit is not signed 😢 Fixing it

@kruskall
Copy link
Member

kruskall commented Oct 3, 2024

@Mergifyio queue

Copy link
Contributor Author

mergify bot commented Oct 3, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 183a008

@kruskall kruskall disabled auto-merge October 3, 2024 01:16
@mergify mergify bot merged commit 183a008 into 8.15 Oct 3, 2024
16 checks passed
@mergify mergify bot deleted the mergify/bp/8.15/pr-13841 branch October 3, 2024 01:19
@kruskall
Copy link
Member

kruskall commented Oct 3, 2024

@endorama mergify is special 😉

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

Successfully merging this pull request may close these issues.

4 participants