📦️ Include operator in rig-go-api

.github/workflows/main-proto.yml

@@ -73,7 +73,6 @@ jobs:
           cd rig-go-api
           rm -fr api/ model/
           cp -R ../gen/go/rig/* .
-          cp -r ../gen/go/operator .
           git config user.name "rig-bot"
           git config user.email "shared@rig.dev"
           git add .

Makefile

@@ -29,28 +29,28 @@ build-rig-operator: ## 🔨 Build rig-operator binary
 gen: proto manifests generate-k8s ## 🪄 Run code generation (proto and k8s)
 
 .PHONY: proto
-proto: proto-internal proto-public proto-operator ## 🪄 Generate all protobuf
+proto: proto-internal proto-public ## 🪄 Generate all protobuf
 
 gen/go/rig/go.mod:
 	@mkdir -p gen/go/rig
 	@printf "module github.com/rigdev/rig-go-api\n\ngo 1.20\n" > $@
 
 .PHONY: proto-internal
 proto-internal: buf protoc-gen-go protoc-gen-connect-go ## 🪄 Generate internal protobuf
-	@find . -path './gen/go/*' -not -path './gen/go/rig/*' -not -path './gen/go/operator/*' -type f -name '*.go' -delete
+	@find . \
+		-path './gen/go/*' \
+		-not -path './gen/go/rig/*' \
+		-type f -name '*.go' -delete
 	$(BUF) generate proto/internal --template proto/buf.gen.internal.yaml
 
 .PHONY: proto-public
 proto-public: gen/go/rig/go.mod buf protoc-gen-go protoc-gen-connect-go ## 🪄 Generate public protobuf
-	@find . -path './gen/go/rig/*' -type f -name '*.go' -delete
+	@find . \
+		-path './gen/go/rig/*' \
+		-type f -name '*.go' -delete
 	$(BUF) generate proto/rig --template proto/buf.gen.yaml
 	@(cd gen/go/rig/; go get -u ./...)
 
-.PHONY: proto-operator
-proto-operator: buf protoc-gen-go protoc-gen-connect-go ## 🪄 Generate operator protobuf
-	@find . -path './gen/go/operator/*' -type f -name '*.go' -delete
-	$(BUF) generate proto/operator --template proto/buf.gen.operator.yaml
-
 .PHONY: manifests
 manifests: controller-gen ## 🪄 Generate k8s manifests
 	$(CONTROLLER_GEN) rbac:roleName=rig crd webhook \

build/package/Dockerfile

@@ -12,12 +12,17 @@ COPY go.mod go.sum Makefile ./
 COPY tools tools
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
+    make \
+        gen/go/rig/go.mod \
+        buf \
+        protoc-gen-go \
+        protoc-gen-connect-go && \
     go mod download # && go mod verify
 
 COPY . .
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
-    make proto-operator build-rig-operator
+    make proto build-rig-operator
 
 FROM scratch
 

build/package/Dockerfile.dockerignore

@@ -1,6 +1,8 @@
 *
 !/go.mod
 !/go.sum
+!/go.work
+!/go.work.sum
 !/Makefile
 !/tools/go.mod
 !/tools/go.sum

cmd/rig-operator/main.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
-	"github.com/rigdev/rig/gen/go/operator/api/v1/capabilities/capabilitiesconnect"
+	"github.com/rigdev/rig-go-api/operator/api/v1/capabilities/capabilitiesconnect"
 	"github.com/rigdev/rig/pkg/build"
 	"github.com/rigdev/rig/pkg/handler/api/capabilities"
 	"github.com/rigdev/rig/pkg/manager"

pkg/handler/api/capabilities/handler.go

@@ -5,8 +5,8 @@ import (
 
 	connect "github.com/bufbuild/connect-go"
 
-	"github.com/rigdev/rig/gen/go/operator/api/v1/capabilities"
-	"github.com/rigdev/rig/gen/go/operator/api/v1/capabilities/capabilitiesconnect"
+	"github.com/rigdev/rig-go-api/operator/api/v1/capabilities"
+	"github.com/rigdev/rig-go-api/operator/api/v1/capabilities/capabilitiesconnect"
 	svccapabilities "github.com/rigdev/rig/pkg/service/capabilities"
 )
 

pkg/service/capabilities/capabilities.go

@@ -3,7 +3,7 @@ package capabilities
 import (
 	"context"
 
-	"github.com/rigdev/rig/gen/go/operator/api/v1/capabilities"
+	"github.com/rigdev/rig-go-api/operator/api/v1/capabilities"
 	"github.com/rigdev/rig/pkg/service/config"
 )
 

pkg/service/capabilities/capabilities_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/rigdev/rig/gen/go/operator/api/v1/capabilities"
+	"github.com/rigdev/rig-go-api/operator/api/v1/capabilities"
 	"github.com/rigdev/rig/pkg/api/config/v1alpha1"
 	svccapabilities "github.com/rigdev/rig/pkg/service/capabilities"
 	"github.com/stretchr/testify/assert"

proto/buf.work.yaml

@@ -2,4 +2,3 @@ version: v1
 directories:
   - rig
   - internal
-  - operator