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.

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

[v17] Fix discover reporting for static matchers #48424

Merged
merged 1 commit into from
Nov 5, 2024
Merged

[v17] Fix discover reporting for static matchers #48424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/srv/discovery/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ import (
// - AWS Sync (TAG) status
// - AWS EC2 Auto Discover status
func (s *Server) updateDiscoveryConfigStatus(discoveryConfigName string) {
// Static configurations (ie those in `teleport.yaml/discovery_config.<cloud>.matchers`) do not have a DiscoveryConfig resource.
Copy link
Contributor

Choose a reason for hiding this comment

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

I forgot to ask in the original PR: isn't that teleport.yaml/discovery_service?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice catch 🙏
Yes, it should be.
I'll create another PR for the fix because we already merged it in master

// Those are discarded because there's no Status to update.
if discoveryConfigName == "" {
return
}

discoveryConfigStatus := discoveryconfig.Status{
State: discoveryconfigv1.DiscoveryConfigState_DISCOVERY_CONFIG_STATE_SYNCING.String(),
LastSyncTime: s.clock.Now(),
Expand Down
Loading