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

Sync with main - May 23 #681

Merged
merged 36 commits into from
May 23, 2024

Conversation

lewijacn
Copy link
Collaborator

Description

Routine sync with main. Also modified to use requirements.txt create on e2e branch earlier

Issues Resolved

[List any issues this PR will resolve]

Is this a backport? If so, please add backport PR # and/or commits #

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

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.

gregschohn and others added 30 commits May 14, 2024 14:48
Provisional checkin to rotate coreUtilities to the top level of the project and to unify the build gradle files between RFS and TrafficCapture

Signed-off-by: Greg Schohn <[email protected]>
Signed-off-by: Greg Schohn <[email protected]>
Confirmed that OSB tests work within the TrafficCapture:dockerSolution environment.
Confirmed that the trafficCaptureProxyServerTest was able to come up and run tests.
I can build an RFS image, but I'm currently having issues bringing compose up, but this may be not be a regression.

Signed-off-by: Greg Schohn <[email protected]>
…asets from gradle/docker.

The first half of the migration console is a simpler console with only OSB installed on it.
Some other cleanup too, like purging the files that made RFS its own top-level build directory.
docker builds may be repeating even when no dependencies have, so I'll need to further investigate.

Signed-off-by: Greg Schohn <[email protected]>
…tionPluginsRename

Rename replayerPlugins to transformationPlugins
Signed-off-by: Greg Schohn <[email protected]>
…rafficCapture specific artifacts.

Signed-off-by: Greg Schohn <[email protected]>
…s so that tests in RFS can use the HTTP server fixtures.

Signed-off-by: Greg Schohn <[email protected]>
Signed-off-by: Greg Schohn <[email protected]>

# Conflicts:
#	TrafficCapture/settings.gradle
#	TrafficCapture/trafficReplayer/build.gradle
#	TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformer/build.gradle
#	TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/build.gradle
#	TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle
#	TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/build.gradle
#	TrafficCapture/transformationPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/build.gradle
…ectoryRefactoring

Top level directory refactoring to allow RFS to use some utility/core libraries that the TrafficCapture projects use.
Add otel collector sidecar instead of dedicated collector service
Signed-off-by: Andre Kurait <[email protected]>
…pport

Parameterize AWS Partition for GovCloud
Signed-off-by: Tanner Lewis <[email protected]>
gregschohn and others added 4 commits May 22, 2024 20:18
# Conflicts:
#	RFS/docker/TestSource_ES_7_10/Dockerfile
#	TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile
#	deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-console-stack.ts
Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (e2e-tests-q2@0225509). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff               @@
##             e2e-tests-q2     #681   +/-   ##
===============================================
  Coverage                ?   75.23%           
  Complexity              ?     1415           
===============================================
  Files                   ?      150           
  Lines                   ?     6147           
  Branches                ?      561           
===============================================
  Hits                    ?     4625           
  Misses                  ?     1148           
  Partials                ?      374           
Flag Coverage Δ
unittests 75.23% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Signed-off-by: Tanner Lewis <[email protected]>
@lewijacn lewijacn merged commit e9aa64a into opensearch-project:e2e-tests-q2 May 23, 2024
8 checks passed
@lewijacn lewijacn deleted the sync-main-may23 branch October 10, 2024 17:49
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.

4 participants