From da6528cda6ad884488868fd30cd10b7ded34b114 Mon Sep 17 00:00:00 2001 From: godofredoc <54371434+godofredoc@users.noreply.github.com> Date: Thu, 4 Feb 2021 18:44:47 -0800 Subject: [PATCH] Point to a new artifacts location. (#70673) This is in preparation to move the flutter artifacts to a more secure location. Bug: go/fxb/64576 --- bin/internal/gradle_wrapper.version | 2 +- bin/internal/material_fonts.version | 2 +- bin/internal/update_dart_sdk.ps1 | 2 +- bin/internal/update_dart_sdk.sh | 2 +- dev/bots/test/fake_process_manager_test.dart | 16 ++++++++-------- dev/bots/unpublish_package.dart | 4 ++-- dev/tools/java_and_objc_doc.dart | 4 ++-- dev/tools/repackage_gradle_wrapper.sh | 4 ++-- packages/flutter_tools/lib/src/cache.dart | 8 ++++---- .../lib/src/commands/build_ios_framework.dart | 2 +- .../lib/src/commands/update_packages.dart | 2 +- .../hermetic/build_ios_framework_test.dart | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bin/internal/gradle_wrapper.version b/bin/internal/gradle_wrapper.version index d4d6618ea5..9aafad46c9 100644 --- a/bin/internal/gradle_wrapper.version +++ b/bin/internal/gradle_wrapper.version @@ -1 +1 @@ -flutter_infra/gradle-wrapper/fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa/gradle-wrapper.tgz +flutter_infra_release/gradle-wrapper/fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa/gradle-wrapper.tgz diff --git a/bin/internal/material_fonts.version b/bin/internal/material_fonts.version index f73afca446..7044a50929 100644 --- a/bin/internal/material_fonts.version +++ b/bin/internal/material_fonts.version @@ -1 +1 @@ -flutter_infra/flutter/fonts/1363603dd17dd609018e53cdbd5fef6791814337/fonts.zip +flutter_infra_release/flutter/fonts/1363603dd17dd609018e53cdbd5fef6791814337/fonts.zip diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index 033fecc6f8..f4e2e77a55 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -43,7 +43,7 @@ if (-not $dartSdkBaseUrl) { $dartSdkBaseUrl = "https://storage.googleapis.com" } $dartZipName = "dart-sdk-windows-x64.zip" -$dartSdkUrl = "$dartSdkBaseUrl/flutter_infra/flutter/$engineVersion/$dartZipName" +$dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" if (Test-Path $dartSdkPath) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index a46741cf0e..fba7a23459 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -85,7 +85,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t fi DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}" - DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" # if the sdk path exists, copy it to a temporary location if [ -d "$DART_SDK_PATH" ]; then diff --git a/dev/bots/test/fake_process_manager_test.dart b/dev/bots/test/fake_process_manager_test.dart index 6782c02d34..6e1d5998f8 100644 --- a/dev/bots/test/fake_process_manager_test.dart +++ b/dev/bots/test/fake_process_manager_test.dart @@ -26,10 +26,10 @@ void main() { test('start works', () async { final Map> calls = >{ - 'gsutil acl get gs://flutter_infra/releases/releases.json': [ + 'gsutil acl get gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output1', ''), ], - 'gsutil cat gs://flutter_infra/releases/releases.json': [ + 'gsutil cat gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output2', ''), ], }; @@ -48,10 +48,10 @@ void main() { test('run works', () async { final Map> calls = >{ - 'gsutil acl get gs://flutter_infra/releases/releases.json': [ + 'gsutil acl get gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output1', ''), ], - 'gsutil cat gs://flutter_infra/releases/releases.json': [ + 'gsutil cat gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output2', ''), ], }; @@ -65,10 +65,10 @@ void main() { test('runSync works', () async { final Map> calls = >{ - 'gsutil acl get gs://flutter_infra/releases/releases.json': [ + 'gsutil acl get gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output1', ''), ], - 'gsutil cat gs://flutter_infra/releases/releases.json': [ + 'gsutil cat gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output2', ''), ], }; @@ -82,10 +82,10 @@ void main() { test('captures stdin', () async { final Map> calls = >{ - 'gsutil acl get gs://flutter_infra/releases/releases.json': [ + 'gsutil acl get gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output1', ''), ], - 'gsutil cat gs://flutter_infra/releases/releases.json': [ + 'gsutil cat gs://flutter_infra_release/releases/releases.json': [ ProcessResult(0, 0, 'output2', ''), ], }; diff --git a/dev/bots/unpublish_package.dart b/dev/bots/unpublish_package.dart index a007041b11..43ccc6ee9d 100644 --- a/dev/bots/unpublish_package.dart +++ b/dev/bots/unpublish_package.dart @@ -21,10 +21,10 @@ import 'package:path/path.dart' as path; import 'package:platform/platform.dart' show Platform, LocalPlatform; import 'package:process/process.dart'; -const String gsBase = 'gs://flutter_infra'; +const String gsBase = 'gs://flutter_infra_release'; const String releaseFolder = '/releases'; const String gsReleaseFolder = '$gsBase$releaseFolder'; -const String baseUrl = 'https://storage.googleapis.com/flutter_infra'; +const String baseUrl = 'https://storage.googleapis.com/flutter_infra_release'; /// Exception class for when a process fails to run, so we can catch /// it and provide something more readable than a stack trace. diff --git a/dev/tools/java_and_objc_doc.dart b/dev/tools/java_and_objc_doc.dart index 1ced8e2090..a2043dd417 100644 --- a/dev/tools/java_and_objc_doc.dart +++ b/dev/tools/java_and_objc_doc.dart @@ -15,10 +15,10 @@ const String kDocRoot = 'dev/docs/doc'; Future main(List args) async { final String engineVersion = File('bin/internal/engine.version').readAsStringSync().trim(); - final String javadocUrl = 'https://storage.googleapis.com/flutter_infra/flutter/$engineVersion/android-javadoc.zip'; + final String javadocUrl = 'https://storage.googleapis.com/flutter_infra_release/flutter/$engineVersion/android-javadoc.zip'; generateDocs(javadocUrl, 'javadoc', 'io/flutter/view/FlutterView.html'); - final String objcdocUrl = 'https://storage.googleapis.com/flutter_infra/flutter/$engineVersion/ios-objcdoc.zip'; + final String objcdocUrl = 'https://storage.googleapis.com/flutter_infra_release/flutter/$engineVersion/ios-objcdoc.zip'; generateDocs(objcdocUrl, 'objcdoc', 'Classes/FlutterViewController.html'); } diff --git a/dev/tools/repackage_gradle_wrapper.sh b/dev/tools/repackage_gradle_wrapper.sh index b00718eab1..c0c1fad39d 100755 --- a/dev/tools/repackage_gradle_wrapper.sh +++ b/dev/tools/repackage_gradle_wrapper.sh @@ -68,9 +68,9 @@ popd > /dev/null echo echo "Uploading repackaged gradle wrapper..." echo "Content hash: $STAMP" -gsutil.py cp -n "$WRAPPER_TEMP_DIR/gradle-wrapper.tgz" "gs://flutter_infra/gradle-wrapper/$STAMP/gradle-wrapper.tgz" +gsutil.py cp -n "$WRAPPER_TEMP_DIR/gradle-wrapper.tgz" "gs://flutter_infra_release/gradle-wrapper/$STAMP/gradle-wrapper.tgz" -echo "flutter_infra/gradle-wrapper/$STAMP/gradle-wrapper.tgz" > "$WRAPPER_VERSION_PATH" +echo "flutter_infra_release/gradle-wrapper/$STAMP/gradle-wrapper.tgz" > "$WRAPPER_VERSION_PATH" rm -rf "$WRAPPER_TEMP_DIR" echo diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 3fa36f7b46..09179f523c 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -834,7 +834,7 @@ class FlutterWebSdk extends CachedArtifact { } else if (_platform.isWindows) { platformName += 'windows-x64'; } - final Uri url = Uri.parse('${cache.storageBaseUrl}/flutter_infra/flutter/$version/$platformName.zip'); + final Uri url = Uri.parse('${cache.storageBaseUrl}/flutter_infra_release/flutter/$version/$platformName.zip'); if (location.existsSync()) { location.deleteSync(recursive: true); } @@ -907,7 +907,7 @@ abstract class EngineCachedArtifact extends CachedArtifact { FileSystem fileSystem, OperatingSystemUtils operatingSystemUtils, ) async { - final String url = '${cache.storageBaseUrl}/flutter_infra/flutter/$version/'; + final String url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$version/'; final Directory pkgDir = cache.getCacheDir('pkg'); for (final String pkgName in getPackageDirs()) { @@ -942,7 +942,7 @@ abstract class EngineCachedArtifact extends CachedArtifact { Future checkForArtifacts(String engineVersion) async { engineVersion ??= version; - final String url = '${cache.storageBaseUrl}/flutter_infra/flutter/$engineVersion/'; + final String url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/'; bool exists = false; for (final String pkgName in getPackageDirs()) { @@ -1574,7 +1574,7 @@ class IosUsbArtifacts extends CachedArtifact { } @visibleForTesting - Uri get archiveUri => Uri.parse('${cache.storageBaseUrl}/flutter_infra/ios-usb-dependencies${cache.useUnsignedMacBinaries ? '/unsigned' : ''}/$name/$version/$name.zip'); + Uri get archiveUri => Uri.parse('${cache.storageBaseUrl}/flutter_infra_release/ios-usb-dependencies${cache.useUnsignedMacBinaries ? '/unsigned' : ''}/$name/$version/$name.zip'); } // Many characters are problematic in filenames, especially on Windows. diff --git a/packages/flutter_tools/lib/src/commands/build_ios_framework.dart b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart index f650b0955d..46211b5263 100644 --- a/packages/flutter_tools/lib/src/commands/build_ios_framework.dart +++ b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart @@ -287,7 +287,7 @@ $licenseSource LICENSE } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => '${_cache.storageBaseUrl}/flutter_infra/flutter/${_cache.engineRevision}/$artifactsMode/artifacts.zip' } + s.source = { :http => '${_cache.storageBaseUrl}/flutter_infra_release/flutter/${_cache.engineRevision}/$artifactsMode/artifacts.zip' } s.documentation_url = 'https://flutter.dev/docs' s.platform = :ios, '8.0' s.vendored_frameworks = 'Flutter.xcframework' diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 71d77e9c1d..3fad59bdb8 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -155,7 +155,7 @@ class UpdatePackagesCommand extends FlutterCommand { 'Downloading lcov data for package:flutter...', ); final String urlBase = globals.platform.environment['FLUTTER_STORAGE_BASE_URL'] ?? 'https://storage.googleapis.com'; - final Uri coverageUri = Uri.parse('$urlBase/flutter_infra/flutter/coverage/lcov.info'); + final Uri coverageUri = Uri.parse('$urlBase/flutter_infra_release/flutter/coverage/lcov.info'); final List data = await _net.fetchUrl(coverageUri); final String coverageDir = globals.fs.path.join( Cache.flutterRoot, diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_ios_framework_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_ios_framework_test.dart index 91d0f633f5..f991cd3d7e 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/build_ios_framework_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/build_ios_framework_test.dart @@ -210,7 +210,7 @@ void main() { final File expectedPodspec = outputDirectory.childFile('Flutter.podspec'); final String podspecContents = expectedPodspec.readAsStringSync(); - expect(podspecContents, contains("'$storageBaseUrl/flutter_infra/flutter/$engineRevision/ios/artifacts.zip'")); + expect(podspecContents, contains("'$storageBaseUrl/flutter_infra_release/flutter/$engineRevision/ios/artifacts.zip'")); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(), @@ -228,7 +228,7 @@ void main() { final File expectedPodspec = outputDirectory.childFile('Flutter.podspec'); final String podspecContents = expectedPodspec.readAsStringSync(); - expect(podspecContents, contains("'$storageBaseUrl/flutter_infra/flutter/$engineRevision/ios-profile/artifacts.zip'")); + expect(podspecContents, contains("'$storageBaseUrl/flutter_infra_release/flutter/$engineRevision/ios-profile/artifacts.zip'")); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(), @@ -246,7 +246,7 @@ void main() { final File expectedPodspec = outputDirectory.childFile('Flutter.podspec'); final String podspecContents = expectedPodspec.readAsStringSync(); - expect(podspecContents, contains("'$storageBaseUrl/flutter_infra/flutter/$engineRevision/ios-release/artifacts.zip'")); + expect(podspecContents, contains("'$storageBaseUrl/flutter_infra_release/flutter/$engineRevision/ios-release/artifacts.zip'")); }, overrides: { FileSystem: () => memoryFileSystem, ProcessManager: () => FakeProcessManager.any(),