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: remove useless config #4402

Merged

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Feb 5, 2024

Description

  • Chatbot and Agent framework changed the implementation of how to retrieve the root agent, so the rootAgentName config is useless, remove that from config and template.
  • The root agent is config in a ml system index, and it prevents FTRepo to set agent id into the index when running Cypress test(system index config can only be changed in opensearch.yml file), so move the security test out of the test manifest.

The dashboards-assistant plugin is an experimental plugin and we will address the security test in 2.13.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ec71ce6) 91.35% compared to head (13f7b79) 91.35%.
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4402   +/-   ##
=======================================
  Coverage   91.35%   91.35%           
=======================================
  Files         190      190           
  Lines        6197     6197           
=======================================
  Hits         5661     5661           
  Misses        536      536           

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

Copy link
Contributor

@gaobinlong gaobinlong left a comment

Choose a reason for hiding this comment

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

LGTM.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe marked this pull request as draft February 5, 2024 05:51
@SuZhou-Joe SuZhou-Joe marked this pull request as ready for review February 5, 2024 09:41
@@ -83,8 +83,6 @@ components:
- name: assistantDashboards
integ-test:
test-configs:
- with-security
Copy link
Member

Choose a reason for hiding this comment

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

Even after reading the description I dont get why are we removing the security test. Could you elaborate?

Thanks.

Copy link
Member Author

@SuZhou-Joe SuZhou-Joe Feb 6, 2024

Choose a reason for hiding this comment

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

assistantDashboards requires a config in system index, but we can not put doc into that index in our cypress test workflow as it requires the security .pem file to do so.

Copy link
Member Author

Choose a reason for hiding this comment

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

If we want to do test against a Chatbot root agent, we have to set the config inside the system index. However when security enabled, we can not do that inside Cypress test as system_index setting is a static setting that can only be modified in the opensearch.yml file.

Copy link
Member

Choose a reason for hiding this comment

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

So you mean in order to support tests with security you need additional config to be added to opensearch.yml?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, that should work too.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like a feature request. AFAIK additional-cluster-configs only supports the product under test (OpenSearch or Dashboards. Not both)
https://github.com/search?q=repo%3Aopensearch-project%2Fopensearch-build+additional-cluster-configs&type=code&p=1

@peterzhuamazon Looks like time to open this issue #3589 :)

Copy link
Member

Choose a reason for hiding this comment

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

Have sync up with @SuZhou-Joe and it seems we either implement #3589, which we dont have much time for 2.12, or remove the feature after @SuZhou-Joe discuss with @ylwu-amzn.

There is another option which is to comment out the - with-security and list it a TODO to be fixed in the next release.

@SuZhou-Joe
Copy link
Member Author

@bbarani @prudhvigodithi Could you please take a look here?

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@peterzhuamazon peterzhuamazon merged commit 8c4b61c into opensearch-project:main Feb 6, 2024
12 checks passed
@peterzhuamazon
Copy link
Member

Restore security test due to this:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants