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

feat: Allow return the client without performing a matchRepository #18053

Merged
merged 9 commits into from
Jul 15, 2024

Conversation

jsolana
Copy link
Contributor

@jsolana jsolana commented May 2, 2024

Closes #17948

Modify the behavior during DetectConfigManagementPlugin to avoid transferring the entire repository to cmp-server here
Use a new pre-flight operation to check if discovery is enabled or not.
If discover is not configured, returns the client without without further checks

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

… the application'plugin be configured by its name

Signed-off-by: Javier Solana <javier.solana@cabify.com>
@jsolana jsolana requested a review from a team as a code owner May 2, 2024 08:46
@@ -165,7 +165,12 @@ func cmpSupports(ctx context.Context, pluginSockFilePath, appPath, repoPath, fil
return nil, nil, false
}

isSupported, isDiscoveryEnabled, err := matchRepositoryCMP(ctx, appPath, repoPath, cmpClient, env, tarExcludedGlobs)
// if plugin name is specified, lets return the client directly
if namedPlugin {
Copy link
Member

Choose a reason for hiding this comment

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

I think we still only want to do this if discovery is not enabled, since the CMP author might be using discovery as a sort of safety or even security mechanism.

We probably need a pre-flight request to get isDiscoveryEnabled without sending the whole repo. That's a somewhat more involved change, since it'll introduce a new API endpoint.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make a lot of sense, let me update the MR
Thanks a lot for your feedback!

Copy link
Contributor Author

@jsolana jsolana Jun 12, 2024

Choose a reason for hiding this comment

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

What do you think @crenshaw-dev ?

plugin.proto

message CheckPluginConfigurationResponse {
    bool isDiscoveryConfigured = 1;
}


...

// CheckPluginConfiguration is a pre-flight request  to check the plugin configuration
    // without sending the whole repo.
    rpc CheckPluginConfiguration(stream AppStreamRequest) returns (CheckPluginConfigurationResponse) {
    }

In that case isDiscoveryConfigured will be true if there is any discovery.FileName or discovery.Find info (in this case we won't propagate repo info, then, no pattern matching will be executed)

plugin.go

type CheckPluginConfigurationStream interface {
	Stream
	SendAndClose(response *apiclient.CheckPluginConfigurationResponse) error
}

func (s *Service) CheckPluginConfiguration(stream apiclient.ConfigManagementPluginService_CheckPluginConfigurationServer) error {
	return s.checkPluginConfigurationGeneric(stream)
}

func (s *Service) checkPluginConfigurationGeneric(stream CheckPluginConfigurationStream) error {
	isDiscoveryConfigured := s.isDiscoveryConfigured()
	repoResponse := &apiclient.CheckPluginConfigurationResponse{IsDiscoveryConfigured: isDiscoveryConfigured}

	err := stream.SendAndClose(repoResponse)
	if err != nil {
		return fmt.Errorf("error sending check plugin configuration response: %w", err)
	}
	return nil
}

func (s *Service) isDiscoveryConfigured() (IsDiscoveryConfigured bool) {
	config := s.initConstants.PluginConfig
	return config.Spec.Discover.FileName != "" || config.Spec.Discover.Find.Glob != "" || len(config.Spec.Discover.Find.Command.Command) > 0
}

Wdyt?

Copy link
Member

Choose a reason for hiding this comment

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

I think the rough idea makes sense. I'm not sure it would need to be a streaming request. If I understand correctly, we wouldn't need to send any streaming contents to the CMP.

Copy link
Contributor Author

@jsolana jsolana Jun 12, 2024

Choose a reason for hiding this comment

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

Yep I was thinking the same, I ve mimic other operations but no strong opinion about stream vs unary op in this moment 😅
Gonna update it to use unary call
Thanks mate

Copy link
Contributor Author

@jsolana jsolana Jun 13, 2024

Choose a reason for hiding this comment

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

Done! Let me know wdyt! (also title and description of the PR was updated)
Thanks for all your support @crenshaw-dev :)

Javier Solana added 2 commits June 12, 2024 09:04
Copy link

codecov bot commented Jun 13, 2024

Codecov Report

Attention: Patch coverage is 53.84615% with 6 lines in your changes missing coverage. Please review.

Project coverage is 50.64%. Comparing base (b909993) to head (d54cbcc).
Report is 561 commits behind head on master.

Files with missing lines Patch % Lines
util/app/discovery/discovery.go 0.00% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #18053      +/-   ##
==========================================
- Coverage   50.64%   50.64%   -0.01%     
==========================================
  Files         315      315              
  Lines       43286    43299      +13     
==========================================
+ Hits        21924    21929       +5     
- Misses      18859    18870      +11     
+ Partials     2503     2500       -3     

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

Javier Solana and others added 3 commits June 13, 2024 10:22
Signed-off-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
@jsolana jsolana changed the title chore: Return the client without performing a matchRepository when the application configures the plugin by name chore: Allow return the client without performing a matchRepository Jun 13, 2024
@crenshaw-dev crenshaw-dev changed the title chore: Allow return the client without performing a matchRepository feat: Allow return the client without performing a matchRepository Jun 26, 2024
util/app/discovery/discovery.go Outdated Show resolved Hide resolved
jsolana and others added 3 commits July 8, 2024 09:16
Signed-off-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
@crenshaw-dev crenshaw-dev merged commit e7760b5 into argoproj:master Jul 15, 2024
28 of 29 checks passed
ggjulio pushed a commit to ggjulio/argo-cd that referenced this pull request Jul 21, 2024
…rgoproj#18053)

* return the client without performing a matchRepository operation when the application'plugin be configured by its name

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* add CheckPluginConfiguration pre-flight operation

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix lint

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* Missing comment

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* remove WithFields
Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix captLocal
Signed-off-by: Javier Solana <javier.solana@cabify.com>

---------

Signed-off-by: Javier Solana <javier.solana@cabify.com>
Co-authored-by: Javier Solana <javier.solana@cabify.com>
vfaergestad pushed a commit to vfaergestad/argo-cd that referenced this pull request Jul 22, 2024
…rgoproj#18053)

* return the client without performing a matchRepository operation when the application'plugin be configured by its name

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* add CheckPluginConfiguration pre-flight operation

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix lint

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* Missing comment

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* remove WithFields
Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix captLocal
Signed-off-by: Javier Solana <javier.solana@cabify.com>

---------

Signed-off-by: Javier Solana <javier.solana@cabify.com>
Co-authored-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Vegard Færgestad <vegardf@mnemonic.no>
jsolana added a commit to jsolana/argo-cd that referenced this pull request Jul 24, 2024
…rgoproj#18053)

* return the client without performing a matchRepository operation when the application'plugin be configured by its name

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* add CheckPluginConfiguration pre-flight operation

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix lint

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* Missing comment

Signed-off-by: Javier Solana <javier.solana@cabify.com>

* remove WithFields
Signed-off-by: Javier Solana <javier.solana@cabify.com>

* fix captLocal
Signed-off-by: Javier Solana <javier.solana@cabify.com>

---------

Signed-off-by: Javier Solana <javier.solana@cabify.com>
Co-authored-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
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.

Enhance CMP Plugin Evaluation for Applications with Name-based Configuration
2 participants