Skip to content

Commit 0b65bc1

Browse files
authored
Refactor entitlement IT test to allow dynamic policy (#120443)
This commit combines the different entitlement test plugins used for integration tests into a single plugin. When installing the plugin in the integ test cluster, the entitlement policy and plugin properties are adjusted to test the desired combination of settings. This allows the plugin policy to be dynamically generated by each test, rather than rely on a static policy.
1 parent 9c19268 commit 0b65bc1

File tree

30 files changed

+249
-350
lines changed

30 files changed

+249
-350
lines changed

libs/entitlement/qa/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
1212
apply plugin: 'elasticsearch.internal-test-artifact'
1313

1414
dependencies {
15-
javaRestTestImplementation project(':libs:entitlement:qa:common')
16-
clusterModules project(':libs:entitlement:qa:entitlement-allowed')
17-
clusterModules project(':libs:entitlement:qa:entitlement-allowed-nonmodular')
18-
clusterPlugins project(':libs:entitlement:qa:entitlement-denied')
19-
clusterPlugins project(':libs:entitlement:qa:entitlement-denied-nonmodular')
15+
javaRestTestImplementation project(':libs:entitlement:qa:test-plugin')
16+
clusterModules project(':libs:entitlement:qa:test-plugin')
2017
}

libs/entitlement/qa/entitlement-allowed-nonmodular/build.gradle

Lines changed: 0 additions & 24 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed-nonmodular/src/main/java/org/elasticsearch/entitlement/qa/nonmodular/EntitlementAllowedNonModularPlugin.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed-nonmodular/src/main/plugin-metadata/entitlement-policy.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed/build.gradle

Lines changed: 0 additions & 25 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed/src/main/java/module-info.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed/src/main/java/org/elasticsearch/entitlement/qa/EntitlementAllowedPlugin.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

libs/entitlement/qa/entitlement-allowed/src/main/plugin-metadata/entitlement-policy.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

libs/entitlement/qa/entitlement-denied-nonmodular/build.gradle

Lines changed: 0 additions & 24 deletions
This file was deleted.

libs/entitlement/qa/entitlement-denied-nonmodular/src/main/java/org/elasticsearch/entitlement/qa/nonmodular/EntitlementDeniedNonModularPlugin.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)