Fix generating in docker

Author: jakubno

.github/workflows/generated_files.yml

@@ -0,0 +1,26 @@
+name: Generated files
+
+on:
+  pull_request:
+
+jobs:
+  lint:
+    name: Generated files
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Install make
+        run: sudo apt-get update && sudo apt-get install -y make
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run codegen
+        run: make codegen
+
+      - name: Check generated files
+        run: |
+          git diff --exit-code || (echo "Generated files are not up to date. Please run 'make codegen'." && exit 1)

Makefile

@@ -1,28 +1,17 @@
-update-api-spec:
-	@echo "Updating API spec"
-	@./scripts/update-api-spec.sh
-	@echo "Done"
-
 .PHONY: codegen
 codegen:
 	@echo "Generating SDK code from openapi and envd spec"
-	@./scripts/codegen.sh
+	@docker run -v "$$(pwd):/workspace" $$(docker build -q -t codegen-env . -f codegen.Dockerfile)
 
 generate: generate-js generate-python
 
 generate-js:
 	cd packages/js-sdk && pnpm generate
-	cd packages/js-sdk && pnpm generate-envd-api
-	cd spec/envd && buf generate --template buf-js.gen.yaml
 
 generate-python:
-	if [ ! -f "/go/bin/protoc-gen-connect-python" ]; then \
-		$(MAKE) -C packages/connect-python build; \
-	fi
-	cd packages/python-sdk && make generate-api
-	cd spec/envd && buf generate --template buf-python.gen.yaml
-	cd packages/python-sdk && ./scripts/fix-python-pb.sh && black .
+	cd packages/python-sdk && make generate
 
 .PHONY: init-styles
 init-styles:
 	vale sync
+

codegen.Dockerfile

@@ -4,7 +4,7 @@ FROM golang:1.23
 RUN go install github.com/bufbuild/buf/cmd/buf@v1.50.1 && \
     go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 && \
     go install connectrpc.com/connect/cmd/protoc-gen-connect-go@v1.18.1
-    
+
 # Install our custom protoc plugin, connect-python
 COPY ./packages/connect-python /packages/connect-python
 RUN cd /packages/connect-python && make bin/protoc-gen-connect-python
@@ -38,7 +38,8 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Install Node.js deps
-RUN npm install -g pnpm @connectrpc/protoc-gen-connect-es@1.6.1 @bufbuild/protoc-gen-es@2.2.2
+RUN npm install -g pnpm @connectrpc/protoc-gen-connect-es@1.6.1 @bufbuild/protoc-gen-es@2.6.2
 
+RUN pnpm i
 # Generate when container starts
 CMD ["make", "generate"]

packages/js-sdk/package.json

@@ -28,8 +28,9 @@
     "dev": "tsup --watch",
     "example": "tsx example.mts",
     "test": "vitest run",
-    "generate": "python ./../../spec/remove_extra_tags.py sandboxes templates auth && openapi-typescript ../../spec/openapi_generated.yml -x api_key --array-length --alphabetize --output src/api/schema.gen.ts",
-    "generate-envd-api": "openapi-typescript ../../spec/envd/envd.yaml -x api_key --array-length --alphabetize --output src/envd/schema.gen.ts",
+    "generate":"npm-run-all generate:*",
+    "generate:api": "python ./../../spec/remove_extra_tags.py sandboxes templates auth && openapi-typescript ../../spec/openapi_generated.yml -x api_key --array-length --alphabetize --output src/api/schema.gen.ts",
+    "generate:envd-api": "openapi-typescript ../../spec/envd/envd.yaml -x api_key --array-length --alphabetize --output src/envd/schema.gen.ts",
     "generate-ref": "./scripts/generate_sdk_ref.sh",
     "check-deps": "knip",
     "update-deps": "ncu -u && pnpm i",
@@ -52,6 +53,7 @@
     "eslint": "^8.57.1",
     "knip": "^5.43.6",
     "npm-check-updates": "^16.14.20",
+    "npm-run-all": "^4.1.5",
     "openapi-typescript": "^7.6.1",
     "playwright": "^1.48.0",
     "react": "^18.3.1",
@@ -82,7 +84,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.2",
+    "@bufbuild/protobuf": "^2.6.2",
     "@connectrpc/connect": "2.0.0-rc.3",
     "@connectrpc/connect-web": "2.0.0-rc.3",
     "compare-versions": "^6.1.0",

packages/python-sdk/Makefile

@@ -4,6 +4,19 @@ generate-api:
 	rm -rf e2b/api/client
 	mv e2b/api/api/e2b_api_client e2b/api/client
 	rm -rf e2b/api/api
+	black .
+
+generate-envd:
+	if [ ! -f "/go/bin/protoc-gen-connect-python" ]; then \
+		$(MAKE) -C packages/connect-python build; \
+	fi
+
+	cd ./../../spec/envd && buf generate --template buf-python.gen.yaml
+	black .
+
+generate: generate-api generate-envd
+	./scripts/fix-python-pb.sh
+	black .
 
 init:
 	pip install openapi-python-client