Download typegen binaries during postinstall

Author: frankfarzan

.github/workflows/release-create-kpt-functions.yaml

@@ -24,7 +24,15 @@ jobs:
     - name: Build, Test, Lint
       run: |
         cd go
-        make publish-typegen
+        make package-typegen
+    - name: Set up gcloud
+      uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      with:
+          version: '275.0.0'
+          service_account_email: ${{ secrets.GCP_SA_EMAIL }}
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+    - name: Upload binaries
+      run: ./scripts/publish-bins.sh
     - name: Use Node.js 12.x
       uses: actions/setup-node@v1
       with:

go/Makefile

@@ -2,7 +2,6 @@
 
 GOPATH := $(shell go env GOPATH)
 OUT_DIR := .out
-CLI_BIN := ../ts/create-kpt-functions/bin/
 
 all: fix fmt test test-e2e lint
 
@@ -29,12 +28,11 @@ publish-functions: all
 	./scripts/publish-functions.sh
 
 build-typegen: fix fmt test lint
-	env GOOS=linux GOARCH=amd64 go build -o $(OUT_DIR)/typegen_linux_amd64 ./cmd/typegen
-	env GOOS=darwin GOARCH=amd64 go build -o $(OUT_DIR)/typegen_darwin_amd64 ./cmd/typegen
-	env GOOS=windows GOARCH=amd64 go build -o $(OUT_DIR)/typegen_windows_amd64 ./cmd/typegen
-
-publish-typegen: build-typegen
-	rm -rf $(CLI_BIN)
-	mkdir -p $(CLI_BIN)
-	cp $(OUT_DIR)/typegen* $(CLI_BIN)
-
+	env GOOS=linux GOARCH=amd64 go build -o $(OUT_DIR)/linux/typegen ./cmd/typegen
+	env GOOS=darwin GOARCH=amd64 go build -o $(OUT_DIR)/darwin/typegen ./cmd/typegen
+	env GOOS=windows GOARCH=amd64 go build -o $(OUT_DIR)/windows/typegen ./cmd/typegen
+
+package-typegen: build-typegen
+	tar -C $(OUT_DIR)/linux -czvf $(OUT_DIR)/typegen_linux_amd64.tar.gz typegen
+	tar -C $(OUT_DIR)/darwin -czvf $(OUT_DIR)/typegen_darwin_amd64.tar.gz typegen
+	tar -C $(OUT_DIR)/windows -czvf $(OUT_DIR)/typegen_windows_amd64.tar.gz typegen

scripts/publish-bins.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -xeuo pipefail
+
+VERSION=${1#*-v};
+
+cd go/.out
+gsutil cp *.tar.gz gs://kpt-functions/v${VERSION}

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

@@ -1,6 +1,6 @@
 {
   "name": "@googlecontainertools/create-kpt-functions",
-  "version": "0.13.1",
+  "version": "0.14.3",
   "description": "KPT functions CLI",
   "author": "KPT Authors",
   "license": "Apache-2.0",
@@ -13,16 +13,16 @@
     "kpt": "dist/cli.js"
   },
   "files": [
-    "bin/",
     "dist/",
     "!**/*_test.*",
     "templates/"
   ],
   "scripts": {
     "prepare": "npm run build",
+    "postinstall": "go-npm install",
+    "preuninstall": "go-npm uninstall",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepublishOnly": "ls bin/typegen_darwin_amd64 bin/typegen_linux_amd64 bin/typegen_windows_amd64",
     "clean": "rm -Rf node_modules/ dist/",
     "lint": "tslint -p package.json; prettier \"src/**\" \"*.json\" --check",
     "lint-license": "license-checker --onlyAllow 'Apache-2.0;MIT;BSD;BSD-2-Clause;BSD-3-Clause;ISC;CC-BY-3.0;CC0-1.0;Unlicense'",
@@ -38,6 +38,7 @@
     "cli-interact": "^0.1.9",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
+    "go-npm": "^0.1.9",
     "is-valid-npm-name": "0.0.4",
     "mustache": "^3.0.1",
     "request": "^2.88.0",
@@ -63,6 +64,11 @@
     "tslint-consistent-codestyle": "^1.16.0",
     "typescript": "^3.5.3"
   },
+  "goBinary": {
+    "name": "typegen",
+    "path": "./bin",
+    "url": "https://storage.googleapis.com/kpt-functions/v{{version}}/typegen_{{platform}}_{{arch}}.tar.gz"
+  },
   "prettier": {
     "arrowParens": "always",
     "printWidth": 100,

ts/create-kpt-functions/package.json

@@ -25,7 +25,11 @@ export function dockerBuild(packageDir: string, dockerTag: string) {
       stdio: 'inherit',
     });
     if (build.status !== 0) {
-      process.exit(1);
+      let msg = 'Failed to build docker image';
+      if (build.error) {
+        msg = `${msg}: ${build.error}`;
+      }
+      throw new Error(msg);
     }
   });
 }

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

