Skip to content

Commit 2294c55

Browse files
dannykoppingdannykopping
authored
chore: graduate aibridged* packages out of experimental (#20522)
<!-- If you have used AI to produce some or all of this PR, please ensure you have read our [AI Contribution guidelines](https://coder.com/docs/about/contributing/AI_CONTRIBUTING) before submitting. -->
1 parent aad1b40 commit 2294c55

26 files changed

+382
-383
lines changed

‎Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -636,16 +636,16 @@ TAILNETTEST_MOCKS := \
636636
tailnet/tailnettest/subscriptionmock.go
637637

638638
AIBRIDGED_MOCKS := \
639-
enterprise/x/aibridged/aibridgedmock/clientmock.go \
640-
enterprise/x/aibridged/aibridgedmock/poolmock.go
639+
enterprise/aibridged/aibridgedmock/clientmock.go \
640+
enterprise/aibridged/aibridgedmock/poolmock.go
641641

642642
GEN_FILES := \
643643
tailnet/proto/tailnet.pb.go \
644644
agent/proto/agent.pb.go \
645645
provisionersdk/proto/provisioner.pb.go \
646646
provisionerd/proto/provisionerd.pb.go \
647647
vpn/vpn.pb.go \
648-
enterprise/x/aibridged/proto/aibridged.pb.go \
648+
enterprise/aibridged/proto/aibridged.pb.go \
649649
$(DB_GEN_FILES) \
650650
$(SITE_GEN_FILES) \
651651
coderd/rbac/object_gen.go \
@@ -697,7 +697,7 @@ gen/mark-fresh:
697697
provisionersdk/proto/provisioner.pb.go \
698698
provisionerd/proto/provisionerd.pb.go \
699699
vpn/vpn.pb.go \
700-
enterprise/x/aibridged/proto/aibridged.pb.go \
700+
enterprise/aibridged/proto/aibridged.pb.go \
701701
coderd/database/dump.sql \
702702
$(DB_GEN_FILES) \
703703
site/src/api/typesGenerated.ts \
@@ -768,8 +768,8 @@ codersdk/workspacesdk/agentconnmock/agentconnmock.go: codersdk/workspacesdk/agen
768768
go generate ./codersdk/workspacesdk/agentconnmock/
769769
touch "$@"
770770

771-
$(AIBRIDGED_MOCKS): enterprise/x/aibridged/client.go enterprise/x/aibridged/pool.go
772-
go generate ./enterprise/x/aibridged/aibridgedmock/
771+
$(AIBRIDGED_MOCKS): enterprise/aibridged/client.go enterprise/aibridged/pool.go
772+
go generate ./enterprise/aibridged/aibridgedmock/
773773
touch "$@"
774774

775775
agent/agentcontainers/dcspec/dcspec_gen.go: \
@@ -822,13 +822,13 @@ vpn/vpn.pb.go: vpn/vpn.proto
822822
--go_opt=paths=source_relative \
823823
./vpn/vpn.proto
824824

825-
enterprise/x/aibridged/proto/aibridged.pb.go: enterprise/x/aibridged/proto/aibridged.proto
825+
enterprise/aibridged/proto/aibridged.pb.go: enterprise/aibridged/proto/aibridged.proto
826826
protoc \
827827
--go_out=. \
828828
--go_opt=paths=source_relative \
829829
--go-drpc_out=. \
830830
--go-drpc_opt=paths=source_relative \
831-
./enterprise/x/aibridged/proto/aibridged.proto
831+
./enterprise/aibridged/proto/aibridged.proto
832832

833833
site/src/api/typesGenerated.ts: site/node_modules/.installed $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
834834
# -C sets the directory for the go run command

enterprise/x/aibridged/aibridged.go renamed to enterprise/aibridged/aibridged.go

File renamed without changes.

enterprise/x/aibridged/aibridged_integration_test.go renamed to enterprise/aibridged/aibridged_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/coder/coder/v2/coderd/database/dbtime"
2020
"github.com/coder/coder/v2/coderd/externalauth"
2121
"github.com/coder/coder/v2/codersdk"
22+
"github.com/coder/coder/v2/enterprise/aibridged"
2223
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
23-
"github.com/coder/coder/v2/enterprise/x/aibridged"
2424
"github.com/coder/coder/v2/testutil"
2525
)
2626

enterprise/x/aibridged/aibridged_test.go renamed to enterprise/aibridged/aibridged_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"cdr.dev/slog/sloggers/slogtest"
1919
"github.com/coder/aibridge"
2020
"github.com/coder/coder/v2/codersdk"
21-
"github.com/coder/coder/v2/enterprise/x/aibridged"
22-
mock "github.com/coder/coder/v2/enterprise/x/aibridged/aibridgedmock"
23-
"github.com/coder/coder/v2/enterprise/x/aibridged/proto"
21+
"github.com/coder/coder/v2/enterprise/aibridged"
22+
mock "github.com/coder/coder/v2/enterprise/aibridged/aibridgedmock"
23+
"github.com/coder/coder/v2/enterprise/aibridged/proto"
2424
"github.com/coder/coder/v2/testutil"
2525
)
2626

enterprise/x/aibridged/aibridgedmock/clientmock.go renamed to enterprise/aibridged/aibridgedmock/clientmock.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

enterprise/x/aibridged/aibridgedmock/doc.go renamed to enterprise/aibridged/aibridgedmock/doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package aibridgedmock
22

3-
//go:generate mockgen -destination ./clientmock.go -package aibridgedmock github.com/coder/coder/v2/enterprise/x/aibridged DRPCClient
4-
//go:generate mockgen -destination ./poolmock.go -package aibridgedmock github.com/coder/coder/v2/enterprise/x/aibridged Pooler
3+
//go:generate mockgen -destination ./clientmock.go -package aibridgedmock github.com/coder/coder/v2/enterprise/aibridged DRPCClient
4+
//go:generate mockgen -destination ./poolmock.go -package aibridgedmock github.com/coder/coder/v2/enterprise/aibridged Pooler

enterprise/x/aibridged/aibridgedmock/poolmock.go renamed to enterprise/aibridged/aibridgedmock/poolmock.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

enterprise/x/aibridged/client.go renamed to enterprise/aibridged/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"storj.io/drpc"
77

8-
"github.com/coder/coder/v2/enterprise/x/aibridged/proto"
8+
"github.com/coder/coder/v2/enterprise/aibridged/proto"
99
)
1010

1111
type Dialer func(ctx context.Context) (DRPCClient, error)

enterprise/x/aibridged/http.go renamed to enterprise/aibridged/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"cdr.dev/slog"
1111
"github.com/coder/aibridge"
12-
"github.com/coder/coder/v2/enterprise/x/aibridged/proto"
12+
"github.com/coder/coder/v2/enterprise/aibridged/proto"
1313
)
1414

1515
var _ http.Handler = &Server{}

enterprise/x/aibridged/mcp.go renamed to enterprise/aibridged/mcp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"cdr.dev/slog"
1212
"github.com/coder/aibridge/mcp"
13-
"github.com/coder/coder/v2/enterprise/x/aibridged/proto"
13+
"github.com/coder/coder/v2/enterprise/aibridged/proto"
1414
)
1515

1616
var (

0 commit comments

Comments
 (0)