From 722862dcbedce32e1cc7f4b3a4404274f2a08e58 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Fri, 2 Jun 2023 15:08:24 -0700 Subject: [PATCH] fix(code_push_protocol): rename upload_url to url for backward compat (#588) --- .../lib/src/code_push_client.dart | 4 ++-- .../test/src/code_push_client_test.dart | 16 ++++++++-------- .../create_patch_artifact_response.dart | 4 ++-- .../create_patch_artifact_response.g.dart | 6 +++--- .../create_release_artifact_response.dart | 4 ++-- .../create_release_artifact_response.g.dart | 6 +++--- .../create_patch_artifact_response_test.dart | 2 +- .../create_release_artifact_response_test.dart | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/shorebird_code_push_client/lib/src/code_push_client.dart b/packages/shorebird_code_push_client/lib/src/code_push_client.dart index 525f98c3..63ff258b 100644 --- a/packages/shorebird_code_push_client/lib/src/code_push_client.dart +++ b/packages/shorebird_code_push_client/lib/src/code_push_client.dart @@ -112,7 +112,7 @@ class CodePushClient { ); final uploadResponse = await _httpClient.put( - Uri.parse(decoded.uploadUrl), + Uri.parse(decoded.url), body: File(artifactPath).readAsBytesSync(), ); if (uploadResponse.statusCode != HttpStatus.ok) { @@ -169,7 +169,7 @@ class CodePushClient { ); final uploadResponse = await _httpClient.put( - Uri.parse(decoded.uploadUrl), + Uri.parse(decoded.url), body: File(artifactPath).readAsBytesSync(), ); if (uploadResponse.statusCode != HttpStatus.ok) { diff --git a/packages/shorebird_code_push_client/test/src/code_push_client_test.dart b/packages/shorebird_code_push_client/test/src/code_push_client_test.dart index 0067c5b4..6dc742f0 100644 --- a/packages/shorebird_code_push_client/test/src/code_push_client_test.dart +++ b/packages/shorebird_code_push_client/test/src/code_push_client_test.dart @@ -246,7 +246,7 @@ void main() { test('throws an exception if the upload fails', () async { const artifactId = 42; - const uploadUrl = 'https://example.com/artifact.zip'; + const uploadUrl = 'https://example.com'; when(() => httpClient.send(any())).thenAnswer((_) async { return http.StreamedResponse( Stream.value( @@ -259,7 +259,7 @@ void main() { platform: platform, hash: hash, size: size, - uploadUrl: uploadUrl, + url: uploadUrl, ), ), ), @@ -302,7 +302,7 @@ void main() { test('completes when request succeeds', () async { const artifactId = 42; - const uploadUrl = 'https://example.com/artifact.zip'; + const uploadUrl = 'https://example.com'; when(() => httpClient.send(any())).thenAnswer((_) async { return http.StreamedResponse( Stream.value( @@ -315,7 +315,7 @@ void main() { platform: platform, hash: hash, size: size, - uploadUrl: uploadUrl, + url: uploadUrl, ), ), ), @@ -494,7 +494,7 @@ void main() { test('throws an exception if the upload fails', () async { const artifactId = 42; - const uploadUrl = 'https://example.com/artifact.zip'; + const uploadUrl = 'https://example.com'; when(() => httpClient.send(any())).thenAnswer((_) async { return http.StreamedResponse( Stream.value( @@ -507,7 +507,7 @@ void main() { platform: platform, hash: hash, size: size, - uploadUrl: uploadUrl, + url: uploadUrl, ), ), ), @@ -550,7 +550,7 @@ void main() { test('completes when request succeeds', () async { const artifactId = 42; - const uploadUrl = 'https://example.com/artifact.zip'; + const uploadUrl = 'https://example.com'; when(() => httpClient.send(any())).thenAnswer((_) async { return http.StreamedResponse( Stream.value( @@ -563,7 +563,7 @@ void main() { platform: platform, hash: hash, size: size, - uploadUrl: uploadUrl, + url: uploadUrl, ), ), ), diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.dart index b29e309d..de068c70 100644 --- a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.dart +++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.dart @@ -16,7 +16,7 @@ class CreatePatchArtifactResponse { required this.platform, required this.hash, required this.size, - required this.uploadUrl, + required this.url, }); /// Converts a Map to a [CreatePatchArtifactResponse] @@ -45,5 +45,5 @@ class CreatePatchArtifactResponse { final int size; /// The upload URL for the artifact. - final String uploadUrl; + final String url; } diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart index 434e1652..adb38531 100644 --- a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart +++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart @@ -21,11 +21,11 @@ CreatePatchArtifactResponse _$CreatePatchArtifactResponseFromJson( platform: $checkedConvert('platform', (v) => v as String), hash: $checkedConvert('hash', (v) => v as String), size: $checkedConvert('size', (v) => v as int), - uploadUrl: $checkedConvert('upload_url', (v) => v as String), + url: $checkedConvert('url', (v) => v as String), ); return val; }, - fieldKeyMap: const {'patchId': 'patch_id', 'uploadUrl': 'upload_url'}, + fieldKeyMap: const {'patchId': 'patch_id'}, ); Map _$CreatePatchArtifactResponseToJson( @@ -37,5 +37,5 @@ Map _$CreatePatchArtifactResponseToJson( 'platform': instance.platform, 'hash': instance.hash, 'size': instance.size, - 'upload_url': instance.uploadUrl, + 'url': instance.url, }; diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.dart index d9dc1c89..441dd92b 100644 --- a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.dart +++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.dart @@ -16,7 +16,7 @@ class CreateReleaseArtifactResponse { required this.platform, required this.hash, required this.size, - required this.uploadUrl, + required this.url, }); /// Converts a Map to a [CreateReleaseArtifactResponse] @@ -45,5 +45,5 @@ class CreateReleaseArtifactResponse { final int size; /// The upload URL for the artifact. - final String uploadUrl; + final String url; } diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart index 4dd994f8..73abc1d9 100644 --- a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart +++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart @@ -21,11 +21,11 @@ CreateReleaseArtifactResponse _$CreateReleaseArtifactResponseFromJson( platform: $checkedConvert('platform', (v) => v as String), hash: $checkedConvert('hash', (v) => v as String), size: $checkedConvert('size', (v) => v as int), - uploadUrl: $checkedConvert('upload_url', (v) => v as String), + url: $checkedConvert('url', (v) => v as String), ); return val; }, - fieldKeyMap: const {'releaseId': 'release_id', 'uploadUrl': 'upload_url'}, + fieldKeyMap: const {'releaseId': 'release_id'}, ); Map _$CreateReleaseArtifactResponseToJson( @@ -37,5 +37,5 @@ Map _$CreateReleaseArtifactResponseToJson( 'platform': instance.platform, 'hash': instance.hash, 'size': instance.size, - 'upload_url': instance.uploadUrl, + 'url': instance.url, }; diff --git a/packages/shorebird_code_push_protocol/test/src/messages/create_patch_artifact/create_patch_artifact_response_test.dart b/packages/shorebird_code_push_protocol/test/src/messages/create_patch_artifact/create_patch_artifact_response_test.dart index c38b206a..754c544c 100644 --- a/packages/shorebird_code_push_protocol/test/src/messages/create_patch_artifact/create_patch_artifact_response_test.dart +++ b/packages/shorebird_code_push_protocol/test/src/messages/create_patch_artifact/create_patch_artifact_response_test.dart @@ -11,7 +11,7 @@ void main() { platform: 'android', hash: '1234', size: 9876, - uploadUrl: 'https://example.com', + url: 'https://example.com', ); expect( CreatePatchArtifactResponse.fromJson(request.toJson()).toJson(), diff --git a/packages/shorebird_code_push_protocol/test/src/messages/create_release_artifact/create_release_artifact_response_test.dart b/packages/shorebird_code_push_protocol/test/src/messages/create_release_artifact/create_release_artifact_response_test.dart index df6c074a..59774e07 100644 --- a/packages/shorebird_code_push_protocol/test/src/messages/create_release_artifact/create_release_artifact_response_test.dart +++ b/packages/shorebird_code_push_protocol/test/src/messages/create_release_artifact/create_release_artifact_response_test.dart @@ -11,7 +11,7 @@ void main() { platform: 'android', hash: '1234', size: 9876, - uploadUrl: 'https://example.com', + url: 'https://example.com', ); expect( CreateReleaseArtifactResponse.fromJson(response.toJson()).toJson(),