create-svc 0.1.10 → 0.1.12

package/templates/variants/go-chi/migrations/atlas.sum

@@ -0,0 +1,2 @@
+h1:D9GgvtEf0xxnRDaTb/C3cPtRbncVXsK6Ef0KYQuLMRw=
+0000_init.sql h1:dBpLGyoeZNRpjT6RvQXiqx3p2ICAChKy2jVqCIYuWQg=

package/templates/variants/go-chi/package.json

@@ -3,9 +3,15 @@
   "private": true,
   "type": "module",
   "bin": {
-    "svc-cloudrun": "./scripts/cloudrun/cli.ts"
+    "service": "./scripts/cloudrun/cli.ts"
+  },
+  "scripts": {
+    "service": "bun run ./scripts/cloudrun/cli.ts",
+    "auth": "bun run ./scripts/cloudrun/cli.ts auth",
+    "dashboards": "bun run ./scripts/cloudrun/cli.ts dashboards"
   },
   "dependencies": {
+    "@anmho/authctl": "0.1.1",
     "@clack/prompts": "^1.2.0",
     "@neondatabase/api-client": "^2.7.1"
   }

package/templates/variants/go-connectrpc/Makefile

@@ -1,13 +1,21 @@
-.PHONY: dev migrate gen lint test bootstrap deploy cleanup
+.PHONY: dev migrate migrate-lint gen lint test create deploy dashboards auth destroy
 
-CLOUDRUN := npx --no-install svc-cloudrun
+SERVICE := npx --no-install service
 WITH_ENV := set -a; [ ! -f .env.local ] || . ./.env.local; set +a;
+ATLAS ?= atlas
 
 dev:
-	@$(WITH_ENV) go run ./cmd/server
+	@bun run ./scripts/dev.ts go run ./cmd/server
 
 migrate:
-	@$(WITH_ENV) go run ./cmd/migrate
+	@bun run ./scripts/ensure-local-db.ts
+	@bun run ./scripts/wait-for-db.ts
+	@$(WITH_ENV) $(ATLAS) migrate apply --env local
+
+migrate-lint:
+	@bun run ./scripts/ensure-local-db.ts
+	@bun run ./scripts/wait-for-db.ts
+	@$(WITH_ENV) $(ATLAS) migrate lint --env local --latest 1
 
 gen:
 	buf generate
@@ -15,15 +23,24 @@ gen:
 lint:
 	go vet ./...
 	buf lint
+	@bun run ./scripts/ensure-local-db.ts
+	@bun run ./scripts/wait-for-db.ts
+	@$(WITH_ENV) $(ATLAS) migrate lint --env local --latest 1
 
 test:
 	bun test ./test
 
-bootstrap:
-	$(CLOUDRUN) bootstrap
+create:
+	$(SERVICE) create
 
 deploy:
-	$(CLOUDRUN) deploy $(ARGS)
+	$(SERVICE) deploy $(ARGS)
+
+dashboards:
+	$(SERVICE) dashboards
+
+auth:
+	$(SERVICE) auth $(ARGS)
 
-cleanup:
-	$(CLOUDRUN) cleanup $(ARGS)
+destroy:
+	$(SERVICE) destroy $(ARGS)

package/templates/variants/go-connectrpc/atlas.hcl

@@ -0,0 +1,8 @@
+env "local" {
+  url = getenv("DATABASE_URL")
+  dev = "docker://postgres/16/dev?search_path=public"
+
+  migration {
+    dir = "file://migrations"
+  }
+}

package/templates/variants/go-connectrpc/buf.gen.yaml

@@ -4,9 +4,9 @@ plugins:
     out: gen
     opt:
       - paths=source_relative
-      - Mchat/v1/chat.proto={{MODULE_PATH}}/gen/chat/v1
+      - Mwaitlist/v1/waitlist.proto={{MODULE_PATH}}/gen/waitlist/v1
   - local: protoc-gen-connect-go
     out: gen
     opt:
       - paths=source_relative
-      - Mchat/v1/chat.proto={{MODULE_PATH}}/gen/chat/v1
+      - Mwaitlist/v1/waitlist.proto={{MODULE_PATH}}/gen/waitlist/v1

package/templates/variants/go-connectrpc/cmd/server/main.go

@@ -8,18 +8,19 @@ import (
 	"strings"
 	"time"
 
-	"cloud.google.com/go/storage"
 	"connectrpc.com/grpcreflect"
 	"github.com/go-chi/chi/v5"
 	_ "github.com/jackc/pgx/v5/stdlib"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 
-	chatv1connect "{{MODULE_PATH}}/gen/chat/v1/chatv1connect"
+	waitlistv1connect "{{MODULE_PATH}}/gen/waitlist/v1/waitlistv1connect"
 	"{{MODULE_PATH}}/internal/app"
+	"{{MODULE_PATH}}/internal/auth"
 	"{{MODULE_PATH}}/internal/config"
 	"{{MODULE_PATH}}/internal/connectapi"
 	"{{MODULE_PATH}}/internal/httpapi"
+	temporalapp "{{MODULE_PATH}}/internal/temporal"
 )
 
 func main() {
@@ -32,24 +33,34 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	storageClient, err := storage.NewClient(context.Background())
-	if err != nil {
-		log.Fatal(err)
+	service := app.NewWaitlistService(db)
+	if cfg.TemporalEnabled {
+		stopTemporal, err := temporalapp.StartWorker(temporalapp.WorkerConfig{
+			Address:   cfg.TemporalAddress,
+			Namespace: cfg.TemporalNamespace,
+			TaskQueue: cfg.TemporalTaskQueue,
+			APIKey:    cfg.TemporalAPIKey,
+		})
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer stopTemporal()
+		log.Printf("Temporal worker polling %s", cfg.TemporalTaskQueue)
 	}
 
-	service := app.NewChatService(
-		db,
-		app.NewGCSStorage(cfg.AttachmentBucket, cfg.AttachmentPublicBaseURL, storageClient),
-		app.GenericWebhookAdapter{},
-	)
-
 	router := chi.NewRouter()
+	router.Use(auth.Middleware(auth.Config{
+		Enabled:  cfg.AuthEnabled,
+		Issuer:   cfg.AuthIssuer,
+		Audience: cfg.AuthAudience,
+		JWKSURL:  cfg.AuthJWKSURL,
+	}))
 	connectPath, connectHandler := connectapi.NewHandler(service)
 	router.Mount(connectPath, connectHandler)
 	httpapi.RegisterRoutes(router, service)
 
 	if localRPCIntrospectionEnabled() {
-		reflector := grpcreflect.NewStaticReflector(chatv1connect.ChatServiceName)
+		reflector := grpcreflect.NewStaticReflector(waitlistv1connect.WaitlistServiceName)
 		reflectionV1Path, reflectionV1Handler := grpcreflect.NewHandlerV1(reflector)
 		reflectionV1AlphaPath, reflectionV1AlphaHandler := grpcreflect.NewHandlerV1Alpha(reflector)
 		router.Mount(reflectionV1Path, reflectionV1Handler)