Skip to content

Commit 379193e

Browse files
committed
Improving codecov
Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
1 parent e1f0a50 commit 379193e

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3RepositoryTests.java

+16
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,20 @@
3636

3737
import org.opensearch.cluster.metadata.RepositoryMetadata;
3838
import org.opensearch.common.settings.ClusterSettings;
39+
import org.opensearch.common.settings.Setting;
3940
import org.opensearch.common.settings.Settings;
4041
import org.opensearch.core.common.unit.ByteSizeUnit;
4142
import org.opensearch.core.common.unit.ByteSizeValue;
4243
import org.opensearch.core.xcontent.NamedXContentRegistry;
4344
import org.opensearch.indices.recovery.RecoverySettings;
4445
import org.opensearch.repositories.RepositoryException;
46+
import org.opensearch.repositories.blobstore.BlobStoreRepository;
4547
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
4648
import org.opensearch.test.OpenSearchTestCase;
4749
import org.hamcrest.Matchers;
4850

4951
import java.nio.file.Path;
52+
import java.util.List;
5053
import java.util.Map;
5154

5255
import static org.hamcrest.Matchers.containsString;
@@ -133,6 +136,19 @@ public void testDefaultBufferSize() {
133136
}
134137
}
135138

139+
public void testRestrictedSettingsDefault() {
140+
final RepositoryMetadata metadata = new RepositoryMetadata("dummy-repo", "mock", Settings.EMPTY);
141+
try (S3Repository s3repo = createS3Repo(metadata)) {
142+
List<Setting<?>> restrictedSettings = s3repo.getRestrictedSystemRepositorySettings();
143+
assertThat(restrictedSettings.size(), is(4));
144+
assertTrue(restrictedSettings.contains(BlobStoreRepository.SYSTEM_REPOSITORY_SETTING));
145+
assertTrue(restrictedSettings.contains(BlobStoreRepository.READONLY_SETTING));
146+
assertTrue(restrictedSettings.contains(BlobStoreRepository.REMOTE_STORE_INDEX_SHALLOW_COPY));
147+
assertTrue(restrictedSettings.contains(S3Repository.BUCKET_SETTING));
148+
assertTrue(restrictedSettings.contains(S3Repository.BASE_PATH_SETTING));
149+
}
150+
}
151+
136152
private S3Repository createS3Repo(RepositoryMetadata metadata) {
137153
return new S3Repository(
138154
metadata,

server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java

+28
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import org.opensearch.cluster.routing.UnassignedInfo;
5959
import org.opensearch.common.lucene.Lucene;
6060
import org.opensearch.common.settings.ClusterSettings;
61+
import org.opensearch.common.settings.Setting;
6162
import org.opensearch.common.settings.Settings;
6263
import org.opensearch.core.common.unit.ByteSizeUnit;
6364
import org.opensearch.core.index.shard.ShardId;
@@ -70,6 +71,7 @@
7071
import org.opensearch.indices.recovery.RecoveryState;
7172
import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
7273
import org.opensearch.repositories.IndexId;
74+
import org.opensearch.repositories.blobstore.BlobStoreRepository;
7375
import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
7476
import org.opensearch.snapshots.Snapshot;
7577
import org.opensearch.snapshots.SnapshotId;
@@ -90,6 +92,7 @@
9092

9193
import static java.util.Collections.emptyMap;
9294
import static java.util.Collections.emptySet;
95+
import static org.hamcrest.Matchers.is;
9396

9497
public class FsRepositoryTests extends OpenSearchTestCase {
9598

@@ -218,6 +221,31 @@ public void testSnapshotAndRestore() throws IOException, InterruptedException {
218221
}
219222
}
220223

224+
public void testRestrictedSettingsDefault() {
225+
Path repo = createTempDir();
226+
Settings settings = Settings.builder()
227+
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toAbsolutePath())
228+
.put(Environment.PATH_REPO_SETTING.getKey(), repo.toAbsolutePath())
229+
.put("location", repo)
230+
.put(FsRepository.BASE_PATH_SETTING.getKey(), "my_base_path")
231+
.build();
232+
RepositoryMetadata metadata = new RepositoryMetadata("test", "fs", settings);
233+
FsRepository repository = new FsRepository(
234+
metadata,
235+
new Environment(settings, null),
236+
NamedXContentRegistry.EMPTY,
237+
BlobStoreTestUtil.mockClusterService(),
238+
new RecoverySettings(settings, new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS))
239+
);
240+
241+
List<Setting<?>> restrictedSettings = repository.getRestrictedSystemRepositorySettings();
242+
assertThat(restrictedSettings.size(), is(4));
243+
assertTrue(restrictedSettings.contains(BlobStoreRepository.SYSTEM_REPOSITORY_SETTING));
244+
assertTrue(restrictedSettings.contains(BlobStoreRepository.READONLY_SETTING));
245+
assertTrue(restrictedSettings.contains(BlobStoreRepository.REMOTE_STORE_INDEX_SHALLOW_COPY));
246+
assertTrue(restrictedSettings.contains(FsRepository.LOCATION_SETTING));
247+
}
248+
221249
private void runGeneric(ThreadPool threadPool, Runnable runnable) throws InterruptedException {
222250
CountDownLatch latch = new CountDownLatch(1);
223251
threadPool.generic().submit(() -> {

0 commit comments

Comments
 (0)