Ver Fonte

S3 Repository: Remove unused files (#24145)

These were leftover from the removal of the signer type setting in
Ryan Ernst há 8 anos atrás
pai
commit
a8083f3d76

+ 0 - 73
plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsSigner.java

@@ -1,73 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.repositories.s3;
-
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.SignerFactory;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.logging.Loggers;
-
-class AwsSigner {
-
-    private static final Logger logger = Loggers.getLogger(AwsSigner.class);
-
-    private AwsSigner() {
-
-    }
-
-    protected static void validateSignerType(String signer, String endpoint) {
-        if (signer == null) {
-            throw new IllegalArgumentException("[null] signer set");
-        }
-
-        // do not block user to any signerType
-        switch (signer) {
-            case "S3SignerType":
-                if (endpoint.equals("s3.cn-north-1.amazonaws.com.cn") || endpoint.equals("s3.eu-central-1.amazonaws.com")) {
-                    throw new IllegalArgumentException("[S3SignerType] may not be supported in aws Beijing and Frankfurt region");
-                }
-                break;
-            case "AWSS3V4SignerType":
-                break;
-            default:
-                try {
-                    SignerFactory.getSignerByTypeAndService(signer, null);
-                } catch (IllegalArgumentException e) {
-                    throw new IllegalArgumentException("[" + signer + "] may not be supported");
-                }
-        }
-    }
-
-    /**
-     * Add a AWS API Signer.
-     * @param signer Signer to use
-     * @param configuration AWS Client configuration
-     */
-    public static void configureSigner(String signer, ClientConfiguration configuration, String endpoint) {
-        try {
-            validateSignerType(signer, endpoint);
-        } catch (IllegalArgumentException e) {
-            logger.warn("{}", e.getMessage());
-        }
-
-        configuration.setSignerOverride(signer);
-    }
-
-}

+ 0 - 89
plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AWSSignersTests.java

@@ -1,89 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.repositories.s3;
-
-import com.amazonaws.ClientConfiguration;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.repositories.s3.AwsSigner;
-import org.elasticsearch.repositories.s3.S3RepositoryPlugin;
-import org.elasticsearch.test.ESTestCase;
-import org.junit.BeforeClass;
-
-import static org.hamcrest.CoreMatchers.is;
-
-public class AWSSignersTests extends ESTestCase {
-
-    /**
-     * Starts S3RepositoryPlugin. It's a workaround when you run test from IntelliJ. Otherwise it generates
-     * java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessDeclaredMembers")
-     */
-    @BeforeClass
-    public static void instantiatePlugin() {
-        new S3RepositoryPlugin(Settings.EMPTY);
-    }
-
-    public void testSigners() {
-        assertThat(signerTester(null), is(false));
-        assertThat(signerTester("QueryStringSignerType"), is(true));
-        assertThat(signerTester("AWS3SignerType"), is(true));
-        assertThat(signerTester("AWS4SignerType"), is(true));
-        assertThat(signerTester("NoOpSignerType"), is(true));
-        assertThat(signerTester("UndefinedSigner"), is(false));
-        assertThat(signerTester("S3SignerType"), is(true));
-        assertThat(signerTester("AWSS3V4SignerType"), is(true));
-
-        ClientConfiguration configuration = new ClientConfiguration();
-        AwsSigner.configureSigner("AWS4SignerType", configuration, "any");
-        assertEquals(configuration.getSignerOverride(), "AWS4SignerType");
-        AwsSigner.configureSigner("S3SignerType", configuration, "any");
-        assertEquals(configuration.getSignerOverride(), "S3SignerType");
-    }
-
-    public void testV2InInvalidRegion() {
-        try {
-            AwsSigner.validateSignerType("S3SignerType", "s3.cn-north-1.amazonaws.com.cn");
-            fail("S3SignerType should not be available for China region");
-        } catch (IllegalArgumentException e) {
-            assertEquals("[S3SignerType] may not be supported in aws Beijing and Frankfurt region", e.getMessage());
-        }
-
-        try {
-            AwsSigner.validateSignerType("S3SignerType", "s3.eu-central-1.amazonaws.com");
-            fail("S3SignerType should not be available for Frankfurt region");
-        } catch (IllegalArgumentException e) {
-            assertEquals("[S3SignerType] may not be supported in aws Beijing and Frankfurt region", e.getMessage());
-        }
-    }
-
-
-    /**
-     * Test a signer configuration
-     * @param signer signer name
-     * @return true if successful, false otherwise
-     */
-    private boolean signerTester(String signer) {
-        try {
-            AwsSigner.validateSignerType(signer, "s3.amazonaws.com");
-            return true;
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-    }
-}