Environments and schedules (#1418)

dataform-co · Oct 27, 2023 · bb66ada · bb66ada
1 parent afe6737
commit bb66ada
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 500 deletions.
diff --git a/api/commands/init.ts b/api/commands/init.ts
@@ -20,8 +20,6 @@ export interface IInitResult {
 
 export interface IInitOptions {
   skipInstall?: boolean;
-  includeSchedules?: boolean;
-  includeEnvironments?: boolean;
 }
 
 export async function init(
@@ -32,8 +30,6 @@ export async function init(
   const dataformJsonPath = path.join(projectDir, "dataform.json");
   const packageJsonPath = path.join(projectDir, "package.json");
   const gitignorePath = path.join(projectDir, ".gitignore");
-  const schedulesJsonPath = path.join(projectDir, "schedules.json");
-  const environmentsJsonPath = path.join(projectDir, "environments.json");
 
   if (fs.existsSync(dataformJsonPath) || fs.existsSync(packageJsonPath)) {
     throw new Error(
@@ -74,18 +70,6 @@ export async function init(
   fs.writeFileSync(gitignorePath, gitIgnoreContents);
   filesWritten.push(gitignorePath);
 
-  if (options.includeSchedules) {
-    fs.writeFileSync(
-      schedulesJsonPath,
-      prettyJsonStringify(dataform.schedules.SchedulesJSON.create({}))
-    );
-    filesWritten.push(schedulesJsonPath);
-  }
-
-  if (options.includeEnvironments) {
-    fs.writeFileSync(environmentsJsonPath, prettyJsonStringify(dataform.Environments.create({})));
-  }
-
   // Make the default models, includes folders.
   const definitionsDir = path.join(projectDir, "definitions");
   fs.mkdirSync(definitionsDir);

diff --git a/api/commands/validate.ts b/api/commands/validate.ts
diff --git a/api/index.ts b/api/index.ts
@@ -8,7 +8,6 @@ import * as query from "df/api/commands/query";
 import { run, Runner } from "df/api/commands/run";
 import * as table from "df/api/commands/table";
 import { test } from "df/api/commands/test";
-import { validateSchedules, validateSchedulesFileIfExists } from "df/api/commands/validate";
 
 export {
   init,
@@ -20,8 +19,6 @@ export {
   run,
   query,
   table,
-  validateSchedules,
-  validateSchedulesFileIfExists,
   Runner,
   Builder,
   prune

diff --git a/cli/index.ts b/cli/index.ts
@@ -122,15 +122,17 @@ const includeDependentsOption: INamedOption<yargs.Options> = {
   },
   // It would be nice to use yargs' "implies" to implement this, but it doesn't work for some reason.
   check: (argv: yargs.Arguments) => {
-    if (argv[includeDependentsOption.name] && !(argv[actionsOption.name] || argv[tagsOption.name])) {
+    if (
+      argv[includeDependentsOption.name] &&
+      !(argv[actionsOption.name] || argv[tagsOption.name])
+    ) {
       throw new Error(
         `The --${includeDependentsOption.name} flag should only be supplied along with --${actionsOption.name} or --${tagsOption.name}.`
       );
     }
   }
 };
 
-
 const schemaSuffixOverrideOption: INamedOption<yargs.Options> = {
   name: "schema-suffix",
   option: {
@@ -208,8 +210,6 @@ const timeoutOption: INamedOption<yargs.Options> = {
 const defaultDatabaseOptionName = "default-database";
 const defaultLocationOptionName = "default-location";
 const skipInstallOptionName = "skip-install";
-const includeSchedulesOptionName = "include-schedules";
-const includeEnvironmentsOptionName = "include-environments";
 
 const testConnectionOptionName = "test-connection";
 
@@ -293,20 +293,6 @@ export function runCli() {
               describe: "Whether to skip installing NPM packages.",
               default: false
             }
-          },
-          {
-            name: includeSchedulesOptionName,
-            option: {
-              describe: "Whether to initialize a schedules.json file.",
-              default: false
-            }
-          },
-          {
-            name: includeEnvironmentsOptionName,
-            option: {
-              describe: "Whether to initialize a environments.json file.",
-              default: false
-            }
           }
         ],
         processFn: async argv => {
@@ -320,9 +306,7 @@ export function runCli() {
               useRunCache: false
             },
             {
-              skipInstall: argv[skipInstallOptionName],
-              includeSchedules: argv[includeSchedulesOptionName],
-              includeEnvironments: argv[includeEnvironmentsOptionName]
+              skipInstall: argv[skipInstallOptionName]
             }
           );
           printInitResult(initResult);
@@ -683,7 +667,8 @@ export function runCli() {
                     actionResult.status !== dataform.ActionResult.ExecutionStatus.RUNNING
                 )
                 .filter(
-                  executedAction => !alreadyPrintedActions.has(targetAsReadableString(executedAction.target))
+                  executedAction =>
+                    !alreadyPrintedActions.has(targetAsReadableString(executedAction.target))
                 )
                 .forEach(executedAction => {
                   printExecutedAction(

diff --git a/core/targets.ts b/core/targets.ts
@@ -15,15 +15,13 @@ export function targetsAreEqual(a: dataform.ITarget, b: dataform.ITarget) {
 
 /**
  * Provides a readable string representation of the target which is used for e.g. specifying
- * actions on the CLI or as part of schedule configs.
+ * actions on the CLI.
  * This is effectively equivelant to an action "name".
- * 
+ *
  * This is an ambiguous transformation, multiple targets may map to the same string
  * and it should not be used for indexing. Use {@code targetStringifier} instead.
  */
-export function targetAsReadableString(
-  target: dataform.ITarget
-): string {
+export function targetAsReadableString(target: dataform.ITarget): string {
   const nameParts = [target.name, target.schema];
   if (!!target.database) {
     nameParts.push(target.database);

diff --git a/protos/BUILD b/protos/BUILD
@@ -12,18 +12,12 @@ proto_library(
     name = "dataform_proto",
     srcs = [
         "core.proto",
-        "environments.proto",
         "evaluation.proto",
         "execution.proto",
         "profiles.proto",
     ],
 )
 
-proto_library(
-    name = "schedules_proto",
-    srcs = ["schedules.proto"],
-)
-
 proto_library(
     name = "server_proto",
     srcs = ["server.proto"],
@@ -37,30 +31,18 @@ java_proto_library(
     deps = [":dataform_proto"],
 )
 
-java_proto_library(
-    name = "schedules_java_proto",
-    deps = [":schedules_proto"],
-)
-
 go_proto_library(
     name = "dataform_go_proto",
     importpath = "github.com/dataform-co/dataform/protos/dataform",
     proto = ":dataform_proto",
 )
 
-go_proto_library(
-    name = "schedules_go_proto",
-    importpath = "github.com/dataform-co/dataform/protos/dataform/schedules",
-    proto = ":schedules_proto",
-)
-
 load("//tools:ts_proto_library.bzl", "ts_proto_library")
 
 ts_proto_library(
     name = "ts",
     deps = [
         ":dataform_proto",
-        ":schedules_proto",
         ":server_proto",
     ],
 )
@@ -72,8 +54,6 @@ build_test(
     deps = [
         ":dataform_go_proto",
         ":dataform_java_proto",
-        ":schedules_go_proto",
-        ":schedules_java_proto",
     ],
 )
 

diff --git a/protos/environments.proto b/protos/environments.proto
diff --git a/protos/execution.proto b/protos/execution.proto
@@ -7,7 +7,6 @@ import "protos/core.proto";
 option go_package = "github.com/dataform-co/dataform/protos/dataform";
 
 
-// This is a superset of Schedule.Options.
 message RunConfig {
   repeated string actions = 1;
   repeated string tags = 5;