From 717daa28cc4805290b5fa6d1890a68f1d469c097 Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Fri, 9 Feb 2024 09:17:30 +0000
Subject: [PATCH] Allow a custom name, not just auto-generated

This affected @richardcase when a team-mate deleted his VM
from a common company cloud account not knowing what it was
for, or who it belonged to.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 cmd/create.go | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/cmd/create.go b/cmd/create.go
index 3d63727c..256a27c3 100644
--- a/cmd/create.go
+++ b/cmd/create.go
@@ -19,7 +19,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const inletsProDefaultVersion = "0.9.25"
+const inletsProDefaultVersion = "0.9.28"
 const inletsProControlPort = 8123
 
 func init() {
@@ -71,19 +71,25 @@ var createCmd = &cobra.Command{
 with inlets preloaded as a systemd service. The estimated cost of each 
 VM along with what OS version and spec will be used is explained in the 
 project docs.`,
-	Example: `  # Create a TCP tunnel server
-  inletsctl create  \
-    --provider [digitalocean|equinix-metal|ec2|scaleway|civo|gce|azure|linode|hetzner] \
-    --access-token-file $HOME/access-token \
-    --region lon1
-
+	Example: `
   # Create a HTTPS tunnel server, terminating TLS with a certificate 
-  # from Let's Encrypt 
+  # from Let's Encrypt called "tunnel-richardcase" so your team mates
+  # don't delete your VM unintentionally.
   inletsctl create  \
+    tunnel-richardcase \
     --letsencrypt-domain inlets.example.com \
     --letsencrypt-email webmaster@example.com
 
-  # Create a HTTPS tunnel server with multiple domains
+  # Create a TCP tunnel server with a VM name of ssh-tunnel
+  inletsctl create \
+    ssh-tunnel \
+	--tcp \
+    --provider [digitalocean|equinix-metal|ec2|scaleway|civo|gce|azure|linode|hetzner] \
+    --access-token-file $HOME/access-token \
+    --region lon1
+
+  # Create a HTTPS tunnel server with multiple domains and an auto-generated
+  # VM name
   inletsctl create  \
     --letsencrypt-domain tunnel1.example.com \
     --letsencrypt-domain tunnel2.example.com \
@@ -99,6 +105,12 @@ const EquinixMetalProvider = "equinix-metal"
 
 func runCreate(cmd *cobra.Command, _ []string) error {
 
+	// Get name from the Args, if not provided, generate a random name
+	name := strings.Replace(names.GetRandomName(10), "_", "-", -1)
+	if len(cmd.Flags().Args()) > 0 {
+		name = cmd.Flags().Args()[0]
+	}
+
 	inletsProVersion, err := cmd.Flags().GetString("inlets-version")
 	if err != nil {
 		return err
@@ -301,8 +313,6 @@ func runCreate(cmd *cobra.Command, _ []string) error {
 		tcp = false
 	}
 
-	name := strings.Replace(names.GetRandomName(10), "_", "-", -1)
-
 	var userData string
 	if len(letsencryptDomains) > 0 {
 		userData = MakeHTTPSUserdata(inletsToken,
@@ -341,9 +351,9 @@ func runCreate(cmd *cobra.Command, _ []string) error {
 	}
 
 	if provider == "gce" {
-		fmt.Printf("Requesting host: %s in %s, from %s\n", name, zone, provider)
+		fmt.Printf("Provisioning exit-server: %s in %s [%s]\n", name, zone, provider)
 	} else {
-		fmt.Printf("Requesting host: %s in %s, from %s\n", name, region, provider)
+		fmt.Printf("Provisioning exit-server: %s in %s [%s]\n", name, region, provider)
 	}
 
 	hostRes, err := provisioner.Provision(*hostReq)