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

Jump to bottom

Separate encrypted repository plugin integ tests #72959

Merged
merged 1 commit into from
May 12, 2021
Merged

Separate encrypted repository plugin integ tests #72959

Show file tree
Hide file tree
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
15 changes: 1 addition & 14 deletions x-pack/plugin/repository-encrypted/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ evaluationDependsOn(xpackModule('core'))

apply plugin: 'elasticsearch.internal-es-plugin'
apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.internal-test-artifact'
esplugin {
name 'repository-encrypted'
description 'Elasticsearch Expanded Pack Plugin - client-side encrypted repositories.'
Expand All @@ -14,18 +15,4 @@ dependencies {
// necessary for the license check
compileOnly project(path: xpackModule('core'))
testImplementation(testArtifact(project(xpackModule('core'))))

// required for integ tests of encrypted FS repository
internalClusterTestImplementation project(":test:framework")
// required for integ tests of encrypted cloud repositories
internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
internalClusterTestImplementation(testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')) {
// HACK, resolves jar hell, such as:
// jar1: jakarta.xml.bind/jakarta.xml.bind-api/2.3.2/8d49996a4338670764d7ca4b85a1c4ccf7fe665d/jakarta.xml.bind-api-2.3.2.jar
// jar2: javax.xml.bind/jaxb-api/2.2.2/aeb3021ca93dde265796d82015beecdcff95bf09/jaxb-api-2.2.2.jar
exclude group: 'javax.xml.bind', module: 'jaxb-api'
}
// for encrypted GCS repository integ tests
internalClusterTestRuntimeOnly 'com.google.guava:guava:26.0-jre'
}
8 changes: 8 additions & 0 deletions x-pack/plugin/repository-encrypted/qa/azure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.java'

dependencies {
internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
Copy link
Contributor

Choose a reason for hiding this comment

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

FWIW, in this scenario you can omit the test parameter as this is the default.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll leave it for clarity, but feel free to remove it when I'm not looking

}
0 ...edAzureBlobStoreRepositoryIntegTests.java → ...edAzureBlobStoreRepositoryIntegTests.java
View file
Open in desktop
File renamed without changes.
Empty file added x-pack/plugin/repository-encrypted/qa/build.gradle
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions x-pack/plugin/repository-encrypted/qa/gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.java'

dependencies {
internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
}
0 ...ptedGCSBlobStoreRepositoryIntegTests.java → ...ptedGCSBlobStoreRepositoryIntegTests.java
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions x-pack/plugin/repository-encrypted/qa/s3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.java'

dependencies {
internalClusterTestImplementation testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')
internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
}
0 ...yptedS3BlobStoreRepositoryIntegTests.java → ...yptedS3BlobStoreRepositoryIntegTests.java
View file
Open in desktop
File renamed without changes.