Skip to content

Commit ab8d6c6

Browse files
author
Yogesh Gaikwad
committed
Changes to move encrypted snapshots code to x-pack module
1 parent c1649c8 commit ab8d6c6

File tree

12 files changed

+56
-66
lines changed

12 files changed

+56
-66
lines changed

plugins/repository-encrypted/build.gradle

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

plugins/repository-encrypted/src/main/plugin-metadata/plugin-security.policy

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

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ protected HdfsBlobStore createBlobStore() {
233233
}
234234

235235
@Override
236-
protected ByteSizeValue chunkSize() {
236+
public ByteSizeValue chunkSize() {
237237
return chunkSize;
238238
}
239239
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
evaluationDependsOn(xpackModule('core'))
2+
3+
apply plugin: 'elasticsearch.esplugin'
4+
esplugin {
5+
name 'repository-encrypted'
6+
description 'Elasticsearch Expanded Pack Plugin - client-side AES-GCM encrypted repositories.'
7+
classname 'org.elasticsearch.repositories.encrypted.EncryptedRepositoryPlugin'
8+
extendedPlugins = ['x-pack-core']
9+
}
10+
11+
dependencies {
12+
compile 'org.bouncycastle:bcprov-jdk15on:1.62'
13+
}
14+
15+
integTest.enabled = false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
633b6739ef8f07f2e71f8eebd1c6f25b17a4ec7d
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including
4+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
5+
following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
10+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
11+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
12+
SOFTWARE.

x-pack/plugin/repository-encrypted/licenses/bcprov-jdk15on-NOTICE.txt

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public Repository create(RepositoryMetaData metaData, Function<String, Repositor
131131
if (Strings.hasLength(delegateType) == false) {
132132
throw new IllegalArgumentException(DELEGATE_TYPE.getKey() + " must be set");
133133
}
134+
134135
if (false == cachedRepositoryPasswords.containsKey(metaData.name())) {
135136
throw new IllegalArgumentException(
136137
ENCRYPTION_PASSWORD_SETTING.getConcreteSettingForNamespace(metaData.name()).getKey() + " must be set");
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License;
4+
* you may not use this file except in compliance with the Elastic License.
185
*/
196

207
package org.elasticsearch.repositories.encrypted;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License;
4+
* you may not use this file except in compliance with the Elastic License.
5+
*/
6+
7+
grant {
8+
permission java.security.SecurityPermission "putProviderProperty.BC";
9+
};

0 commit comments

Comments
 (0)