Merge remote-tracking branch 'origin/feature/fix-failing-apt-get' into feature/fix-failing-apt-get

Author: ankit--sethi

build-tools-internal/build.gradle

@@ -381,6 +381,7 @@ tasks.named("jar") {
 
 spotless {
   java {
+
     // workaround for https://github.com/diffplug/spotless/issues/2317
     //toggleOffOn()
     target project.fileTree("src/main/java") {

docs/changelog/129295.yaml

@@ -0,0 +1,6 @@
+pr: 129295
+summary: Increase the number of retries for apt-get
+area: Security
+type: enhancement
+issues:
+ - 124490

gradle/build.versions.toml

@@ -45,7 +45,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.
 spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
 spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
 spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
-spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
+spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
 wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
 xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
 

gradle/verification-metadata.xml

@@ -134,8 +134,8 @@ private void assertMissingFieldThrowsIllegalArgumentException(String responseJso
         assertThat(thrownException.getMessage(), is("Required [" + missingField + "]"));
     }
 
-    private void assertTopNLimit(Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation)
-        throws IOException {
+    private void assertTopNLimit(
+        Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation) throws IOException {
         when(REQUEST_MOCK.getTopN()).thenReturn(topN);
 
         RankedDocsResults parsedResults = HuggingFaceRerankResponseEntity.fromResponse(

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java

@@ -30,8 +30,10 @@ public static WritableIndexExpander create(boolean stateIndexWritable) {
     }
 
     private static void mockWhenIndicesAreNotWritable(WritableIndexExpander writableIndexExpander) {
-        when(writableIndexExpander.getWritableIndices(anyString())).thenReturn(new ArrayList<>());
-        when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any())).thenReturn(new ArrayList<>());
+        when(writableIndexExpander.getWritableIndices(anyString()))
+            .thenReturn(new ArrayList<>());
+        when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any()))
+            .thenReturn(new ArrayList<>());
     }
 
     private static void mockWhenIndicesAreWritable(WritableIndexExpander writableIndexExpander) {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java

@@ -791,7 +791,7 @@ public void testAuthenticateCached() throws Exception {
 
     public void testAuthenticateNonExistentRestRequestUserThrowsAuthenticationException() throws Exception {
         when(firstRealm.token(threadContext)).thenReturn(
-            new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
+                new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
         );
         try {
             authenticateBlocking(restRequest, null);
@@ -2069,23 +2069,23 @@ public void testExpiredToken() throws Exception {
         when(projectIndex.indexExists()).thenReturn(true);
         User user = new User("_username", "r1");
         final Authentication expected = AuthenticationTestHelper.builder()
-            .user(user)
-            .realmRef(new RealmRef("realm", "custom", "node"))
-            .build(false);
+                .user(user)
+                .realmRef(new RealmRef("realm", "custom", "node"))
+                .build(false);
         PlainActionFuture<TokenService.CreateTokenResult> tokenFuture = new PlainActionFuture<>();
         Tuple<byte[], byte[]> newTokenBytes = tokenService.getRandomTokenBytes(randomBoolean());
         try (ThreadContext.StoredContext ctx = threadContext.stashContext()) {
             Authentication originatingAuth = AuthenticationTestHelper.builder()
-                .user(new User("creator"))
-                .realmRef(new RealmRef("test", "test", "test"))
-                .build(false);
+                    .user(new User("creator"))
+                    .realmRef(new RealmRef("test", "test", "test"))
+                    .build(false);
             tokenService.createOAuth2Tokens(
-                newTokenBytes.v1(),
-                newTokenBytes.v2(),
-                expected,
-                originatingAuth,
-                Collections.emptyMap(),
-                tokenFuture
+                    newTokenBytes.v1(),
+                    newTokenBytes.v2(),
+                    expected,
+                    originatingAuth,
+                    Collections.emptyMap(),
+                    tokenFuture
             );
         }
         String token = tokenFuture.get().getAccessToken();
@@ -2104,8 +2104,8 @@ public void testExpiredToken() throws Exception {
             }
             threadContext.putHeader("Authorization", "Bearer " + token);
             ElasticsearchSecurityException e = expectThrows(
-                ElasticsearchSecurityException.class,
-                () -> authenticateBlocking("_action", transportRequest, null, null)
+                    ElasticsearchSecurityException.class,
+                    () -> authenticateBlocking("_action", transportRequest, null, null)
             );
             if (requestIdAlreadyPresent) {
                 assertThat(expectAuditRequestId(threadContext), is(reqId.get()));