use naming templates for terraform resources

cli/controller/deploy.go

@@ -220,6 +220,8 @@ func (d *Deploy) backendRequest() dto.DeployRequest {
 			ResourceTags:        d.stage.ResourceTags(),
 			WsEnv:               d.stage.WsEnv(),
 			HasPublic:           d.stage.HasPublic(),
+			NamingTemplate:      d.stage.ResourceNamingTemplate(),
+			PublicBucketName:    d.stage.PublicBucketName(),
 		}
 	}
 	return req

cli/controller/setup.go

@@ -127,6 +127,7 @@ func (c *Setup) create(n *domain.Node) error {
 		FunctionsPath:      n.Functions.Path,
 		AuthEnv:            n.AuthEnv(),
 		ResourceSuffix:     n.ResourceSuffix(),
+		NamingTemplate:     n.ResourceNamingTemplate(),
 		APIGatewayLogsRole: APIGatewayLogsRole,
 		ResourceTags:       c.resourceTags,
 	}
@@ -222,6 +223,7 @@ func (c *Setup) upgrade(n *domain.Node) error {
 		FunctionsPath:   n.Functions.Path,
 		AuthEnv:         n.AuthEnv(),
 		ResourceSuffix:  n.ResourceSuffix(),
+		NamingTemplate:  n.ResourceNamingTemplate(),
 		ResourceTags:    c.resourceTags,
 	}
 	if err := invoke.Lambda(c.aws.Lambda(), c.lambdaName, ui.NodeLogsSink).Do("upgrade", req, nil); err != nil {

cli/ui/term/term_other.go

@@ -0,0 +1,13 @@
+//go:build !windows
+
+package term
+
+import "fmt"
+
+func HideCursor() {
+	fmt.Print("\033[?25l")
+}
+
+func ShowCursor() {
+	fmt.Print("\033[?25h")
+}

cli/ui/term/term_windows.go

@@ -0,0 +1,63 @@
+//go:build windows
+
+package term
+
+import (
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	kernel32                       = syscall.NewLazyDLL("kernel32.dll")
+	procFillConsoleOutputCharacter = kernel32.NewProc("FillConsoleOutputCharacterW")
+	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
+	procSetConsoleCursorPosition   = kernel32.NewProc("SetConsoleCursorPosition")
+	procGetConsoleCursorInfo       = kernel32.NewProc("GetConsoleCursorInfo")
+	procSetConsoleCursorInfo       = kernel32.NewProc("SetConsoleCursorInfo")
+)
+
+type short int16
+type dword uint32
+type word uint16
+
+type coord struct {
+	x short
+	y short
+}
+
+type smallRect struct {
+	bottom short
+	left   short
+	right  short
+	top    short
+}
+
+type consoleScreenBufferInfo struct {
+	size              coord
+	cursorPosition    coord
+	attributes        word
+	window            smallRect
+	maximumWindowSize coord
+}
+
+type consoleCursorInfo struct {
+	size    dword
+	visible int32
+}
+
+func ShowCursor() {
+	handle := syscall.Handle(os.Stdout.Fd())
+	var cci consoleCursorInfo
+	_, _, _ = procGetConsoleCursorInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&cci)))
+	cci.visible = 1
+	_, _, _ = procSetConsoleCursorInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&cci)))
+}
+
+func HideCursor() {
+	handle := syscall.Handle(os.Stdout.Fd())
+	var cci consoleCursorInfo
+	_, _, _ = procGetConsoleCursorInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&cci)))
+	cci.visible = 0
+	_, _, _ = procSetConsoleCursorInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&cci)))
+}

domain/stage.go

@@ -233,6 +233,10 @@ func (s *Stage) WsEndpoint() string {
 	return fmt.Sprintf("%s/$default", s.Endpoints.Ws)
 }
 
+func (s *Stage) PublicBucketName() string {
+	return fmt.Sprintf("%s-%s-public-%s", s.Project().Name, s.Name, s.Node().ResourceSuffix())
+}
+
 type WsConfig struct {
 	ApiToFn map[string]string `json:"apiToFn"`
 }

domain/workspace.go

@@ -182,6 +182,10 @@ func (n *Node) ResourceSuffix() string {
 	return n.ID
 }
 
+func (n *Node) ResourceNamingTemplate() string {
+	return "mantil-%s-" + n.ID
+}
+
 func (n *Node) SetupStackName() string {
 	return n.SetupLambdaName()
 }

node/api/setup/setup.go

@@ -111,6 +111,7 @@ func (s *Setup) terraformCreate(req *dto.SetupRequest) (*dto.SetupResponse, erro
 		FunctionsBucket: req.FunctionsBucket,
 		FunctionsPath:   req.FunctionsPath,
 		ResourceSuffix:  req.ResourceSuffix,
+		NamingTemplate:  req.NamingTemplate,
 		AuthEnv:         req.AuthEnv,
 		ResourceTags:    req.ResourceTags,
 	}

node/dto/dto.go

