Skip to content

Commit a7a2c10

Browse files
committed
1 parent ca90c49 commit a7a2c10

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

src/Nest/Modules/SnapshotAndRestore/Repositories/S3Repository.cs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ public interface IS3RepositorySettings : IRepositorySettings
2121
[JsonProperty("bucket")]
2222
string Bucket { get; set; }
2323

24-
[JsonProperty("region")]
25-
string Region { get; set; }
26-
2724
[JsonProperty("base_path")]
2825
string BasePath { get; set; }
2926

@@ -53,7 +50,6 @@ public S3RepositorySettings(string bucket)
5350
}
5451

5552
public string Bucket { get; set; }
56-
public string Region { get; set; }
5753
public string BasePath { get; set; }
5854
public string AccessKey { get; set; }
5955
public string SecretKey { get; set; }
@@ -62,11 +58,10 @@ public S3RepositorySettings(string bucket)
6258
public string ChunkSize { get; set; }
6359
}
6460

65-
public class S3RepositorySettingsDescriptor
61+
public class S3RepositorySettingsDescriptor
6662
: DescriptorBase<S3RepositorySettingsDescriptor, IS3RepositorySettings>, IS3RepositorySettings
6763
{
6864
string IS3RepositorySettings.Bucket { get; set; }
69-
string IS3RepositorySettings.Region { get; set; }
7065
string IS3RepositorySettings.BasePath { get; set; }
7166
string IS3RepositorySettings.AccessKey { get; set; }
7267
string IS3RepositorySettings.SecretKey { get; set; }
@@ -80,13 +75,6 @@ public class S3RepositorySettingsDescriptor
8075
/// <param name="bucket"></param>
8176
public S3RepositorySettingsDescriptor Bucket(string bucket) => Assign(a => a.Bucket = bucket);
8277

83-
/// <summary>
84-
/// The region where bucket is located. Defaults to US Standard
85-
/// </summary>
86-
/// <param name="region"></param>
87-
/// <returns></returns>
88-
public S3RepositorySettingsDescriptor Region(string region) => Assign(a => a.Region = region);
89-
9078
/// <summary>
9179
/// Specifies the path within bucket to repository data. Defaults to root directory.
9280
/// </summary>
@@ -109,7 +97,7 @@ public class S3RepositorySettingsDescriptor
10997
public S3RepositorySettingsDescriptor SecretKey(string secretKey) => Assign(a => a.SecretKey = secretKey);
11098

11199
/// <summary>
112-
/// When set to true metadata files are stored in compressed format. This setting doesn't
100+
/// When set to true metadata files are stored in compressed format. This setting doesn't
113101
/// affect index files that are already compressed by default. Defaults to false.
114102
/// </summary>
115103
/// <param name="compress"></param>
@@ -122,15 +110,15 @@ public class S3RepositorySettingsDescriptor
122110
public S3RepositorySettingsDescriptor ConcurrentStreams(int concurrentStreams) => Assign(a => a.ConcurrentStreams = concurrentStreams);
123111

124112
/// <summary>
125-
/// Big files can be broken down into chunks during snapshotting if needed.
126-
/// The chunk size can be specified in bytes or by using size value notation,
113+
/// Big files can be broken down into chunks during snapshotting if needed.
114+
/// The chunk size can be specified in bytes or by using size value notation,
127115
/// i.e. 1g, 10m, 5k. Defaults to 100m.
128116
/// </summary>
129117
/// <param name="chunkSize"></param>
130118
public S3RepositorySettingsDescriptor ChunkSize(string chunkSize) => Assign(a => a.ChunkSize = chunkSize);
131119
}
132120

133-
public class S3RepositoryDescriptor
121+
public class S3RepositoryDescriptor
134122
: DescriptorBase<S3RepositoryDescriptor, IS3Repository>, IS3Repository
135123
{
136124
string ISnapshotRepository.Type { get; } = "s3";

src/Tests/Modules/SnapshotAndRestore/Repositories/CreateRepository/CreateRepositoryApiTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ protected override LazyResponses ClientUsage() => Calls(
251251
type = "s3",
252252
settings = new {
253253
bucket = "foobucket",
254-
region = "us-east",
255254
base_path = "some/path",
256255
access_key = "fooaccess",
257256
secret_key = "foosecret",
@@ -266,7 +265,6 @@ protected override LazyResponses ClientUsage() => Calls(
266265
protected override Func<CreateRepositoryDescriptor, ICreateRepositoryRequest> Fluent => d => d
267266
.S3(fs => fs
268267
.Settings("foobucket", s => s
269-
.Region("us-east")
270268
.BasePath("some/path")
271269
.AccessKey("fooaccess")
272270
.SecretKey("foosecret")
@@ -280,7 +278,6 @@ protected override LazyResponses ClientUsage() => Calls(
280278
{
281279
Repository = new S3Repository(new S3RepositorySettings("foobucket")
282280
{
283-
Region = "us-east",
284281
BasePath = "some/path",
285282
AccessKey = "fooaccess",
286283
SecretKey = "foosecret",

0 commit comments

Comments
 (0)