Skip to content

[NR-383508] Sync develop branch with main branch #24

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 79 commits into from
Apr 15, 2025
Merged

[NR-383508] Sync develop branch with main branch #24

merged 79 commits into from
Apr 15, 2025

Conversation

ahegdeNR
Copy link
Contributor

@ahegdeNR ahegdeNR commented Mar 27, 2025 •
edited
Loading

This PR is used to merge all changes in develop to main. The changes include:

  1. Local template deployment support
  2. Parsing requestID from logs
  3. E2E test PRs:
  1. Updating version from yaml file

Action items on PR:

  • Validate E2E tests run successfully based on rule set on github -> successfully ran the tests here
  • Validate manually from UI after the code is merged

ahegdeNR added 30 commits December 9, 2024 14:48
@ahegdeNR
modified lambda-template with /src as codeUri. Region wise S3 gets ad…
b35a4b1 
…ded as part of CI/CD
@ahegdeNR
modified how the yaml file changes by adding a script
a03f176
@ahegdeNR
added lambda trigger script and some common stack script to validate …
33a1f75 
…stack creation
@ahegdeNR
added cloudwatch trigger script
de62b23
@ahegdeNR
added ci/cd automation to run tests during merge
c80e547
@ahegdeNR
fixed missing permission to fetch secrets from github secrets
22cd0a9
@ahegdeNR
fixed constants for scripts
dd18908
@ahegdeNR
moved license key to github secrets
e5e49c3
@ahegdeNR
fixed filter pattern json format in template parameters
4349ebb
@ahegdeNR
fixes
93f5be7
@ahegdeNR
modified bucket name and log group name, build all templates
9514269
@ahegdeNR
Merge pull request #10 from newrelic/local-deployment-support
be1fdb4 
[NR-344385] Support deployment of lambda templates from local setup
@ahegdeNR
code refactoring and fixes
b03fcc9
@ahegdeNR
fixes
1b398af
@ahegdeNR
fixes
3925822
@ahegdeNR
updated permissions for common script
c9ce5aa
@ahegdeNR
removed other templates from getting packaged and published as part o…
f9a6d38 
…f this task
@ahegdeNR
modified parameters file name in triggers
e2f6a1c
@ahegdeNR
removed parallelization of script
ef69275
@ahegdeNR
removed parallelization of script
41fd962
@ahegdeNR
fixes
20adcf8
@ahegdeNR
fixes
5f7c392
@ahegdeNR
fixes
7c44eb6
@ahegdeNR
add parallelization to running scripts
0def76a
@ahegdeNR
modified e2e tests to run during push workflow
94720fc
@ahegdeNR
review fixes, comments and retries
6114fe8
@ahegdeNR
Merge branch 'develop' into NR-334397-e2e-testing-automation-part-1-test
bd7278c
@ahegdeNR
review fixes, comments and retries
2397044
@ahegdeNR
Merge pull request #13 from newrelic/NR-334397-e2e-testing-automation…
eb6a5e1 
…-part-1-test

[NR-334397] Cloudformation Templates E2E Tests - Set Up
@ahegdeNR
created events for cloudwatch, s3 and validating logs are present in …
a32827d 
…new relic
ahegdeNR and others added 11 commits February 11, 2025 07:20
@ahegdeNR
fixes
2150b04
@ahegdeNR
fixes
3612720
@ahegdeNR
fixes
eefc09c
@ahegdeNR
fixes
6ed1c9c
@ahegdeNR
fixes
ae7b378
@ahegdeNR
fixes
e1ece89
@ahegdeNR
fixes
6e4ed72
@ahegdeNR
added e2e tests to run once every month as cron job
5f9e08f
@ahegdeNR
Merge pull request #17 from newrelic/NR-347440-e2e-event-creation
2b48523 
[NR-347440] CFN template validate lambda integration logs
@ahegdeNR
[NR-352205] E2E tests to validate metrics with logging integration te…
9396bb1 
…mplates (#22)

* added tests for metrics and lambda stacks

* fixes

* reverted change made to test

* parallelized running tests

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* reverting previous changes post testing

* removed chmod command
@hrai-nr
moving version number to a different file named version.go
60bab1c
@ahegdeNR ahegdeNR self-assigned this Mar 27, 2025
@maya-jha
Copy link
Contributor

Why tests are failing?

hrai-nr
hrai-nr previously approved these changes Apr 7, 2025
View reviewed changes
Copy link
Contributor

@hrai-nr hrai-nr left a comment

Choose a reason for hiding this comment

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

LGTM

voorepreethi
voorepreethi previously approved these changes Apr 7, 2025
View reviewed changes
@ahegdeNR
[NR-383508] Fix validate template code in CI/CD (#29)
19e2eb2 
* fixed validate template step and lambda-template.yaml validate errors

* removed slack notification and made e2e tests run on pull request

* added develop branch to test e2e tests

* removing changes made for testing
@ahegdeNR ahegdeNR dismissed stale reviews from voorepreethi and hrai-nr via 19e2eb2 April 9, 2025 12:02
hrai-nr
hrai-nr approved these changes Apr 15, 2025
View reviewed changes
Copy link
Contributor

@hrai-nr hrai-nr left a comment

Choose a reason for hiding this comment

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

LGTM

@ahegdeNR ahegdeNR requested a review from maya-jha April 15, 2025 08:55
@ahegdeNR ahegdeNR merged commit b43d7eb into main Apr 15, 2025
59 checks passed
@hrai-nr hrai-nr deleted the develop branch May 6, 2025 06:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maya-jha maya-jha maya-jha approved these changes

@hrai-nr hrai-nr hrai-nr approved these changes

@voorepreethi voorepreethi voorepreethi left review comments

@rohit-bandlamudi-nr rohit-bandlamudi-nr rohit-bandlamudi-nr left review comments

Assignees

@ahegdeNR ahegdeNR

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ahegdeNR @maya-jha @hrai-nr @voorepreethi @rohit-bandlamudi-nr