Skip to content

Commit 4e9c765

Browse files
cylkdevcylkdev
committed
change to put
1 parent a71aee4 commit 4e9c765

2 files changed

Lines changed: 61 additions & 65 deletions

File tree

‎lib/cloud_cache/adapter.ex‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
defmodule CloudCache.Adapter do
22
@type bucket :: binary()
3-
@type key :: binary()
3+
@type object :: binary()
44
@type upload_id :: binary()
55
@type part_number :: pos_integer()
66
@type etag :: binary()
77
@type content_length :: pos_integer()
88
@type body :: term()
9-
@type options :: keyword()
9+
@type options :: objectword()
1010
@type http_method :: atom()
1111

1212
@callback pre_sign(
1313
bucket :: bucket(),
1414
http_method :: http_method(),
15-
key :: key(),
15+
object :: object(),
1616
opts :: options()
1717
) :: map()
1818

19-
@callback pre_sign_post(bucket :: bucket(), key :: key(), opts :: options()) :: map()
19+
@callback pre_sign_post(bucket :: bucket(), object :: object(), opts :: options()) :: map()
2020

2121
@callback pre_sign_part(
2222
bucket :: bucket(),
23-
key :: key(),
23+
object :: object(),
2424
upload_id :: upload_id(),
2525
part_number :: part_number(),
2626
opts :: options()
@@ -33,34 +33,34 @@ defmodule CloudCache.Adapter do
3333

3434
@callback head_object(
3535
bucket :: bucket(),
36-
key :: key(),
36+
object :: object(),
3737
opts :: options()
3838
) :: {:ok, term()} | {:error, term()}
3939

4040
@callback delete_object(
4141
bucket :: bucket(),
42-
key :: key(),
42+
object :: object(),
4343
opts :: options()
4444
) :: {:ok, term()} | {:error, term()}
4545

4646
@callback get_object(
4747
bucket :: bucket(),
48-
key :: key(),
48+
object :: object(),
4949
opts :: options()
5050
) :: {:ok, term()} | {:error, term()}
5151

5252
@callback put_object(
5353
bucket :: bucket(),
54-
key :: key(),
54+
object :: object(),
5555
body :: any(),
5656
opts :: options()
5757
) :: {:ok, term()} | {:error, term()}
5858

5959
@callback copy_object(
6060
dest_bucket :: bucket(),
61-
dest_key :: key(),
61+
dest_object :: object(),
6262
src_bucket :: bucket(),
63-
src_key :: key(),
63+
src_object :: object(),
6464
opts :: options()
6565
) :: {:ok, term()} | {:error, term()}
6666

@@ -71,13 +71,13 @@ defmodule CloudCache.Adapter do
7171

7272
@callback create_multipart_upload(
7373
bucket :: bucket(),
74-
key :: key(),
74+
object :: object(),
7575
opts :: options()
7676
) :: {:ok, term()} | {:error, term()}
7777

7878
@callback upload_part(
7979
bucket :: bucket(),
80-
key :: key(),
80+
object :: object(),
8181
upload_id :: upload_id(),
8282
part_number :: part_number(),
8383
body :: body(),
@@ -86,61 +86,61 @@ defmodule CloudCache.Adapter do
8686

8787
@callback list_parts(
8888
bucket :: bucket(),
89-
key :: key(),
89+
object :: object(),
9090
upload_id :: upload_id(),
9191
opts :: options()
9292
) :: {:ok, term()} | {:error, term()}
9393

9494
@callback complete_multipart_upload(
9595
bucket :: bucket(),
96-
key :: key(),
96+
object :: object(),
9797
upload_id :: upload_id(),
9898
parts :: [{part_number(), etag()}],
9999
opts :: options()
100100
) :: {:ok, term()} | {:error, term()}
101101

102102
@callback abort_multipart_upload(
103103
bucket :: bucket(),
104-
key :: key(),
104+
object :: object(),
105105
upload_id :: upload_id(),
106106
opts :: options()
107107
) :: {:ok, term()} | {:error, term()}
108108

109109
@callback copy_object_multipart(
110110
dest_bucket :: bucket(),
111-
dest_key :: key(),
111+
dest_object :: object(),
112112
src_bucket :: bucket(),
113-
src_key :: key(),
113+
src_object :: object(),
114114
opts :: options()
115115
) :: {:ok, term()} | {:error, term()}
116116

117117
@callback copy_parts(
118118
dest_bucket :: bucket(),
119-
dest_key :: key(),
119+
dest_object :: object(),
120120
src_bucket :: bucket(),
121-
src_key :: key(),
121+
src_object :: object(),
122122
upload_id :: upload_id(),
123123
content_length :: content_length(),
124124
opts :: options()
125125
) :: {:ok, term()} | {:error, term()}
126126

127127
@callback copy_part(
128128
dest_bucket :: bucket(),
129-
dest_key :: key(),
129+
dest_object :: object(),
130130
src_bucket :: bucket(),
131-
src_key :: key(),
131+
src_object :: object(),
132132
upload_id :: upload_id(),
133133
part_number :: part_number(),
134134
src_range :: Range.t(),
135135
opts :: options()
136136
) :: {:ok, term()} | {:error, term()}
137137

138-
def pre_sign(adapter, bucket, http_method, key, opts \\ []) do
139-
adapter.pre_sign(bucket, http_method, key, opts)
138+
def pre_sign(adapter, bucket, http_method, object, opts \\ []) do
139+
adapter.pre_sign(bucket, http_method, object, opts)
140140
end
141141

142-
def pre_sign_post(adapter, bucket, key, opts \\ []) do
143-
adapter.pre_sign_post(bucket, key, opts)
142+
def pre_sign_post(adapter, bucket, object, opts \\ []) do
143+
adapter.pre_sign_post(bucket, object, opts)
144144
end
145145

146146
def list_buckets(adapter, opts \\ []) do
@@ -151,24 +151,24 @@ defmodule CloudCache.Adapter do
151151
adapter.create_bucket(bucket, region, opts)
152152
end
153153

154-
def head_object(adapter, bucket, key, opts \\ []) do
155-
adapter.head_object(bucket, key, opts)
154+
def head_object(adapter, bucket, object, opts \\ []) do
155+
adapter.head_object(bucket, object, opts)
156156
end
157157

158-
def delete_object(adapter, bucket, key, opts \\ []) do
159-
adapter.delete_object(bucket, key, opts)
158+
def delete_object(adapter, bucket, object, opts \\ []) do
159+
adapter.delete_object(bucket, object, opts)
160160
end
161161

162-
def get_object(adapter, bucket, key, opts \\ []) do
163-
adapter.get_object(bucket, key, opts)
162+
def get_object(adapter, bucket, object, opts \\ []) do
163+
adapter.get_object(bucket, object, opts)
164164
end
165165

166-
def put_object(adapter, bucket, key, body, opts \\ []) do
167-
adapter.put_object(bucket, key, body, opts)
166+
def put_object(adapter, bucket, object, body, opts \\ []) do
167+
adapter.put_object(bucket, object, body, opts)
168168
end
169169

170-
def copy_object(adapter, dest_bucket, dest_key, src_bucket, src_key, opts \\ []) do
171-
adapter.copy_object(dest_bucket, dest_key, src_bucket, src_key, opts)
170+
def copy_object(adapter, dest_bucket, dest_object, src_bucket, src_object, opts \\ []) do
171+
adapter.copy_object(dest_bucket, dest_object, src_bucket, src_object, opts)
172172
end
173173

174174
def list_objects(adapter, bucket, opts \\ []) do
@@ -177,49 +177,49 @@ defmodule CloudCache.Adapter do
177177

178178
# Multipart Upload API
179179

180-
def pre_sign_part(adapter, bucket, key, upload_id, part_number, opts \\ []) do
181-
adapter.pre_sign_part(bucket, key, upload_id, part_number, opts)
180+
def pre_sign_part(adapter, bucket, object, upload_id, part_number, opts \\ []) do
181+
adapter.pre_sign_part(bucket, object, upload_id, part_number, opts)
182182
end
183183

184-
def upload_part(adapter, bucket, key, upload_id, part_number, body, opts \\ []) do
185-
adapter.upload_part(bucket, key, upload_id, part_number, body, opts)
184+
def upload_part(adapter, bucket, object, upload_id, part_number, body, opts \\ []) do
185+
adapter.upload_part(bucket, object, upload_id, part_number, body, opts)
186186
end
187187

188-
def list_parts(adapter, bucket, key, upload_id, opts \\ []) do
189-
adapter.list_parts(bucket, key, upload_id, opts)
188+
def list_parts(adapter, bucket, object, upload_id, opts \\ []) do
189+
adapter.list_parts(bucket, object, upload_id, opts)
190190
end
191191

192-
def complete_multipart_upload(adapter, bucket, key, upload_id, parts, opts \\ []) do
193-
adapter.complete_multipart_upload(bucket, key, upload_id, parts, opts)
192+
def complete_multipart_upload(adapter, bucket, object, upload_id, parts, opts \\ []) do
193+
adapter.complete_multipart_upload(bucket, object, upload_id, parts, opts)
194194
end
195195

196-
def abort_multipart_upload(adapter, bucket, key, upload_id, opts \\ []) do
197-
adapter.abort_multipart_upload(bucket, key, upload_id, opts)
196+
def abort_multipart_upload(adapter, bucket, object, upload_id, opts \\ []) do
197+
adapter.abort_multipart_upload(bucket, object, upload_id, opts)
198198
end
199199

200-
def create_multipart_upload(adapter, bucket, key, opts \\ []) do
201-
adapter.create_multipart_upload(bucket, key, opts)
200+
def create_multipart_upload(adapter, bucket, object, opts \\ []) do
201+
adapter.create_multipart_upload(bucket, object, opts)
202202
end
203203

204-
def copy_object_multipart(adapter, dest_bucket, dest_key, src_bucket, src_key, opts \\ []) do
205-
adapter.copy_object_multipart(dest_bucket, dest_key, src_bucket, src_key, opts)
204+
def copy_object_multipart(adapter, dest_bucket, dest_object, src_bucket, src_object, opts \\ []) do
205+
adapter.copy_object_multipart(dest_bucket, dest_object, src_bucket, src_object, opts)
206206
end
207207

208208
def copy_parts(
209209
adapter,
210210
dest_bucket,
211-
dest_key,
211+
dest_object,
212212
src_bucket,
213-
src_key,
213+
src_object,
214214
upload_id,
215215
content_length,
216216
opts \\ []
217217
) do
218218
adapter.copy_parts(
219219
dest_bucket,
220-
dest_key,
220+
dest_object,
221221
src_bucket,
222-
src_key,
222+
src_object,
223223
upload_id,
224224
content_length,
225225
opts
@@ -229,19 +229,19 @@ defmodule CloudCache.Adapter do
229229
def copy_part(
230230
adapter,
231231
dest_bucket,
232-
dest_key,
232+
dest_object,
233233
src_bucket,
234-
src_key,
234+
src_object,
235235
upload_id,
236236
part_number,
237237
src_range,
238238
opts \\ []
239239
) do
240240
adapter.copy_part(
241241
dest_bucket,
242-
dest_key,
242+
dest_object,
243243
src_bucket,
244-
src_key,
244+
src_object,
245245
upload_id,
246246
part_number,
247247
src_range,

‎lib/cloud_cache/adapters/s3.ex‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -551,13 +551,9 @@ defmodule CloudCache.Adapters.S3 do
551551
sandbox? = opts[:s3][:sandbox_enabled] === true
552552

553553
if not sandbox? or sandbox_disabled?() do
554-
if Keyword.get(opts, :http_method, :post) === :post do
555-
pre_sign_post(bucket, object, opts)
556-
else
557-
query_params = %{"uploadId" => upload_id, "partNumber" => part_number}
558-
opts = Keyword.update(opts, :query_params, query_params, &Map.merge(&1, query_params))
559-
pre_sign(bucket, :put, object, opts)
560-
end
554+
query_params = %{"uploadId" => upload_id, "partNumber" => part_number}
555+
opts = Keyword.update(opts, :query_params, query_params, &Map.merge(&1, query_params))
556+
pre_sign(bucket, :put, object, opts)
561557
else
562558
sandbox_pre_sign_part_response(bucket, object, upload_id, part_number, opts)
563559
end

0 commit comments

Comments
 (0)