add support for keygen to write to string (#4)

* add support for keygen to write to string

and basic tests!

.devcontainer/Dockerfile

@@ -26,6 +26,7 @@ RUN apt-get update \
  && apt-get -qq install -y --no-install-recommends \
     fd-find \
     less \
+    bats \
     ripgrep
 
 # Add the group and user that match our ids

.github/workflows/build-deploy.yaml

@@ -37,6 +37,7 @@ jobs:
       run: |
         cp ./.devcontainer/Dockerfile ./Dockerfile
         echo "USER root" >> ./Dockerfile
+        cat ./Dockerfile
         docker build -t ${{ env.container }}-base:latest .
         echo "WORKDIR /code" >> ./Dockerfile
         echo "COPY . /code" >> ./Dockerfile

.github/workflows/main.yaml

@@ -0,0 +1,32 @@
+name: Test Flux Go
+
+on:
+
+  # Test Nightly
+  schedule: 
+  - cron: 0 0 * * 0
+
+  # Test on pull request
+  pull_request: []
+
+jobs:
+  build:
+    permissions:
+      packages: write
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/converged-computing/flux-go    
+      options: --user root
+    name: Build
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install Bats
+      run: apt-get update && apt-get install -y bats
+
+    - name: Test Build
+      run: make
+
+    - name: Run Tests
+      run: make test

Makefile

@@ -11,3 +11,8 @@ fluxgo:
 	mkdir -p ./bin
 	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-w' -o ./bin/fluxgo-submit cmd/submit/main.go
 	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-w' -o ./bin/fluxgo-keygen cmd/keygen/main.go
+
+
+.PHONY: test
+test:
+	bats -t test/bats/cli.bats

cmd/keygen/main.go

@@ -28,11 +28,16 @@ func main() {
 	fmt.Println("⭐️ Testing flux keygen in Go! ⭐️")
 
 	// A name for the certificate - this is often the hostname
+	fmt.Println("Generating to path...")
 	hostname := getHostname()
 	name := "curve-cert"
 
 	// Path to the certificate to save
 	path := "./curve.cert"
 	flux.KeyGen(name, hostname, path)
-	fmt.Println("Generated certificate!")
+
+	fmt.Println("Generating to string...")
+	curveCert := flux.KeyGen(name, hostname, "")
+	fmt.Println(curveCert)
+
 }

pkg/flux/keygen.go

@@ -23,8 +23,21 @@ import (
 // so we put it under flux implying that, since "cmd" has special meaning
 // in Go!
 
+var (
+    template = `#   ****  Generated on 2023-04-26 22:54:42 by CZMQ  ****
+#   ZeroMQ CURVE **Secret** Certificate
+#   DO NOT PROVIDE THIS FILE TO OTHER USERS nor change its permissions.
+    
+metadata
+    name = "%s"
+    keygen.hostname = "%s"
+curve
+    public-key = "%s"
+    secret-key = "%s"`
+)
+
 // KeyGen generates a curve certificate
-func KeyGen(name string, hostname string, path string) {
+func KeyGen(name string, hostname string, path string) string {
 
     // Create the new certificate (likely want to check for error here)
     cert := C.zcert_new()
@@ -45,11 +58,25 @@ func KeyGen(name string, hostname string, path string) {
     defer C.free(unsafe.Pointer(hostnameField))
     C.flux_zcert_set_meta(cert, hostnameField, hostnameValue)
 
-    // Note that we can also generate keygen.time, keygen.userid,
-    // And other version metadata. See
-    cpath := C.CString(path)
-    defer C.free(unsafe.Pointer(cpath))
-    fmt.Printf("Saving to %s\n", path)    
-    C.zcert_save_secret (cert, cpath)
+    // If we don't have a path, save to string
+    var curveCert string
+    if path == "" {
+
+        publicKey := C.zcert_public_txt(cert)
+        secretKey := C.zcert_secret_txt(cert)
+        public := C.GoString((*C.char)(unsafe.Pointer(publicKey)))
+        secret := C.GoString((*C.char)(unsafe.Pointer(secretKey)))
+        curveCert = fmt.Sprintf(template, name, hostname, public, secret)
+
+    } else {
+        // Note that we can also generate keygen.time, keygen.userid,
+        // And other version metadata. See
+        cpath := C.CString(path)
+        defer C.free(unsafe.Pointer(cpath))
+        fmt.Printf("Saving to %s\n", path)    
+        C.zcert_save_secret (cert, cpath)
+    }
+
     C.zcert_destroy (&cert)
+    return curveCert
 }

test/bats/cli.bats

@@ -0,0 +1,21 @@
+#!/usr/bin/env bats
+
+# This is run relative to the root
+# We also assume the binaries are built
+BIN_DIR=./bin
+TEST_DIR=./test/bats
+SLEEP_TIME=10
+
+@test "keygen test" {
+
+  ${BIN_DIR}/fluxgo-keygen | grep public-key
+  cat ./curve.cert | grep ZeroMQ
+  cat ./curve.cert | grep curve-cert
+  cat ./curve.cert | grep keygen.hostname
+  cat ./curve.cert | grep public-key
+  cat ./curve.cert | grep secret-key
+}
+
+@test "submit test" {
+  flux start ${TEST_DIR}/test_submit.sh
+}

test/bats/test_submit.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+HERE=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd $HERE
+../../bin/fluxgo-submit
+flux jobs -a | grep sleep
+
+# Give time to finish
+sleep 10