Delete workflow_create.ts (#75)

Author: frankfarzan

ts/create-kpt-functions/package-lock.json

@@ -23,10 +23,8 @@ import { functionCreate } from './cmd/function_create';
 import { dockerCreate } from './cmd/docker_create';
 import { dockerBuild } from './cmd/docker_build';
 import { dockerPush } from './cmd/docker_push';
-import { workflowCreate } from './cmd/workflow_create';
 
 async function main() {
-  // TODO: Add usage examples.
   const parser = new ArgumentParser({
     version: '0.0.1',
     addHelp: true,
@@ -88,48 +86,33 @@ async function main() {
     help: typeCreateHelp,
   });
 
-  const workflowCreateHelp =
-    'Generate workflow configs for all functions. Overwrite configs if they exist.';
-  const wc = subparsers.addParser('workflow-create', {
-    addHelp: true,
-    description: workflowCreateHelp,
-    help: workflowCreateHelp,
-  });
-  wc.addArgument('--tag', {
-    defaultValue: 'dev',
-    help: 'Docker tag used for all function images.',
-  });
-
   // There doesn't seem to be any other way to mark subcommands
   // as optional, so manually add package-create to argv.
   if (process.argv.length === 2) {
     process.argv.push('package-create');
   }
 
   const args = parser.parseArgs();
+  const packageDir = resolve('.');
 
-  // TODO(b/141943296): Ensure subcommands handle choosing the package directory
   switch (args.subcommand) {
     case 'package-create':
       await packageCreate();
       break;
     case 'type-create':
-      await typeCreate(resolve('.'));
+      await typeCreate(packageDir);
       break;
     case 'function-create':
-      functionCreate(resolve('.'));
+      functionCreate(packageDir);
       break;
     case 'docker-create':
-      dockerCreate(resolve('.'));
+      dockerCreate(packageDir);
       break;
     case 'docker-build':
-      dockerBuild(resolve('.'), args.get('tag'));
+      dockerBuild(packageDir, args.get('tag'));
       break;
     case 'docker-push':
-      dockerPush(resolve('.'), args.get('tag'));
-      break;
-    case 'workflow-create':
-      workflowCreate(resolve('.'), args.get('tag'));
+      dockerPush(packageDir, args.get('tag'));
       break;
     default:
       parser.exit(1, 'invalid args');

ts/create-kpt-functions/src/cli.ts

@@ -32,11 +32,9 @@ export function functionCreate(appDir: string) {
     validator.isValidFuncName,
     defaultFuncName,
   );
-
   log(`Using function name "${funcName}".\n`);
 
   const tsFuncName = validator.toTSName(funcName);
-
   const srcDir = path.join(appDir, USER_PACKAGE.src);
 
   new Templates([

ts/create-kpt-functions/src/cmd/function_create.ts

@@ -26,17 +26,13 @@ import * as validator from '../utils/validator';
 
 export async function packageCreate() {
   const pkgDir = initPackage();
-
-  // TODO(b/142241787): Don't just crash if type generation fails. Handle this gracefully.
-  // TODO(b/142242496): Add option to skip type generation.
   await typeCreate(pkgDir);
-
   functionCreate(pkgDir);
   dockerCreate(pkgDir);
 
   log(
     format.success('\nSuccess!') +
-      ' Run `npm install` next to install dependencies and build the package.\n',
+      ' Run `npm install` to install dependencies and build the package.\n',
   );
 }
 
@@ -56,7 +52,6 @@ function initPackage() {
       defaultPackageDir,
     ),
   );
-
   log(`Using package path ${packageDir}.\n`);
 
   // Prompt for package name.
@@ -66,7 +61,6 @@ function initPackage() {
     validator.isValidPackageName,
     defaultPackageName,
   );
-
   log(`Using package name ${packageName}.\n`);
 
   // Prompt for docker registry url.
@@ -79,7 +73,6 @@ function initPackage() {
     validator.isValidDockerRepo,
     defaultDockerRepoBase,
   );
-
   log(`Using docker repository prefix ${defaultDockerRepoBase}.\n`);
 
   new Templates([

ts/create-kpt-functions/src/cmd/package_create.ts

@@ -35,13 +35,11 @@ export async function typeCreate(packageDir: string) {
   // Get the kubeconfig context the user wants to use.
   const kc = new KubeConfig();
   kc.loadFromDefault();
-
   const contexts = kc.contexts;
   if (contexts.length == 0) {
     log(failure('No contexts found in kubeconfig file. Please set a context entry in kubeconfig.'));
     process.exit(1);
   }
-
   const currentContext = kc.currentContext;
   const contextIdx = chooseContext(contexts, currentContext);
   const useContext = contexts[contextIdx];
@@ -50,26 +48,26 @@ export async function typeCreate(packageDir: string) {
     throw new Error('Cluster for specified context not found.');
   }
 
+  // Download the swagger file from the cluster.
   const opts: request.Options = {
     url: `${cluster.server}/openapi/v2`,
   };
   kc.setCurrentContext(useContext.name);
   kc.applyToRequest(opts);
-
   const out = await request.get(opts);
   const tmp = mkdtempSync(resolve(tmpdir(), 'kpt-init'));
   const swaggerFile = resolve(tmp, 'swagger.json');
-  const typegenOutDir = resolve(packageDir, 'src', 'gen');
-
   writeFileSync(swaggerFile, out);
+
+  // Run typegen binary.
+  const typegenOutDir = resolve(packageDir, 'src', 'gen');
   const typegen = spawnSync('typegen', [swaggerFile, typegenOutDir], {
     env: {
       PATH: `${CLI_PACKAGE.binDir}${delimiter}${process.env.PATH}`,
     },
     stdio: 'inherit',
   });
   unlinkSync(swaggerFile);
-
   if (typegen.status !== 0) {
     let msg = 'Failed to run typegen';
     if (typegen.error) {