add download content feature over cgi-ctl

Author: reddec

assets/bindata.go

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e07b096a9b6b906b5e7e8e7c85b5aa2ec67c5de2e7788cf88a269ec1558b0392
-size 4848983
+oid sha256:4ef0fa32de0d86efc582ef952a1657da50d6371ffb66ef27ecb876bf83f5af68
+size 4851447

cmd/cgi-ctl/cmd_download.go

@@ -0,0 +1,93 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"github.com/reddec/trusted-cgi/api"
+	"github.com/reddec/trusted-cgi/api/client"
+	"github.com/reddec/trusted-cgi/cmd/internal"
+	"golang.org/x/crypto/ssh/terminal"
+	"io"
+	"log"
+	"os"
+	"strings"
+	"syscall"
+)
+
+type remoteLink struct {
+	Login    string `short:"l" long:"login" env:"LOGIN" description:"Login name" default:"admin"`
+	Password string `short:"p" long:"password" env:"PASSWORD" description:"Password" default:"admin"`
+	AskPass  bool   `short:"P" long:"ask-pass" env:"ASK_PASS" description:"Get password from stdin"`
+	URL      string `short:"u" long:"url" env:"URL" description:"Trusted-CGI endpoint" default:"http://127.0.0.1:3434/"`
+}
+
+func (rl *remoteLink) Users() *client.UserAPIClient {
+	return &client.UserAPIClient{BaseURL: rl.URL + "u/"}
+}
+
+func (rl *remoteLink) Lambdas() *client.LambdaAPIClient {
+	return &client.LambdaAPIClient{BaseURL: rl.URL + "u/"}
+}
+
+func (rl *remoteLink) Token(ctx context.Context) (*api.Token, error) {
+	if rl.AskPass {
+		_, _ = fmt.Fprintf(os.Stderr, "Enter Password: ")
+		bytePassword, err := terminal.ReadPassword(syscall.Stdin)
+		if err != nil {
+			return nil, err
+		}
+		rl.Password = strings.TrimSpace(string(bytePassword))
+	}
+	return rl.Users().Login(ctx, rl.Login, rl.Password)
+}
+
+type download struct {
+	remoteLink
+	UID    string `short:"i" long:"uid" env:"UID" description:"Lambda UID" required:"yes"`
+	Output string `short:"o" long:"output" env:"OUTPUT" description:"Output data (- means stdout, empty means as UID)" default:""`
+}
+
+func (cmd *download) Execute(args []string) error {
+	ctx, closer := internal.SignalContext()
+	defer closer()
+	log.SetOutput(os.Stderr)
+	log.Println("login...")
+	token, err := cmd.Token(ctx)
+	if err != nil {
+		return fmt.Errorf("login: %w", err)
+	}
+	log.Println("download...")
+	tarball, err := cmd.Lambdas().Download(ctx, token, cmd.UID)
+	if err != nil {
+		return fmt.Errorf("download: %w", err)
+	}
+
+	var out io.Writer
+	if cmd.Output == "" {
+		cmd.Output = cmd.UID + ".tar.gz"
+	}
+	if cmd.Output == "-" {
+		out = os.Stdout
+	} else {
+		log.Println("saving to", cmd.Output, "...")
+		f, err := os.Create(cmd.Output)
+		if err != nil {
+			return fmt.Errorf("create destination file: %w", err)
+		}
+		defer f.Close()
+		out = f
+	}
+	var w int
+	for w < len(tarball) {
+		n, err := out.Write(tarball[w:])
+		if err != nil {
+			return err
+		}
+		if n <= 0 {
+			break
+		}
+		w += n
+	}
+	log.Println("done")
+	return nil
+}

cmd/cgi-ctl/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/jessevdk/go-flags"
+	"github.com/reddec/trusted-cgi/cmd/internal"
 	"github.com/reddec/trusted-cgi/types"
 	"io/ioutil"
 	"os"
@@ -16,6 +17,7 @@ type Config struct {
 	Init struct {
 		Bare Bare `command:"bare" description:"create bare template"`
 	} `command:"init" description:"initialize function in a current directory"`
+	Download download `command:"download" description:"download lambda content to the local tarball or stdout"`
 }
 
 func main() {
@@ -70,7 +72,9 @@ func (b Bare) Execute(args []string) error {
 	}
 
 	if b.Git {
-		return exec.Command("git", "init").Run()
+		gctx, closer := internal.SignalContext()
+		defer closer()
+		return exec.CommandContext(gctx, "git", "init").Run()
 	}
 	return nil
 }

