Skip to content

Commit c1b6435

Browse files
Mute tests for backport #41673 (#41698)
Mutes security tokens BWC tests for the #41673 backport.
1 parent adf6705 commit c1b6435

File tree

5 files changed

+15
-1
lines changed

5 files changed

+15
-1
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public final class TokenService {
180180
private static final String TOKEN_DOC_ID_PREFIX = TOKEN_DOC_TYPE + "_";
181181
static final int MINIMUM_BYTES = VERSION_BYTES + SALT_BYTES + IV_BYTES + 1;
182182
static final int MINIMUM_BASE64_BYTES = Double.valueOf(Math.ceil((4 * MINIMUM_BYTES) / 3)).intValue();
183-
static final Version VERSION_TOKENS_INDEX_INTRODUCED = Version.V_8_0_0; // TODO change upon backport
183+
static final Version VERSION_TOKENS_INDEX_INTRODUCED = Version.V_7_1_0;
184184
static final Version VERSION_ACCESS_TOKENS_AS_UUIDS = Version.V_7_1_0;
185185
static final Version VERSION_MULTIPLE_CONCURRENT_REFRESHES = Version.V_7_1_0;
186186
// UUIDs are 16 bytes encoded base64 without padding, therefore the length is (16 / 3) * 4 + ((16 % 3) * 8 + 5) / 6 chars

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TokenBackwardsCompatibilityIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.apache.http.HttpHeaders;
99
import org.apache.http.HttpHost;
10+
import org.apache.lucene.util.LuceneTestCase;
1011
import org.elasticsearch.Version;
1112
import org.elasticsearch.client.Request;
1213
import org.elasticsearch.client.RequestOptions;
@@ -25,6 +26,7 @@
2526
import java.util.List;
2627
import java.util.Map;
2728

29+
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/41673")
2830
public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase {
2931

3032
private Collection<RestClient> twoClients = null;

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/50_token_auth.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"Get the indexed token and use if to authenticate":
33
- skip:
44
features: headers
5+
version: "all"
6+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
57

68
- do:
79
cluster.health:
@@ -59,6 +61,8 @@
5961
"Get the indexed refreshed access token and use if to authenticate":
6062
- skip:
6163
features: headers
64+
version: "all"
65+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
6266

6367
- do:
6468
get:
@@ -111,6 +115,8 @@
111115
"Get the indexed refresh token and use it to get another access token and authenticate":
112116
- skip:
113117
features: headers
118+
version: "all"
119+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
114120

115121
- do:
116122
get:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/50_token_auth.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"Create a token and reuse it across the upgrade":
33
- skip:
44
features: headers
5+
version: "all"
6+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
57

68
- do:
79
cluster.health:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/50_token_auth.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"Get the indexed token and use if to authenticate":
33
- skip:
44
features: headers
5+
version: "all"
6+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
57

68
- do:
79
cluster.health:
@@ -49,6 +51,8 @@
4951
"Get the indexed refresh token and use if to get another access token and authenticate":
5052
- skip:
5153
features: headers
54+
version: "all"
55+
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"
5256

5357
- do:
5458
get:

0 commit comments

Comments
 (0)