[scheduler] Merge package:cocoon_scheduler into backend project

scheduler/bin/generate_jspb.dart → app_dart/bin/generate_jspb.dart

@@ -5,7 +5,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cocoon_scheduler/scheduler.dart';
+import 'package:cocoon_service/cocoon_service.dart';
+import 'package:cocoon_service/protos.dart';
 import 'package:yaml/yaml.dart';
 
 Future<void> main(List<String> args) async {

scheduler/bin/validate_scheduler_config.dart → app_dart/bin/validate_scheduler_config.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:cocoon_scheduler/scheduler.dart';
+import 'package:cocoon_service/cocoon_service.dart';
 import 'package:yaml/yaml.dart';
 
 void main(List<String> args) {

app_dart/integration_test/validate_all_ci_configs_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:io' as io;
 
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:cocoon_service/cocoon_service.dart';
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';

app_dart/lib/src/model/appengine/task.dart

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:cocoon_scheduler/scheduler.dart' as pb;
 import 'package:gcloud/db.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
 
 import '../../service/luci.dart';
+import '../proto/internal/scheduler.pb.dart';
 import 'commit.dart';
 import 'key_converter.dart';
 
@@ -74,7 +74,7 @@ class Task extends Model<int> {
   /// Construct [Task] from a [Target].
   factory Task.fromTarget({
     @required Commit commit,
-    @required pb.Target target,
+    @required Target target,
   }) {
     assert(commit != null);
     assert(target != null);
@@ -285,8 +285,8 @@ class Task extends Model<int> {
   }
 }
 
-Iterable<Task> targetsToTask(Commit commit, List<pb.Target> targets) =>
-    targets.map((pb.Target target) => Task.fromTarget(commit: commit, target: target));
+Iterable<Task> targetsToTask(Commit commit, List<Target> targets) =>
+    targets.map((Target target) => Task.fromTarget(commit: commit, target: target));
 
 /// The serialized representation of a [Task].
 // TODO(tvolkert): Directly serialize [Task] once frontends migrate to new serialization format.

scheduler/lib/models/scheduler.proto → app_dart/lib/src/model/proto/internal/scheduler.proto

@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+package scheduler;
+
 // Next ID: 3
 message SchedulerConfig {
     // Targets to run from this config.

app_dart/lib/src/model/proto/protos.dart

@@ -4,3 +4,4 @@
 
 export 'internal/build_status_response.pb.dart';
 export 'internal/key.pb.dart';
+export 'internal/scheduler.pb.dart';

app_dart/lib/src/request_handlers/push_engine_status_to_github.dart

@@ -4,14 +4,14 @@
 
 import 'dart:async';
 
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:github/github.dart';
 import 'package:meta/meta.dart';
 
 import '../foundation/utils.dart';
 import '../model/appengine/commit.dart';
 import '../model/appengine/github_build_status_update.dart';
 import '../model/appengine/task.dart';
+import '../model/proto/internal/scheduler.pb.dart';
 import '../request_handling/api_request_handler.dart';
 import '../request_handling/authentication.dart';
 import '../request_handling/body.dart';

app_dart/lib/src/request_handlers/refresh_chromebot_status.dart

@@ -4,14 +4,14 @@
 
 import 'dart:async';
 
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:meta/meta.dart';
 
 import '../foundation/providers.dart';
 import '../foundation/typedefs.dart';
 import '../foundation/utils.dart';
 import '../model/appengine/commit.dart';
 import '../model/appengine/task.dart';
+import '../model/proto/internal/scheduler.pb.dart';
 import '../request_handling/api_request_handler.dart';
 import '../request_handling/authentication.dart';
 import '../request_handling/body.dart';

app_dart/lib/src/service/luci.dart

@@ -6,14 +6,14 @@ import 'dart:async';
 import 'dart:math';
 
 import 'package:appengine/appengine.dart';
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:github/github.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
 import 'package:retry/retry.dart';
 
 import '../model/appengine/task.dart';
 import '../model/luci/buildbucket.dart';
+import '../model/proto/internal/scheduler.pb.dart';
 import '../request_handling/api_request_handler.dart';
 import 'buildbucket.dart';
 import 'config.dart';

app_dart/lib/src/service/scheduler.dart

@@ -6,7 +6,6 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:appengine/appengine.dart';
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:gcloud/db.dart';
 import 'package:github/github.dart' as github;
 import 'package:googleapis/bigquery/v2.dart';
@@ -22,6 +21,7 @@ import '../model/appengine/commit.dart';
 import '../model/appengine/task.dart';
 import '../model/github/checks.dart';
 import '../model/luci/buildbucket.dart';
+import '../model/proto/internal/scheduler.pb.dart';
 import '../request_handling/exceptions.dart';
 import 'cache_service.dart';
 import 'config.dart';
@@ -30,6 +30,9 @@ import 'github_checks_service.dart';
 import 'github_service.dart';
 import 'luci.dart';
 import 'luci_build_service.dart';
+import 'scheduler/graph.dart';
+
+export 'scheduler/graph.dart';
 
 /// Scheduler service to validate all commits to supported Flutter repositories.
 ///

scheduler/lib/scheduler.dart → app_dart/lib/src/service/scheduler/graph.dart

@@ -4,9 +4,7 @@
 
 import 'package:yaml/yaml.dart';
 
-import 'models/scheduler.pb.dart';
-
-export 'models/scheduler.pb.dart';
+import '../../model/proto/internal/scheduler.pb.dart';
 
 /// Load [yamlConfig] to [SchedulerConfig] and validate the dependency graph.
 SchedulerConfig schedulerConfigFromYaml(YamlMap yamlConfig) {

app_dart/pubspec.lock

@@ -148,13 +148,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
-  cocoon_scheduler:
-    dependency: "direct main"
-    description:
-      name: cocoon_scheduler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   code_builder:
     dependency: transitive
     description:

app_dart/pubspec.yaml

@@ -12,7 +12,6 @@ environment:
 
 dependencies:
   appengine: ^0.11.0
-  cocoon_scheduler: ^1.0.0
   collection: ^1.14.11
   corsac_jwt: ^0.2.2
   crypto: ^2.0.6

app_dart/test/request_handlers/refresh_chromebot_status_test.dart

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:cocoon_service/src/model/appengine/commit.dart';
 import 'package:cocoon_service/src/model/appengine/task.dart';
+import 'package:cocoon_service/src/model/proto/protos.dart';
 import 'package:cocoon_service/src/request_handlers/refresh_chromebot_status.dart';
 import 'package:cocoon_service/src/service/datastore.dart';
 import 'package:cocoon_service/src/service/luci.dart';

scheduler/test/scheduler_test.dart → app_dart/test/service/scheduler/graph_test.dart

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:cocoon_scheduler/scheduler.dart';
+import 'package:cocoon_service/src/model/proto/internal/scheduler.pb.dart';
+import 'package:cocoon_service/src/service/scheduler/graph.dart';
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 

app_dart/test/service/scheduler_test.dart

@@ -4,11 +4,11 @@
 
 import 'dart:convert';
 
-import 'package:cocoon_scheduler/scheduler.dart';
 import 'package:cocoon_service/src/model/appengine/commit.dart';
 import 'package:cocoon_service/src/model/appengine/task.dart';
 import 'package:cocoon_service/src/model/github/checks.dart' as cocoon_github;
 import 'package:cocoon_service/src/model/luci/buildbucket.dart';
+import 'package:cocoon_service/src/model/proto/protos.dart';
 import 'package:cocoon_service/src/service/cache_service.dart';
 import 'package:cocoon_service/src/service/datastore.dart';
 import 'package:cocoon_service/src/service/github_checks_service.dart';

app_dart/test/src/service/fake_scheduler.dart

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:cocoon_scheduler/models/scheduler.pb.dart';
 import 'package:cocoon_service/src/foundation/github_checks_util.dart';
 import 'package:cocoon_service/src/model/appengine/commit.dart';
+import 'package:cocoon_service/src/model/proto/protos.dart';
 import 'package:cocoon_service/src/service/buildbucket.dart';
 import 'package:cocoon_service/src/service/cache_service.dart';
 import 'package:cocoon_service/src/service/config.dart';

cloud_build/deploy.sh

@@ -5,6 +5,7 @@
 
 # Deploy a new flutter dashboard version to google cloud.
 
+cp -r scheduler app_dart/build/
 pushd app_dart > /dev/null
 set -e
 gcloud app deploy --project "$1" --version "version-$2" -q "$3" --no-stop-previous-version