@@ -23,7 +23,11 @@ export function dockerPush(packageDir: string, dockerTag: string) {
   processDockerfile(packageDir, dockerTag, (dockerFile, functionName, image) => {
     const push = spawnSync('docker', ['push', image], { stdio: 'inherit' });
     if (push.status !== 0) {
-      process.exit(1);
+      let msg = 'Failed to build docker image';
+      if (push.error) {
+        msg = `${msg}: ${push.error}`;
+      }
+      throw new Error(msg);
     }
   });
 }

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

@@ -16,17 +16,17 @@
 
 import { KubeConfig } from '@kubernetes/client-node';
 import { Context } from '@kubernetes/client-node/dist/config_types';
-import { execSync } from 'child_process';
 import { question } from 'cli-interact';
 import { mkdtempSync, unlinkSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
-import { resolve } from 'path';
+import { resolve, delimiter } from 'path';
 import * as request from 'request-promise';
-import { CLI_PACKAGE } from '../paths';
 import * as format from '../utils/format';
 import { log } from '../utils/log';
 import * as validator from '../utils/validator';
 import { failure } from '../utils/format';
+import { spawnSync } from 'child_process';
+import { CLI_PACKAGE } from '../paths';
 
 export async function typeCreate(packageDir: string) {
   const desc = 'Generating types from OpenAPI spec.';
@@ -60,16 +60,26 @@ export async function typeCreate(packageDir: string) {
   const tmp = mkdtempSync(resolve(tmpdir(), 'kpt-init'));
   const swaggerFile = resolve(tmp, 'swagger.json');
   const typegenOutDir = resolve(packageDir, 'src', 'gen');
-  try {
-    writeFileSync(swaggerFile, out);
-    // Generate types.
-    execSync(`${CLI_PACKAGE.typegen} ${swaggerFile} ${typegenOutDir}`);
-    log(`Generated ${typegenOutDir}`);
-  } finally {
-    // Delete swagger.json.
-    unlinkSync(swaggerFile);
+
+  writeFileSync(swaggerFile, out);
+  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 build docker image';
+    if (typegen.error) {
+      msg = `${msg}: ${typegen.error}`;
+    }
+    throw new Error(msg);
   }
 
+  log(`Generated ${typegenOutDir}`);
+
   log(format.finishMarker(desc));
 }
 

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

@@ -15,42 +15,13 @@
  */
 
 import { resolve } from 'path';
-import * as os from 'os';
 
 // Absolute paths in this package.
 export const CLI_PACKAGE = {
-  typegen: resolve(__dirname, '..', 'bin', typegenBin()),
+  binDir: resolve(__dirname, '..', 'node_modules', '.bin'),
   templates: resolve(__dirname, '..', 'templates'),
 };
 
-function typegenBin(): string {
-  let arch;
-  switch (os.arch()) {
-    case 'x64':
-      arch = 'amd64';
-      break;
-    default:
-      throw new Error(`${os.arch()} architecture is currently not supported`);
-  }
-
-  let platform;
-  switch (os.platform()) {
-    case 'linux':
-      platform = 'linux';
-      break;
-    case 'darwin':
-      platform = 'darwin';
-      break;
-    case 'win32':
-      platform = 'windows';
-      break;
-    default:
-      throw new Error(`${os.platform()} platform is currently not supported`);
-  }
-
-  return `typegen_${platform}_${arch}`;
-}
-
 // Paths relative to user package.
 export const USER_PACKAGE = {
   src: 'src',

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

@@ -18,7 +18,7 @@
     "@googlecontainertools/kpt-functions": "^0.10.0"
   },
   "devDependencies": {
-    "@googlecontainertools/create-kpt-functions": "^0.13.1",
+    "@googlecontainertools/create-kpt-functions": "^0.14.3",
     "@types/jasmine": "^3.3.12",
     "@types/node": "^12.7.2",
     "jasmine": "^3.4.0",