@@ -23,6 +23,8 @@ type StageTemplate struct {
 	ResourceTags        map[string]string
 	WsEnv               map[string]string
 	HasPublic           bool
+	NamingTemplate      string
+	PublicBucketName    string
 }
 
 type Function struct {
@@ -78,6 +80,7 @@ type SetupRequest struct {
 	FunctionsBucket    string
 	FunctionsPath      string
 	ResourceSuffix     string
+	NamingTemplate     string
 	APIGatewayLogsRole string
 	AuthEnv            map[string]string
 	ResourceTags       map[string]string

node/terraform/modules/api/auth.tf

@@ -1,5 +1,5 @@
 locals {
-  authorizer_lambda_name   = "${var.prefix}-authorizer-${var.suffix}"
+  authorizer_lambda_name   = format(var.naming_template, "authorizer")
   authorizer_lambda_s3_key = "${var.functions_s3_path}/authorizer.zip"
 }
 

node/terraform/modules/api/iam.tf

@@ -1,6 +1,6 @@
 resource "aws_iam_role" "authorizer" {
   count = var.authorizer == null ? 0 : 1
-  name  = "${var.prefix}-authorizer-${var.suffix}"
+  name  = format(var.naming_template, "authorizer")
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -33,7 +33,7 @@ data "aws_iam_policy_document" "authorizer" {
 
 resource "aws_iam_role_policy" "authorizer" {
   count  = var.authorizer == null ? 0 : 1
-  name   = "${var.prefix}-authorizer-${var.suffix}"
+  name   = format(var.naming_template, "authorizer")
   role   = aws_iam_role.authorizer[0].id
   policy = data.aws_iam_policy_document.authorizer[0].json
 }

node/terraform/modules/api/main.tf

@@ -3,10 +3,9 @@ terraform {
 }
 
 module "http_api" {
-  source       = "../http-api"
-  prefix       = var.prefix
-  suffix       = var.suffix
-  integrations = var.integrations
+  source          = "../http-api"
+  naming_template = var.naming_template
+  integrations    = var.integrations
   authorizer = var.authorizer == null ? null : {
     authorization_header = var.authorizer.authorization_header
     arn                  = aws_lambda_function.authorizer[0].arn
@@ -17,8 +16,8 @@ module "http_api" {
 module "ws_api" {
   count             = var.ws_enabled ? 1 : 0
   source            = "../ws-api"
-  prefix            = var.prefix
   suffix            = var.suffix
+  naming_template   = var.naming_template
   functions_bucket  = var.functions_bucket
   functions_s3_path = var.functions_s3_path
   ws_env            = var.ws_env

node/terraform/modules/api/variables.tf

@@ -1,8 +1,8 @@
-variable "prefix" {
+variable "suffix" {
   type = string
 }
 
-variable "suffix" {
+variable "naming_template" {
   type = string
 }
 

node/terraform/modules/cli-role/main.tf

@@ -1,5 +1,5 @@
 locals {
-  name = "${var.prefix}-cli-user-${var.suffix}"
+  name = format(var.naming_template, "cli-user")
 }
 
 resource "aws_iam_role" "cli_role" {

node/terraform/modules/cli-role/variables.tf

@@ -1,7 +1,7 @@
-variable "prefix" {
+variable "suffix" {
   type = string
 }
 
-variable "suffix" {
+variable "naming_template" {
   type = string
-}
+}

node/terraform/modules/functions-node/main.tf

@@ -30,9 +30,8 @@ locals {
 }
 
 module "functions" {
-  source    = "../functions"
-  functions = local.functions
-  s3_bucket = var.functions_bucket
-  prefix    = "mantil"
-  suffix    = var.suffix
+  source          = "../functions"
+  functions       = local.functions
+  s3_bucket       = var.functions_bucket
+  naming_template = var.naming_template
 }

node/terraform/modules/functions-node/variables.tf

@@ -10,6 +10,9 @@ variable "suffix" {
   type = string
 }
 
+variable "naming_template" {
+  type = string
+}
 variable "region" {
   type = string
 }

node/terraform/modules/functions/main.tf

@@ -4,13 +4,13 @@ locals {
     {
       s3_key : try(f.s3_key, "")
 
-      function_name : "${var.prefix}-${k}-${var.suffix}" // prefix functions name with project name
-      runtime : try(f.runtime, "provided.al2")           // default runtime is go
-      handler : try(f.handler, "bootstrap")              // default handler for go is 'bootstrap'
-      memory_size : try(f.memory_size, 128)              // default memory size
-      timeout : try(f.timeout, 900)                      // default timeout
-      path : try(f.path, k)                              // default path is function's name
-      architecture : try(f.architecture, "arm64")        // default architecture is arm64
+      function_name : format(var.naming_template, k) // prefix functions name with project name
+      runtime : try(f.runtime, "provided.al2")       // default runtime is go
+      handler : try(f.handler, "bootstrap")          // default handler for go is 'bootstrap'
+      memory_size : try(f.memory_size, 128)          // default memory size
+      timeout : try(f.timeout, 900)                  // default timeout
+      path : try(f.path, k)                          // default path is function's name
+      architecture : try(f.architecture, "arm64")    // default architecture is arm64
       env : length(try(f.env, {})) == 0 ? null : try(f.env, {})
       layers : try(f.layers, [])
       policy : try(f.policy, jsonencode({

node/terraform/modules/functions/variables.tf

@@ -9,10 +9,6 @@ variable "s3_bucket" {
   description = "S3 bucket containing functions' deployment package."
 }
 
-variable "prefix" {
-  type = string
-}
-
-variable "suffix" {
+variable "naming_template" {
   type = string
 }

node/terraform/modules/http-api/api.tf

@@ -1,13 +1,13 @@
 resource "aws_apigatewayv2_api" "http" {
-  name          = "${var.prefix}-http-${var.suffix}"
+  name          = format(var.naming_template, "http")
   protocol_type = "HTTP"
   cors_configuration {
     allow_origins = toset(["*"])
   }
 }
 
 resource "aws_cloudwatch_log_group" "http_access_logs" {
-  name              = "/aws/vendedlogs/${var.prefix}-http-access-logs-${var.suffix}"
+  name              = "/aws/vendedlogs/${format(var.naming_template, "http-access-logs")}"
   retention_in_days = 14
 }
 
@@ -151,6 +151,6 @@ resource "aws_apigatewayv2_authorizer" "http" {
   authorizer_uri                    = var.authorizer.invoke_arn
   identity_sources                  = ["$request.header.${var.authorizer.authorization_header}"]
   authorizer_payload_format_version = "1.0"
-  name                              = "${var.prefix}-http-authorizer-${var.suffix}"
+  name                              = format(var.naming_template, "http-authorizer")
   authorizer_result_ttl_in_seconds  = 0
 }

node/terraform/modules/http-api/variables.tf

@@ -1,8 +1,4 @@
-variable "prefix" {
-  type = string
-}
-
-variable "suffix" {
+variable "naming_template" {
   type = string
 }
 

node/terraform/modules/public-site/main.tf

@@ -1,5 +1,5 @@
 resource "aws_s3_bucket" "public" {
-  bucket        = "${var.prefix}-${var.suffix}"
+  bucket        = var.bucket_name
   acl           = "public-read"
   force_destroy = true
 

node/terraform/modules/public-site/variables.tf

@@ -1,7 +1,3 @@
-variable "prefix" {
-  type = string
-}
-
-variable "suffix" {
+variable "bucket_name" {
   type = string
 }

node/terraform/modules/ws-api/api.tf

@@ -1,12 +1,12 @@
 resource "aws_apigatewayv2_api" "ws" {
-  name          = "${var.prefix}-ws-${var.suffix}"
+  name          = format(var.naming_template, "ws")
   protocol_type = "WEBSOCKET"
 
   route_selection_expression = "\\$default"
 }
 
 resource "aws_cloudwatch_log_group" "ws_access_logs" {
-  name              = "/aws/vendedlogs/${var.prefix}-ws-access-logs-${var.suffix}"
+  name              = "/aws/vendedlogs/${format(var.naming_template, "ws-access-logs")}"
   retention_in_days = 14
 }
 
@@ -155,5 +155,5 @@ resource "aws_apigatewayv2_authorizer" "ws" {
   authorizer_type  = "REQUEST"
   authorizer_uri   = var.authorizer.invoke_arn
   identity_sources = ["route.request.header.${var.authorizer.authorization_header}"]
-  name             = "${var.prefix}-ws-authorizer-${var.suffix}"
+  name             = format(var.naming_template, "ws-authorizer")
 }

node/terraform/modules/ws-api/iam.tf

@@ -1,5 +1,5 @@
 resource "aws_iam_role" "ws_handler" {
-  name = "${var.prefix}-ws-handler-${var.suffix}"
+  name = format(var.naming_template, "ws-handler")
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -18,7 +18,7 @@ data "aws_iam_policy_document" "ws_handler" {
   statement {
     effect    = "Allow"
     actions   = ["lambda:InvokeFunction"]
-    resources = ["arn:aws:lambda:*:*:function:${var.prefix}-*-${var.suffix}"]
+    resources = ["arn:aws:lambda:*:*:function:${format(var.naming_template, "*")}"]
   }
   statement {
     effect = "Allow"
@@ -47,13 +47,13 @@ data "aws_iam_policy_document" "ws_handler" {
 }
 
 resource "aws_iam_role_policy" "ws_handler" {
-  name   = "${var.prefix}-ws-handler-${var.suffix}"
+  name   = format(var.naming_template, "ws-handler")
   role   = aws_iam_role.ws_handler.id
   policy = data.aws_iam_policy_document.ws_handler.json
 }
 
 resource "aws_iam_role" "ws_forwarder" {
-  name = "${var.prefix}-ws-forwarder-${var.suffix}"
+  name = format(var.naming_template, "ws-forwarder")
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -101,7 +101,7 @@ data "aws_iam_policy_document" "ws_forwarder" {
 }
 
 resource "aws_iam_role_policy" "ws_forwarder" {
-  name   = "${var.prefix}-ws-forwarder-${var.suffix}"
+  name   = format(var.naming_template, "ws-forwarder")
   role   = aws_iam_role.ws_forwarder.id
   policy = data.aws_iam_policy_document.ws_forwarder.json
 }