Add an rpc to update registered apps that have been changed #2830
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -142,12 +142,12 @@ func (r *Reporter) scanAppConfigs(ctx context.Context) error { | |
| } | ||
| } | ||
|
|
||
| apps := r.applicationLister.List() | ||
| // Create a map from Git path key to app id, to determine if the application is registered. | ||
| registeredAppPaths := make(map[string]string, len(apps)) | ||
| for _, app := range apps { | ||
| key := makeGitPathKey(app.GitPath.Repo.Id, filepath.Join(app.GitPath.Path, app.GitPath.ConfigFilename)) | ||
| registeredAppPaths[key] = app.Id | ||
| } | ||
|
|
||
| if err := r.updateRegisteredApps(ctx, registeredAppPaths); err != nil { | ||
|
|
@@ -161,7 +161,7 @@ func (r *Reporter) scanAppConfigs(ctx context.Context) error { | |
| } | ||
|
|
||
| // updateRegisteredApps sends application configurations that have changed since the last time to the control-plane. | ||
| func (r *Reporter) updateRegisteredApps(ctx context.Context, registeredAppPaths map[string]string) (err error) { | ||
| apps := make([]*model.ApplicationInfo, 0) | ||
| headCommits := make(map[string]string, len(r.gitRepos)) | ||
| for repoID, repo := range r.gitRepos { | ||
|
|
@@ -207,15 +207,45 @@ func (r *Reporter) updateRegisteredApps(ctx context.Context, registeredAppPaths | |
| } | ||
|
|
||
| // findRegisteredApps finds out registered application info in the given git repository. | ||
| func (r *Reporter) findRegisteredApps(ctx context.Context, repoID string, repo gitRepo, lastScannedCommit, headCommitHash string, registeredAppPaths map[string]string) ([]*model.ApplicationInfo, error) { | ||
| if lastScannedCommit == "" { | ||
| // Scan all files because it seems to be the first commit since Piped starts. | ||
| apps := make([]*model.ApplicationInfo, 0) | ||
| err := fs.WalkDir(r.fileSystem, repo.GetPath(), func(path string, d fs.DirEntry, err error) error { | ||
| if err != nil { | ||
| return err | ||
|
Comment on lines
+212
to
+216
Member
There was a problem hiding this comment. Just want to ask, do we have any reason to not use that
Member
Author
There was a problem hiding this comment. @nghialv I feel you. Actually we can use the original |
||
| } | ||
| if d.IsDir() { | ||
| return nil | ||
| } | ||
| cfgRelPath, err := filepath.Rel(repo.GetPath(), path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| gitPathKey := makeGitPathKey(repoID, cfgRelPath) | ||
| appID, registered := registeredAppPaths[gitPathKey] | ||
| if !registered { | ||
| return nil | ||
| } | ||
|
|
||
| appInfo, err := r.readApplicationInfo(repo.GetPath(), repoID, filepath.Dir(cfgRelPath), filepath.Base(cfgRelPath)) | ||
| if err != nil { | ||
| r.logger.Error("failed to read application info", | ||
| zap.String("repo-id", repoID), | ||
| zap.String("config-file-path", cfgRelPath), | ||
| zap.Error(err), | ||
| ) | ||
| return nil | ||
| } | ||
| appInfo.Id = appID | ||
| apps = append(apps, appInfo) | ||
| // Continue reading so that it can return apps as much as possible. | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to inspect files under %s: %w", repo.GetPath(), err) | ||
| } | ||
| return apps, nil | ||
| } | ||
|
|
||
| filePaths, err := repo.ChangedFiles(ctx, lastScannedCommit, headCommitHash) | ||
|
|
@@ -229,10 +259,11 @@ func (r *Reporter) findRegisteredApps(ctx context.Context, repoID string, repo g | |
| apps := make([]*model.ApplicationInfo, 0) | ||
| for _, path := range filePaths { | ||
| gitPathKey := makeGitPathKey(repoID, path) | ||
| appID, registered := registeredAppPaths[gitPathKey] | ||
| if !registered { | ||
| continue | ||
| } | ||
| appInfo, err := r.readApplicationInfo(repo.GetPath(), repoID, filepath.Dir(path), filepath.Base(path)) | ||
| if err != nil { | ||
| r.logger.Error("failed to read application info", | ||
| zap.String("repo-id", repoID), | ||
|
|
@@ -241,13 +272,14 @@ func (r *Reporter) findRegisteredApps(ctx context.Context, repoID string, repo g | |
| ) | ||
| continue | ||
| } | ||
| appInfo.Id = appID | ||
| apps = append(apps, appInfo) | ||
| } | ||
| return apps, nil | ||
| } | ||
|
|
||
| // updateUnregisteredApps sends all unregistered application configurations to the control-plane. | ||
| func (r *Reporter) updateUnregisteredApps(ctx context.Context, registeredAppPaths map[string]string) error { | ||
| apps := make([]*model.ApplicationInfo, 0) | ||
| for repoID, repo := range r.gitRepos { | ||
| as, err := r.findUnregisteredApps(repo.GetPath(), repoID, registeredAppPaths) | ||
|
|
@@ -280,40 +312,29 @@ func (r *Reporter) updateUnregisteredApps(ctx context.Context, registeredAppPath | |
|
|
||
| // findUnregisteredApps finds out unregistered application info in the given git repository. | ||
| // The file name must be default name in order to be recognized as an Application config. | ||
| func (r *Reporter) findUnregisteredApps(repoPath, repoID string, registeredAppPaths map[string]string) ([]*model.ApplicationInfo, error) { | ||
| apps := make([]*model.ApplicationInfo, 0) | ||
| // Scan all files under the repository. | ||
| err := fs.WalkDir(r.fileSystem, repoPath, func(path string, d fs.DirEntry, err error) error { | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if d.IsDir() { | ||
| return nil | ||
| } | ||
| cfgRelPath, err := filepath.Rel(repoPath, path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !model.IsApplicationConfigFile(filepath.Base(cfgRelPath)) { | ||
| return nil | ||
| } | ||
| gitPathKey := makeGitPathKey(repoID, cfgRelPath) | ||
| if _, registered := registeredAppPaths[gitPathKey]; registered { | ||
| return nil | ||
| } | ||
|
|
||
| appInfo, err := r.readApplicationInfo(repoPath, repoID, filepath.Dir(cfgRelPath), filepath.Base(cfgRelPath)) | ||
| if err != nil { | ||
| r.logger.Error("failed to read application info", | ||
| zap.String("repo-id", repoID), | ||
|
|
@@ -327,18 +348,12 @@ func (r *Reporter) scanAllFiles(repoRoot, repoID string, shouldSkip func(string) | |
| return nil | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to inspect files under %s: %w", repoPath, err) | ||
| } | ||
| return apps, nil | ||
| } | ||
|
|
||
| func (r *Reporter) readApplicationInfo(repoDir, repoID, appDirRelPath, cfgFilename string) (*model.ApplicationInfo, error) { | ||
| b, err := fs.ReadFile(r.fileSystem, filepath.Join(repoDir, appDirRelPath, cfgFilename)) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to open the configuration file: %w", err) | ||
|
|
@@ -361,7 +376,14 @@ func (r *Reporter) readApplicationInfo(repoDir, appDirRelPath, cfgFilename strin | |
| // TODO: Convert Kind string into dedicated type | ||
| //Kind: cfg.Kind, | ||
| Labels: spec.Labels, | ||
| RepoId: repoID, | ||
| Path: appDirRelPath, | ||
| ConfigFilename: cfgFilename, | ||
| }, nil | ||
| } | ||
|
|
||
| // makeGitPathKey builds a unique path between repositories. | ||
| // cfgFilePath is a relative path from the repo root. | ||
| func makeGitPathKey(repoID, cfgFilePath string) string { | ||
| return fmt.Sprintf("%s:%s", repoID, cfgFilePath) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since we have
appInfo.Id, better to validate if the updating application belongs to the requested piped as other RPCs.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For sure
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applied at d22b018