cmd/internal/utils.go

@@ -0,0 +1,20 @@
+package internal
+
+import (
+	"context"
+	"os"
+	"os/signal"
+)
+
+func SignalContext() (context.Context, func()) {
+	gctx, closer := context.WithCancel(context.Background())
+	go func() {
+		c := make(chan os.Signal, 2)
+		signal.Notify(c, os.Kill, os.Interrupt)
+		for range c {
+			closer()
+			break
+		}
+	}()
+	return gctx, closer
+}

cmd/trusted-cgi/main.go

@@ -5,12 +5,12 @@ import (
 	"github.com/jessevdk/go-flags"
 	"github.com/reddec/trusted-cgi/api/services"
 	"github.com/reddec/trusted-cgi/application"
+	"github.com/reddec/trusted-cgi/cmd/internal"
 	"github.com/reddec/trusted-cgi/server"
 	"github.com/reddec/trusted-cgi/stats/impl/memlog"
 	"log"
 	"net/http"
 	"os"
-	"os/signal"
 	"time"
 )
 
@@ -70,15 +70,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	gctx, closer := context.WithCancel(context.Background())
-	go func() {
-		c := make(chan os.Signal, 2)
-		signal.Notify(c, os.Kill, os.Interrupt)
-		for range c {
-			closer()
-			break
-		}
-	}()
+	gctx, closer := internal.SignalContext()
 	defer closer()
 	err = run(gctx, config)
 	if err != nil {

docs/_layouts/default.html

@@ -57,6 +57,7 @@ <h3>Features & docs</h3>
         </ul>
         <ul>
             <li><a href="/static">Static files</a></li>
+            <li><a href="/cgi_ctl">CGI-CTL</a></li>
         </ul>
         <h3>API</h3>
         <ul>

docs/cgi_ctl.md

@@ -0,0 +1,76 @@
+# CGI-CTL command help
+
+
+`cgi-ctl` command aims to be a tool for helping developers interact with the platform without web UI.
+
+`cgi-ctl` includes into distribution starting from version 0.3.1 and could be obtained independently
+via source code or pre-built binary ([see installation](installation.md))
+
+## init bare
+
+From `0.3.0`
+
+Initialize a basic lambda in a current directory.
+
+```
+Usage:
+  cgi-ctl [OPTIONS] init bare [bare-OPTIONS]
+
+Help Options:
+  -h, --help             Show this help message
+
+[bare command options]
+          --git          Enable Git [$GIT]
+      -d, --description= Description (default: Bare project) [$DESCRIPTION]
+      -P, --private      Mark as private [$PRIVATE]
+      -t, --time-limit=  Time limit for execution (default: 10s) [$TIME_LIMIT]
+      -p, --max-payload= Maximum payload (default: 8192) [$MAX_PAYLOAD]
+
+```
+
+## download
+
+From `0.3.1`
+
+Download the lambda content from a remote instance of `trusted-cgi`.
+
+```
+Usage:
+  cgi-ctl [OPTIONS] download [download-OPTIONS]
+
+Help Options:
+  -h, --help          Show this help message
+
+[download command options]
+      -l, --login=    Login name (default: admin) [$LOGIN]
+      -p, --password= Password (default: admin) [$PASSWORD]
+      -P, --ask-pass  Get password from stdin [$ASK_PASS]
+      -u, --url=      Trusted-CGI endpoint (default: http://127.0.0.1:3434/) [$URL]
+      -i, --uid=      Lambda UID [$UID]
+      -o, --output=   Output data (- means stdout, empty means as UID) [$OUTPUT]
+```
+
+**Example 1** (from local dev instance, lambda `e0ed902f-4a9c-4c29-870d-f343f330b6ab`):
+
+```
+cgi-ctl download -i e0ed902f-4a9c-4c29-870d-f343f330b6ab
+```
+
+will create `e0ed902f-4a9c-4c29-870d-f343f330b6ab.tar.gz` archive.
+
+
+**Example 2** (from the remote instance, same lambda):
+
+```
+cgi-ctl download -i e0ed902f-4a9c-4c29-870d-f343f330b6ab --url https://example.com/ -P
+```
+
+will ask password for `admin` user and then download archive
+
+**Example 3** (from the remote instance, same lambda):
+
+```
+cgi-ctl download -i e0ed902f-4a9c-4c29-870d-f343f330b6ab --url https://example.com/ -P -o - | tar  zxf -
+```
+
+will ask password for `admin` user, download archive and unpack to current directory