Skip to content

Commit 8bbe836

Browse files
authored
Remove URI encoding when storing objects in GCS (#8314)
1 parent 218faba commit 8bbe836

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

app/lib/package/api_export/exported_api.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ final class ExportedPackage {
270270
/// Interace for writing `/api/archives/<package>-<version>.tar.gz`.
271271
ExportedBlob tarball(String version) => ExportedBlob._(
272272
_owner,
273-
'/api/archives/$_package-${Uri.encodeComponent(version)}.tar.gz',
273+
'/api/archives/$_package-$version.tar.gz',
274274
'$_package-$version.tar.gz',
275275
'application/octet',
276276
Duration(hours: 2),
@@ -313,9 +313,7 @@ final class ExportedPackage {
313313
);
314314
return;
315315
}
316-
final version = Uri.decodeComponent(
317-
item.name.without(prefix: pfx, suffix: '.tar.gz'),
318-
);
316+
final version = item.name.without(prefix: pfx, suffix: '.tar.gz');
319317

320318
final info = versions[version];
321319
if (info != null && !forceWrite) {
@@ -373,7 +371,7 @@ final class ExportedPackage {
373371
return;
374372
}
375373
final version = item.name.without(prefix: pfx, suffix: '.tar.gz');
376-
if (allVersionNumbers.contains(Uri.decodeComponent(version))) {
374+
if (allVersionNumbers.contains(version)) {
377375
return;
378376
}
379377
if (await _owner._bucket.tryInfo(item.name) case final info?) {

app/test/package/api_export/exported_api_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void main() {
175175
[1, 2, 3],
176176
);
177177
expect(
178-
await bucket.readBytes('latest/api/archives/_foo-1.2.3-dev%2B2.tar.gz'),
178+
await bucket.readBytes('latest/api/archives/_foo-1.2.3-dev+2.tar.gz'),
179179
[1, 2, 3],
180180
);
181181
expect(
@@ -184,7 +184,7 @@ void main() {
184184
);
185185
expect(
186186
await bucket
187-
.readBytes('latest/api/archives/_foo-1.2.3-d%2B4.tar.gz.tar.gz'),
187+
.readBytes('latest/api/archives/_foo-1.2.3-d+4.tar.gz.tar.gz'),
188188
[42],
189189
);
190190
});
@@ -309,7 +309,7 @@ void main() {
309309
[2, 0, 0],
310310
);
311311
expect(
312-
await bucket.readBytes('latest/api/archives/retry-3.0.0%2B1.tar.gz'),
312+
await bucket.readBytes('latest/api/archives/retry-3.0.0+1.tar.gz'),
313313
[3, 0, 0],
314314
);
315315

@@ -333,7 +333,7 @@ void main() {
333333
[2, 0, 0],
334334
);
335335
expect(
336-
await bucket.readBytes('latest/api/archives/retry-3.0.0%2B1.tar.gz'),
336+
await bucket.readBytes('latest/api/archives/retry-3.0.0+1.tar.gz'),
337337
[3, 0, 0],
338338
);
339339
});

0 commit comments

Comments
 (0)