fix: sanitize project name consistently (#732)

Author: dbarrosop

.gitignore

@@ -43,3 +43,4 @@ generate-changelog.sh
 letsencrypt/*
 result
 dist/
+letsencrypt/

cert.sh

@@ -2,14 +2,25 @@
 
 set -euo pipefail
 
-docker run -it --rm \
-  --name certbot \
-  -e AWS_ACCESS_KEY_ID \
-  -e AWS_SECRET_ACCESS_KEY \
-  -e AWS_REGION \
-  -v $(PWD)/letsencrypt:/etc/letsencrypt \
-  -v $(PWD)/letsencrypt:/var/lib/letsencrypt \
-  certbot/dns-route53 certonly -v --dns-route53 --dns-route53-propagation-seconds 60 -d local.db.nhost.run -d local.graphql.nhost.run -d local.hasura.nhost.run -d local.auth.nhost.run -d local.storage.nhost.run -d local.functions.nhost.run -m '[email protected]' --non-interactive --agree-tos --server https://acme-v02.api.letsencrypt.org/directory
+certbot certonly \
+    -v \
+    --dns-route53 \
+    --dns-route53-propagation-seconds 60 \
+    -d local.db.nhost.run \
+    -d local.graphql.nhost.run \
+    -d local.hasura.nhost.run \
+    -d local.auth.nhost.run \
+    -d local.storage.nhost.run \
+    -d local.functions.nhost.run \
+    -m '[email protected]' \
+    --non-interactive \
+    --agree-tos \
+    --server https://acme-v02.api.letsencrypt.org/directory \
+    --logs-dir letsencrypt \
+    --config-dir letsencrypt \
+    --work-dir letsencrypt
 
 cp letsencrypt/live/local.db.nhost.run/fullchain.pem internal/ssl/.ssl/
 cp letsencrypt/live/local.db.nhost.run/privkey.pem internal/ssl/.ssl/
+
+rm -rf letsencrypt

clienv/clienv.go

@@ -3,11 +3,18 @@ package clienv
 import (
 	"io"
 	"os"
+	"regexp"
+	"strings"
 
 	"github.com/nhost/cli/nhostclient"
 	"github.com/urfave/cli/v2"
 )
 
+func sanitizeName(name string) string {
+	re := regexp.MustCompile(`[^a-z0-9_-]`)
+	return strings.ToLower(re.ReplaceAllString(name, ""))
+}
+
 type CliEnv struct {
 	stdout      io.Writer
 	stderr      io.Writer
@@ -50,7 +57,7 @@ func FromCLI(cCtx *cli.Context) *CliEnv {
 			cCtx.String(flagNhostFolder),
 		),
 		domain:      cCtx.String(flagDomain),
-		projectName: cCtx.String(flagProjectName),
+		projectName: sanitizeName(cCtx.String(flagProjectName)),
 		nhclient:    nil,
 	}
 }

cmd/dev/up.go

@@ -111,7 +111,6 @@ func commandUp(cCtx *cli.Context) error {
 	return Up(
 		cCtx.Context,
 		ce,
-		ce.ProjectName(),
 		cCtx.Uint(flagHTTPPort),
 		!cCtx.Bool(flagDisableTLS),
 		cCtx.Uint(flagPostgresPort),
@@ -175,7 +174,6 @@ func up( //nolint:funlen
 	ctx context.Context,
 	ce *clienv.CliEnv,
 	dc *dockercompose.DockerCompose,
-	projectName string,
 	httpPort uint,
 	useTLS bool,
 	postgresPort uint,
@@ -199,7 +197,7 @@ func up( //nolint:funlen
 	ce.Infoln("Setting up Nhost development environment...")
 	composeFile, err := dockercompose.ComposeFileFromConfig(
 		cfg,
-		projectName,
+		ce.ProjectName(),
 		httpPort,
 		useTLS,
 		postgresPort,
@@ -274,17 +272,16 @@ func printInfo(ce *clienv.CliEnv, httpPort, postgresPort uint, useTLS bool) {
 func Up(
 	ctx context.Context,
 	ce *clienv.CliEnv,
-	projectName string,
 	httpPort uint,
 	useTLS bool,
 	postgresPort uint,
 	applySeeds bool,
 	ports map[string]uint,
 ) error {
-	dc := dockercompose.New(ce.Path.WorkingDir(), ce.Path.DockerCompose(), projectName)
+	dc := dockercompose.New(ce.Path.WorkingDir(), ce.Path.DockerCompose(), ce.ProjectName())
 
 	if err := up(
-		ctx, ce, dc, projectName, httpPort, useTLS, postgresPort, applySeeds, ports,
+		ctx, ce, dc, httpPort, useTLS, postgresPort, applySeeds, ports,
 	); err != nil {
 		ce.Warnln(err.Error())
 

dockercompose/dockercompose.go

@@ -8,8 +8,6 @@ import (
 	"io/fs"
 	"os"
 	"os/exec"
-	"regexp"
-	"strings"
 
 	"github.com/creack/pty"
 	"gopkg.in/yaml.v3"
@@ -23,16 +21,11 @@ type DockerCompose struct {
 	projectName string
 }
 
-func sanitizeName(name string) string {
-	re := regexp.MustCompile(`[^a-z0-9_-]`)
-	return strings.ToLower(re.ReplaceAllString(name, ""))
-}
-
 func New(workingDir, filepath, projectName string) *DockerCompose {
 	return &DockerCompose{
 		workingDir:  workingDir,
 		filepath:    filepath,
-		projectName: sanitizeName(projectName),
+		projectName: projectName,
 	}
 }
 

flake.nix

@@ -124,6 +124,7 @@
           default = pkgs.mkShell {
             buildInputs = with pkgs; [
               goreleaser
+              certbot-full
             ] ++ goCheckDeps ++ buildInputs ++ nativeBuildInputs;
           };