Skip to content

[pull] main from coder:main #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2025
Merged

[pull] main from coder:main #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb2c195
chore(cli): remove dbmem from tests (#18195)
hugodutka Jun 5, 2025
277c2c7
chore(coderd/prometheusmetrics): remove dbmem from tests (#18238)
hugodutka Jun 5, 2025
b5fd3dd
feat(coderd/agentapi): allow inserting apps for sub agents (#18129)
DanielleMaywood Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,059 changes: 779 additions & 280 deletions agent/proto/agent.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions agent/proto/agent.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,52 @@ message CreateSubAgentRequest {
string directory = 2;
string architecture = 3;
string operating_system = 4;

message App {
message Healthcheck {
int32 interval = 1;
int32 threshold = 2;
string url = 3;
}

enum OpenIn {
SLIM_WINDOW = 0;
TAB = 1;
}

enum Share {
OWNER = 0;
AUTHENTICATED = 1;
PUBLIC = 2;
}

string slug = 1;
optional string command = 2;
optional string display_name = 3;
optional bool external = 4;
optional string group = 5;
optional Healthcheck healthcheck = 6;
optional bool hidden = 7;
optional string icon = 8;
optional OpenIn open_in = 9;
optional int32 order = 10;
optional Share share = 11;
optional bool subdomain = 12;
optional string url = 13;
}

repeated App apps = 5;
}

message CreateSubAgentResponse {
message AppCreationError {
int32 index = 1;
optional string field = 2;
string error = 3;
}

SubAgent agent = 1;
repeated AppCreationError app_creation_errors = 2;
}

message DeleteSubAgentRequest {
Expand Down
4 changes: 2 additions & 2 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,9 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
AppHostname: appHostname,
AppHostnameRegex: appHostnameRegex,
Logger: logger.Named("coderd"),
Database: dbmem.New(),
Database: nil,
BaseDERPMap: derpMap,
Pubsub: pubsub.NewInMemory(),
Pubsub: nil,
CacheDir: cacheDir,
GoogleTokenValidator: googleTokenValidator,
ExternalAuthConfigs: externalAuthConfigs,
Expand Down
Loading
Loading