create-svc 0.1.9 → 0.1.11

package/templates/variants/go-connectrpc/Makefile

@@ -1,9 +1,21 @@
-.PHONY: dev 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:
-	go run ./cmd/server
+	@bun run ./scripts/dev.ts go run ./cmd/server
+
+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
@@ -11,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,7 +4,9 @@ plugins:
     out: gen
     opt:
       - paths=source_relative
+      - Mwaitlist/v1/waitlist.proto={{MODULE_PATH}}/gen/waitlist/v1
   - local: protoc-gen-connect-go
     out: gen
     opt:
       - paths=source_relative
+      - Mwaitlist/v1/waitlist.proto={{MODULE_PATH}}/gen/waitlist/v1

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

@@ -4,16 +4,23 @@ import (
 	"context"
 	"log"
 	"net/http"
+	"os"
+	"strings"
 	"time"
 
+	"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"
 
+	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() {
@@ -22,24 +29,44 @@ func main() {
 		log.Fatal(err)
 	}
 
-	service := app.NewDNSService()
-	if cfg.DatabaseURL != "" {
-		if _, err := service.CreateRecord(context.Background(), app.CreateRecordInput{
-			Type:    "TXT",
-			Name:    "bootstrap",
-			Content: "database-configured",
-			TTL:     60,
-			Proxied: false,
-		}); err != nil {
+	db, err := app.OpenDatabase(context.Background(), cfg.DatabaseURL)
+	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)
 	}
 
 	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(waitlistv1connect.WaitlistServiceName)
+		reflectionV1Path, reflectionV1Handler := grpcreflect.NewHandlerV1(reflector)
+		reflectionV1AlphaPath, reflectionV1AlphaHandler := grpcreflect.NewHandlerV1Alpha(reflector)
+		router.Mount(reflectionV1Path, reflectionV1Handler)
+		router.Mount(reflectionV1AlphaPath, reflectionV1AlphaHandler)
+	}
+
 	server := &http.Server{
 		Addr:              ":" + cfg.Port,
 		ReadHeaderTimeout: 10 * time.Second,
@@ -49,3 +76,11 @@ func main() {
 	log.Printf("listening on %s", server.Addr)
 	log.Fatal(server.ListenAndServe())
 }
+
+func localRPCIntrospectionEnabled() bool {
+	override := strings.TrimSpace(strings.ToLower(os.Getenv("ENABLE_RPC_INTROSPECTION")))
+	if override != "" {
+		return override != "0" && override != "false" && override != "no" && override != "off"
+	}
+	return os.Getenv("K_SERVICE") == ""
+}