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

chore: Update notifications engine to 7a06976 #3384

Merged

Conversation

kzap
Copy link
Contributor

@kzap kzap commented Feb 20, 2024

Fixes #3049

What

  1. Updates in this latest version argoproj/notifications-engine@7a06976 of notifications-engine:
  1. Updating notifications documentation generator to replace some argocd- prefixed strings.

  2. Adding documentation for contributors on how to update notifications-engine like in this PR.

Checklist

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional with a list of types and scopes found here, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I've signed my commits with DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My builds are green. Try syncing with master if they are not.
  • My organization is added to USERS.md.

kzap and others added 6 commits February 20, 2024 01:20
…074eeed6145085160e2fec63

Updating and fetch latest notifications-engine dependencies

Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
…4.1-0.20240219110818-7a069766e954

Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
- Update go.mod: github.com/go-telegram-bot-api/telegram-bot-api/v5 => github.com/OvyFlash/telegram-bot-api/v5 v5.0.0-20240108230938-63e5c59035bf
  - Ref: argoproj/notifications-engine#265
- Could also be done via go replace --edit
- go mod tidy also ran

Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
…nd also replace secret with argocd-notifications-secret

Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
Copy link

codecov bot commented Feb 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8405f2e) 81.83% compared to head (abc378b) 83.00%.
Report is 19 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3384      +/-   ##
==========================================
+ Coverage   81.83%   83.00%   +1.16%     
==========================================
  Files         135      135              
  Lines       20688    16873    -3815     
==========================================
- Hits        16931    14005    -2926     
+ Misses       2883     1996     -887     
+ Partials      874      872       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

github-actions bot commented Feb 20, 2024

Go Published Test Results

2 130 tests   2 130 ✅  2m 50s ⏱️
  118 suites      0 💤
    1 files        0 ❌

Results for commit abc378b.

♻️ This comment has been updated with latest results.

Copy link
Contributor

github-actions bot commented Feb 20, 2024

E2E Tests Published Test Results

  4 files    4 suites   3h 40m 53s ⏱️
107 tests  97 ✅  6 💤  4 ❌
440 runs  404 ✅ 24 💤 12 ❌

For more details on these failures, see this check.

Results for commit abc378b.

♻️ This comment has been updated with latest results.

@@ -202,6 +202,7 @@ require (

replace (
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/go-telegram-bot-api/telegram-bot-api/v5 => github.com/OvyFlash/telegram-bot-api/v5 v5.0.0-20240108230938-63e5c59035bf
Copy link
Contributor Author

Choose a reason for hiding this comment

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

replaced in the notifications engine in this PR: argoproj/notifications-engine#265

@@ -4,7 +4,7 @@ go 1.20

require (
github.com/antonmedv/expr v1.15.5
github.com/argoproj/notifications-engine v0.4.1-0.20231213155711-c02dc5fdb5e1
github.com/argoproj/notifications-engine v0.4.1-0.20240219110818-7a069766e954
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment on lines +39 to +44
if e := strReplaceDocFiles("argocd-notifications-cm", "argo-rollouts-notification-configmap", files); e != nil {
log.Fatal(e)
}
if e := strReplaceDocFiles("argocd-notifications-secret", "argo-rollouts-notification-secret", files); e != nil {
log.Fatal(e)
}
Copy link
Contributor Author

@kzap kzap Feb 21, 2024

Choose a reason for hiding this comment

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

lets replace these strings with the argo-rollouts- equivalent.

Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
Signed-off-by: Andre Marcelo-Tanner <drechin@gmail.com>
@kzap kzap marked this pull request as ready for review February 21, 2024 04:35
Copy link

sonarcloud bot commented Feb 21, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@kzap kzap changed the title chore: Update notifications engine 7a06976 chore: Update notifications engine to 7a06976 Feb 21, 2024
name: <config-map-name>
name: argo-rollouts-notification-configmap
Copy link
Contributor Author

@kzap kzap Feb 22, 2024

Choose a reason for hiding this comment

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

generated by running make docs

These were recently renamed upstream to a argocd specific name :/

@zachaller zachaller added this to the v1.7 milestone Feb 27, 2024
Copy link
Collaborator

@zachaller zachaller left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

@zachaller zachaller merged commit d06cc34 into argoproj:master Feb 27, 2024
31 checks passed
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.

Argo Rollouts Docs refer to ArgoCD secret/configmap names
2 participants