From 03e5a9edff11e1c3182c6ae814d8e8d79e5d2c6d Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Sun, 29 Dec 2024 12:41:18 +0000 Subject: [PATCH 1/8] chore(Makefile) ignore non go source files when running make fmt/go --- Makefile | 4 +- agent/proto/agent.pb.go | 111 ++++++++++---------- agent/proto/agent_drpc.pb.go | 1 + coderd/database/models.go | 6 +- provisionerd/proto/provisionerd.pb.go | 81 +++++++------- provisionerd/proto/provisionerd_drpc.pb.go | 1 + provisionersdk/proto/provisioner.pb.go | 93 ++++++++-------- provisionersdk/proto/provisioner_drpc.pb.go | 1 + tailnet/proto/tailnet.pb.go | 97 ++++++++--------- tailnet/proto/tailnet_drpc.pb.go | 1 + vpn/vpn.pb.go | 63 +++++------ 11 files changed, 237 insertions(+), 222 deletions(-) diff --git a/Makefile b/Makefile index 163d1ba16c991..4c45b12ac2f35 100644 --- a/Makefile +++ b/Makefile @@ -422,7 +422,7 @@ fmt/go: echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET)" # VS Code users should check out # https://github.com/mvdan/gofumpt#visual-studio-code - go run mvdan.cc/gofumpt@v0.4.0 -w -l . + go run mvdan.cc/gofumpt@v0.4.0 -w -l $(GO_SRC_FILES) .PHONY: fmt/go fmt/ts: @@ -642,8 +642,6 @@ vpn/vpn.pb.go: vpn/vpn.proto site/src/api/typesGenerated.ts: $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go') # -C sets the directory for the go run command go run -C ./scripts/apitypings main.go > $@ - (cd ./site && npx biome format --write ./src/api/typesGenerated.ts) - ./scripts/pnpm_install.sh site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go cd site diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go index 8063b42f3b622..6cb59a059cd11 100644 --- a/agent/proto/agent.pb.go +++ b/agent/proto/agent.pb.go @@ -7,13 +7,14 @@ package proto import ( + reflect "reflect" + sync "sync" + proto "github.com/coder/coder/v2/tailnet/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( @@ -3179,58 +3180,60 @@ func file_agent_proto_agent_proto_rawDescGZIP() []byte { return file_agent_proto_agent_proto_rawDescData } -var file_agent_proto_agent_proto_enumTypes = make([]protoimpl.EnumInfo, 9) -var file_agent_proto_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 36) -var file_agent_proto_agent_proto_goTypes = []interface{}{ - (AppHealth)(0), // 0: coder.agent.v2.AppHealth - (WorkspaceApp_SharingLevel)(0), // 1: coder.agent.v2.WorkspaceApp.SharingLevel - (WorkspaceApp_Health)(0), // 2: coder.agent.v2.WorkspaceApp.Health - (Stats_Metric_Type)(0), // 3: coder.agent.v2.Stats.Metric.Type - (Lifecycle_State)(0), // 4: coder.agent.v2.Lifecycle.State - (Startup_Subsystem)(0), // 5: coder.agent.v2.Startup.Subsystem - (Log_Level)(0), // 6: coder.agent.v2.Log.Level - (Timing_Stage)(0), // 7: coder.agent.v2.Timing.Stage - (Timing_Status)(0), // 8: coder.agent.v2.Timing.Status - (*WorkspaceApp)(nil), // 9: coder.agent.v2.WorkspaceApp - (*WorkspaceAgentScript)(nil), // 10: coder.agent.v2.WorkspaceAgentScript - (*WorkspaceAgentMetadata)(nil), // 11: coder.agent.v2.WorkspaceAgentMetadata - (*Manifest)(nil), // 12: coder.agent.v2.Manifest - (*GetManifestRequest)(nil), // 13: coder.agent.v2.GetManifestRequest - (*ServiceBanner)(nil), // 14: coder.agent.v2.ServiceBanner - (*GetServiceBannerRequest)(nil), // 15: coder.agent.v2.GetServiceBannerRequest - (*Stats)(nil), // 16: coder.agent.v2.Stats - (*UpdateStatsRequest)(nil), // 17: coder.agent.v2.UpdateStatsRequest - (*UpdateStatsResponse)(nil), // 18: coder.agent.v2.UpdateStatsResponse - (*Lifecycle)(nil), // 19: coder.agent.v2.Lifecycle - (*UpdateLifecycleRequest)(nil), // 20: coder.agent.v2.UpdateLifecycleRequest - (*BatchUpdateAppHealthRequest)(nil), // 21: coder.agent.v2.BatchUpdateAppHealthRequest - (*BatchUpdateAppHealthResponse)(nil), // 22: coder.agent.v2.BatchUpdateAppHealthResponse - (*Startup)(nil), // 23: coder.agent.v2.Startup - (*UpdateStartupRequest)(nil), // 24: coder.agent.v2.UpdateStartupRequest - (*Metadata)(nil), // 25: coder.agent.v2.Metadata - (*BatchUpdateMetadataRequest)(nil), // 26: coder.agent.v2.BatchUpdateMetadataRequest - (*BatchUpdateMetadataResponse)(nil), // 27: coder.agent.v2.BatchUpdateMetadataResponse - (*Log)(nil), // 28: coder.agent.v2.Log - (*BatchCreateLogsRequest)(nil), // 29: coder.agent.v2.BatchCreateLogsRequest - (*BatchCreateLogsResponse)(nil), // 30: coder.agent.v2.BatchCreateLogsResponse - (*GetAnnouncementBannersRequest)(nil), // 31: coder.agent.v2.GetAnnouncementBannersRequest - (*GetAnnouncementBannersResponse)(nil), // 32: coder.agent.v2.GetAnnouncementBannersResponse - (*BannerConfig)(nil), // 33: coder.agent.v2.BannerConfig - (*WorkspaceAgentScriptCompletedRequest)(nil), // 34: coder.agent.v2.WorkspaceAgentScriptCompletedRequest - (*WorkspaceAgentScriptCompletedResponse)(nil), // 35: coder.agent.v2.WorkspaceAgentScriptCompletedResponse - (*Timing)(nil), // 36: coder.agent.v2.Timing - (*WorkspaceApp_Healthcheck)(nil), // 37: coder.agent.v2.WorkspaceApp.Healthcheck - (*WorkspaceAgentMetadata_Result)(nil), // 38: coder.agent.v2.WorkspaceAgentMetadata.Result - (*WorkspaceAgentMetadata_Description)(nil), // 39: coder.agent.v2.WorkspaceAgentMetadata.Description - nil, // 40: coder.agent.v2.Manifest.EnvironmentVariablesEntry - nil, // 41: coder.agent.v2.Stats.ConnectionsByProtoEntry - (*Stats_Metric)(nil), // 42: coder.agent.v2.Stats.Metric - (*Stats_Metric_Label)(nil), // 43: coder.agent.v2.Stats.Metric.Label - (*BatchUpdateAppHealthRequest_HealthUpdate)(nil), // 44: coder.agent.v2.BatchUpdateAppHealthRequest.HealthUpdate - (*durationpb.Duration)(nil), // 45: google.protobuf.Duration - (*proto.DERPMap)(nil), // 46: coder.tailnet.v2.DERPMap - (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp -} +var ( + file_agent_proto_agent_proto_enumTypes = make([]protoimpl.EnumInfo, 9) + file_agent_proto_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 36) + file_agent_proto_agent_proto_goTypes = []interface{}{ + (AppHealth)(0), // 0: coder.agent.v2.AppHealth + (WorkspaceApp_SharingLevel)(0), // 1: coder.agent.v2.WorkspaceApp.SharingLevel + (WorkspaceApp_Health)(0), // 2: coder.agent.v2.WorkspaceApp.Health + (Stats_Metric_Type)(0), // 3: coder.agent.v2.Stats.Metric.Type + (Lifecycle_State)(0), // 4: coder.agent.v2.Lifecycle.State + (Startup_Subsystem)(0), // 5: coder.agent.v2.Startup.Subsystem + (Log_Level)(0), // 6: coder.agent.v2.Log.Level + (Timing_Stage)(0), // 7: coder.agent.v2.Timing.Stage + (Timing_Status)(0), // 8: coder.agent.v2.Timing.Status + (*WorkspaceApp)(nil), // 9: coder.agent.v2.WorkspaceApp + (*WorkspaceAgentScript)(nil), // 10: coder.agent.v2.WorkspaceAgentScript + (*WorkspaceAgentMetadata)(nil), // 11: coder.agent.v2.WorkspaceAgentMetadata + (*Manifest)(nil), // 12: coder.agent.v2.Manifest + (*GetManifestRequest)(nil), // 13: coder.agent.v2.GetManifestRequest + (*ServiceBanner)(nil), // 14: coder.agent.v2.ServiceBanner + (*GetServiceBannerRequest)(nil), // 15: coder.agent.v2.GetServiceBannerRequest + (*Stats)(nil), // 16: coder.agent.v2.Stats + (*UpdateStatsRequest)(nil), // 17: coder.agent.v2.UpdateStatsRequest + (*UpdateStatsResponse)(nil), // 18: coder.agent.v2.UpdateStatsResponse + (*Lifecycle)(nil), // 19: coder.agent.v2.Lifecycle + (*UpdateLifecycleRequest)(nil), // 20: coder.agent.v2.UpdateLifecycleRequest + (*BatchUpdateAppHealthRequest)(nil), // 21: coder.agent.v2.BatchUpdateAppHealthRequest + (*BatchUpdateAppHealthResponse)(nil), // 22: coder.agent.v2.BatchUpdateAppHealthResponse + (*Startup)(nil), // 23: coder.agent.v2.Startup + (*UpdateStartupRequest)(nil), // 24: coder.agent.v2.UpdateStartupRequest + (*Metadata)(nil), // 25: coder.agent.v2.Metadata + (*BatchUpdateMetadataRequest)(nil), // 26: coder.agent.v2.BatchUpdateMetadataRequest + (*BatchUpdateMetadataResponse)(nil), // 27: coder.agent.v2.BatchUpdateMetadataResponse + (*Log)(nil), // 28: coder.agent.v2.Log + (*BatchCreateLogsRequest)(nil), // 29: coder.agent.v2.BatchCreateLogsRequest + (*BatchCreateLogsResponse)(nil), // 30: coder.agent.v2.BatchCreateLogsResponse + (*GetAnnouncementBannersRequest)(nil), // 31: coder.agent.v2.GetAnnouncementBannersRequest + (*GetAnnouncementBannersResponse)(nil), // 32: coder.agent.v2.GetAnnouncementBannersResponse + (*BannerConfig)(nil), // 33: coder.agent.v2.BannerConfig + (*WorkspaceAgentScriptCompletedRequest)(nil), // 34: coder.agent.v2.WorkspaceAgentScriptCompletedRequest + (*WorkspaceAgentScriptCompletedResponse)(nil), // 35: coder.agent.v2.WorkspaceAgentScriptCompletedResponse + (*Timing)(nil), // 36: coder.agent.v2.Timing + (*WorkspaceApp_Healthcheck)(nil), // 37: coder.agent.v2.WorkspaceApp.Healthcheck + (*WorkspaceAgentMetadata_Result)(nil), // 38: coder.agent.v2.WorkspaceAgentMetadata.Result + (*WorkspaceAgentMetadata_Description)(nil), // 39: coder.agent.v2.WorkspaceAgentMetadata.Description + nil, // 40: coder.agent.v2.Manifest.EnvironmentVariablesEntry + nil, // 41: coder.agent.v2.Stats.ConnectionsByProtoEntry + (*Stats_Metric)(nil), // 42: coder.agent.v2.Stats.Metric + (*Stats_Metric_Label)(nil), // 43: coder.agent.v2.Stats.Metric.Label + (*BatchUpdateAppHealthRequest_HealthUpdate)(nil), // 44: coder.agent.v2.BatchUpdateAppHealthRequest.HealthUpdate + (*durationpb.Duration)(nil), // 45: google.protobuf.Duration + (*proto.DERPMap)(nil), // 46: coder.tailnet.v2.DERPMap + (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp + } +) var file_agent_proto_agent_proto_depIdxs = []int32{ 1, // 0: coder.agent.v2.WorkspaceApp.sharing_level:type_name -> coder.agent.v2.WorkspaceApp.SharingLevel 37, // 1: coder.agent.v2.WorkspaceApp.healthcheck:type_name -> coder.agent.v2.WorkspaceApp.Healthcheck diff --git a/agent/proto/agent_drpc.pb.go b/agent/proto/agent_drpc.pb.go index 7bb1957230d76..2ec708203920b 100644 --- a/agent/proto/agent_drpc.pb.go +++ b/agent/proto/agent_drpc.pb.go @@ -7,6 +7,7 @@ package proto import ( context "context" errors "errors" + protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/coderd/database/models.go b/coderd/database/models.go index e5ddebcbc8b9a..78948974bfd1b 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -517,8 +517,7 @@ func (ns NullGroupSource) Value() (driver.Value, error) { func (e GroupSource) Valid() bool { switch e { - case GroupSourceUser, - GroupSourceOidc: + case GroupSourceUser, GroupSourceOidc: return true } return false @@ -1732,8 +1731,7 @@ func (ns NullTailnetStatus) Value() (driver.Value, error) { func (e TailnetStatus) Valid() bool { switch e { - case TailnetStatusOk, - TailnetStatusLost: + case TailnetStatusOk, TailnetStatusLost: return true } return false diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 7f5e39a85a8fa..0796c94666a9b 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -7,11 +7,12 @@ package proto import ( + reflect "reflect" + sync "sync" + proto "github.com/coder/coder/v2/provisionersdk/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -1734,43 +1735,45 @@ func file_provisionerd_proto_provisionerd_proto_rawDescGZIP() []byte { return file_provisionerd_proto_provisionerd_proto_rawDescData } -var file_provisionerd_proto_provisionerd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_provisionerd_proto_provisionerd_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_provisionerd_proto_provisionerd_proto_goTypes = []interface{}{ - (LogSource)(0), // 0: provisionerd.LogSource - (*Empty)(nil), // 1: provisionerd.Empty - (*AcquiredJob)(nil), // 2: provisionerd.AcquiredJob - (*FailedJob)(nil), // 3: provisionerd.FailedJob - (*CompletedJob)(nil), // 4: provisionerd.CompletedJob - (*Log)(nil), // 5: provisionerd.Log - (*UpdateJobRequest)(nil), // 6: provisionerd.UpdateJobRequest - (*UpdateJobResponse)(nil), // 7: provisionerd.UpdateJobResponse - (*CommitQuotaRequest)(nil), // 8: provisionerd.CommitQuotaRequest - (*CommitQuotaResponse)(nil), // 9: provisionerd.CommitQuotaResponse - (*CancelAcquire)(nil), // 10: provisionerd.CancelAcquire - (*AcquiredJob_WorkspaceBuild)(nil), // 11: provisionerd.AcquiredJob.WorkspaceBuild - (*AcquiredJob_TemplateImport)(nil), // 12: provisionerd.AcquiredJob.TemplateImport - (*AcquiredJob_TemplateDryRun)(nil), // 13: provisionerd.AcquiredJob.TemplateDryRun - nil, // 14: provisionerd.AcquiredJob.TraceMetadataEntry - (*FailedJob_WorkspaceBuild)(nil), // 15: provisionerd.FailedJob.WorkspaceBuild - (*FailedJob_TemplateImport)(nil), // 16: provisionerd.FailedJob.TemplateImport - (*FailedJob_TemplateDryRun)(nil), // 17: provisionerd.FailedJob.TemplateDryRun - (*CompletedJob_WorkspaceBuild)(nil), // 18: provisionerd.CompletedJob.WorkspaceBuild - (*CompletedJob_TemplateImport)(nil), // 19: provisionerd.CompletedJob.TemplateImport - (*CompletedJob_TemplateDryRun)(nil), // 20: provisionerd.CompletedJob.TemplateDryRun - nil, // 21: provisionerd.UpdateJobRequest.WorkspaceTagsEntry - (proto.LogLevel)(0), // 22: provisioner.LogLevel - (*proto.TemplateVariable)(nil), // 23: provisioner.TemplateVariable - (*proto.VariableValue)(nil), // 24: provisioner.VariableValue - (*proto.RichParameterValue)(nil), // 25: provisioner.RichParameterValue - (*proto.ExternalAuthProvider)(nil), // 26: provisioner.ExternalAuthProvider - (*proto.Metadata)(nil), // 27: provisioner.Metadata - (*proto.Timing)(nil), // 28: provisioner.Timing - (*proto.Resource)(nil), // 29: provisioner.Resource - (*proto.Module)(nil), // 30: provisioner.Module - (*proto.RichParameter)(nil), // 31: provisioner.RichParameter - (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource -} +var ( + file_provisionerd_proto_provisionerd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) + file_provisionerd_proto_provisionerd_proto_msgTypes = make([]protoimpl.MessageInfo, 21) + file_provisionerd_proto_provisionerd_proto_goTypes = []interface{}{ + (LogSource)(0), // 0: provisionerd.LogSource + (*Empty)(nil), // 1: provisionerd.Empty + (*AcquiredJob)(nil), // 2: provisionerd.AcquiredJob + (*FailedJob)(nil), // 3: provisionerd.FailedJob + (*CompletedJob)(nil), // 4: provisionerd.CompletedJob + (*Log)(nil), // 5: provisionerd.Log + (*UpdateJobRequest)(nil), // 6: provisionerd.UpdateJobRequest + (*UpdateJobResponse)(nil), // 7: provisionerd.UpdateJobResponse + (*CommitQuotaRequest)(nil), // 8: provisionerd.CommitQuotaRequest + (*CommitQuotaResponse)(nil), // 9: provisionerd.CommitQuotaResponse + (*CancelAcquire)(nil), // 10: provisionerd.CancelAcquire + (*AcquiredJob_WorkspaceBuild)(nil), // 11: provisionerd.AcquiredJob.WorkspaceBuild + (*AcquiredJob_TemplateImport)(nil), // 12: provisionerd.AcquiredJob.TemplateImport + (*AcquiredJob_TemplateDryRun)(nil), // 13: provisionerd.AcquiredJob.TemplateDryRun + nil, // 14: provisionerd.AcquiredJob.TraceMetadataEntry + (*FailedJob_WorkspaceBuild)(nil), // 15: provisionerd.FailedJob.WorkspaceBuild + (*FailedJob_TemplateImport)(nil), // 16: provisionerd.FailedJob.TemplateImport + (*FailedJob_TemplateDryRun)(nil), // 17: provisionerd.FailedJob.TemplateDryRun + (*CompletedJob_WorkspaceBuild)(nil), // 18: provisionerd.CompletedJob.WorkspaceBuild + (*CompletedJob_TemplateImport)(nil), // 19: provisionerd.CompletedJob.TemplateImport + (*CompletedJob_TemplateDryRun)(nil), // 20: provisionerd.CompletedJob.TemplateDryRun + nil, // 21: provisionerd.UpdateJobRequest.WorkspaceTagsEntry + (proto.LogLevel)(0), // 22: provisioner.LogLevel + (*proto.TemplateVariable)(nil), // 23: provisioner.TemplateVariable + (*proto.VariableValue)(nil), // 24: provisioner.VariableValue + (*proto.RichParameterValue)(nil), // 25: provisioner.RichParameterValue + (*proto.ExternalAuthProvider)(nil), // 26: provisioner.ExternalAuthProvider + (*proto.Metadata)(nil), // 27: provisioner.Metadata + (*proto.Timing)(nil), // 28: provisioner.Timing + (*proto.Resource)(nil), // 29: provisioner.Resource + (*proto.Module)(nil), // 30: provisioner.Module + (*proto.RichParameter)(nil), // 31: provisioner.RichParameter + (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource + } +) var file_provisionerd_proto_provisionerd_proto_depIdxs = []int32{ 11, // 0: provisionerd.AcquiredJob.workspace_build:type_name -> provisionerd.AcquiredJob.WorkspaceBuild 12, // 1: provisionerd.AcquiredJob.template_import:type_name -> provisionerd.AcquiredJob.TemplateImport diff --git a/provisionerd/proto/provisionerd_drpc.pb.go b/provisionerd/proto/provisionerd_drpc.pb.go index 60d78a86acb17..06e687d2286f8 100644 --- a/provisionerd/proto/provisionerd_drpc.pb.go +++ b/provisionerd/proto/provisionerd_drpc.pb.go @@ -7,6 +7,7 @@ package proto import ( context "context" errors "errors" + protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 026939d17120e..63e79634972dc 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -7,11 +7,12 @@ package proto import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( @@ -3412,49 +3413,51 @@ func file_provisionersdk_proto_provisioner_proto_rawDescGZIP() []byte { return file_provisionersdk_proto_provisioner_proto_rawDescData } -var file_provisionersdk_proto_provisioner_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 34) -var file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ - (LogLevel)(0), // 0: provisioner.LogLevel - (AppSharingLevel)(0), // 1: provisioner.AppSharingLevel - (WorkspaceTransition)(0), // 2: provisioner.WorkspaceTransition - (TimingState)(0), // 3: provisioner.TimingState - (*Empty)(nil), // 4: provisioner.Empty - (*TemplateVariable)(nil), // 5: provisioner.TemplateVariable - (*RichParameterOption)(nil), // 6: provisioner.RichParameterOption - (*RichParameter)(nil), // 7: provisioner.RichParameter - (*RichParameterValue)(nil), // 8: provisioner.RichParameterValue - (*VariableValue)(nil), // 9: provisioner.VariableValue - (*Log)(nil), // 10: provisioner.Log - (*InstanceIdentityAuth)(nil), // 11: provisioner.InstanceIdentityAuth - (*ExternalAuthProviderResource)(nil), // 12: provisioner.ExternalAuthProviderResource - (*ExternalAuthProvider)(nil), // 13: provisioner.ExternalAuthProvider - (*Agent)(nil), // 14: provisioner.Agent - (*DisplayApps)(nil), // 15: provisioner.DisplayApps - (*Env)(nil), // 16: provisioner.Env - (*Script)(nil), // 17: provisioner.Script - (*App)(nil), // 18: provisioner.App - (*Healthcheck)(nil), // 19: provisioner.Healthcheck - (*Resource)(nil), // 20: provisioner.Resource - (*Module)(nil), // 21: provisioner.Module - (*Metadata)(nil), // 22: provisioner.Metadata - (*Config)(nil), // 23: provisioner.Config - (*ParseRequest)(nil), // 24: provisioner.ParseRequest - (*ParseComplete)(nil), // 25: provisioner.ParseComplete - (*PlanRequest)(nil), // 26: provisioner.PlanRequest - (*PlanComplete)(nil), // 27: provisioner.PlanComplete - (*ApplyRequest)(nil), // 28: provisioner.ApplyRequest - (*ApplyComplete)(nil), // 29: provisioner.ApplyComplete - (*Timing)(nil), // 30: provisioner.Timing - (*CancelRequest)(nil), // 31: provisioner.CancelRequest - (*Request)(nil), // 32: provisioner.Request - (*Response)(nil), // 33: provisioner.Response - (*Agent_Metadata)(nil), // 34: provisioner.Agent.Metadata - nil, // 35: provisioner.Agent.EnvEntry - (*Resource_Metadata)(nil), // 36: provisioner.Resource.Metadata - nil, // 37: provisioner.ParseComplete.WorkspaceTagsEntry - (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp -} +var ( + file_provisionersdk_proto_provisioner_proto_enumTypes = make([]protoimpl.EnumInfo, 4) + file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 34) + file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ + (LogLevel)(0), // 0: provisioner.LogLevel + (AppSharingLevel)(0), // 1: provisioner.AppSharingLevel + (WorkspaceTransition)(0), // 2: provisioner.WorkspaceTransition + (TimingState)(0), // 3: provisioner.TimingState + (*Empty)(nil), // 4: provisioner.Empty + (*TemplateVariable)(nil), // 5: provisioner.TemplateVariable + (*RichParameterOption)(nil), // 6: provisioner.RichParameterOption + (*RichParameter)(nil), // 7: provisioner.RichParameter + (*RichParameterValue)(nil), // 8: provisioner.RichParameterValue + (*VariableValue)(nil), // 9: provisioner.VariableValue + (*Log)(nil), // 10: provisioner.Log + (*InstanceIdentityAuth)(nil), // 11: provisioner.InstanceIdentityAuth + (*ExternalAuthProviderResource)(nil), // 12: provisioner.ExternalAuthProviderResource + (*ExternalAuthProvider)(nil), // 13: provisioner.ExternalAuthProvider + (*Agent)(nil), // 14: provisioner.Agent + (*DisplayApps)(nil), // 15: provisioner.DisplayApps + (*Env)(nil), // 16: provisioner.Env + (*Script)(nil), // 17: provisioner.Script + (*App)(nil), // 18: provisioner.App + (*Healthcheck)(nil), // 19: provisioner.Healthcheck + (*Resource)(nil), // 20: provisioner.Resource + (*Module)(nil), // 21: provisioner.Module + (*Metadata)(nil), // 22: provisioner.Metadata + (*Config)(nil), // 23: provisioner.Config + (*ParseRequest)(nil), // 24: provisioner.ParseRequest + (*ParseComplete)(nil), // 25: provisioner.ParseComplete + (*PlanRequest)(nil), // 26: provisioner.PlanRequest + (*PlanComplete)(nil), // 27: provisioner.PlanComplete + (*ApplyRequest)(nil), // 28: provisioner.ApplyRequest + (*ApplyComplete)(nil), // 29: provisioner.ApplyComplete + (*Timing)(nil), // 30: provisioner.Timing + (*CancelRequest)(nil), // 31: provisioner.CancelRequest + (*Request)(nil), // 32: provisioner.Request + (*Response)(nil), // 33: provisioner.Response + (*Agent_Metadata)(nil), // 34: provisioner.Agent.Metadata + nil, // 35: provisioner.Agent.EnvEntry + (*Resource_Metadata)(nil), // 36: provisioner.Resource.Metadata + nil, // 37: provisioner.ParseComplete.WorkspaceTagsEntry + (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp + } +) var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 6, // 0: provisioner.RichParameter.options:type_name -> provisioner.RichParameterOption 0, // 1: provisioner.Log.level:type_name -> provisioner.LogLevel diff --git a/provisionersdk/proto/provisioner_drpc.pb.go b/provisionersdk/proto/provisioner_drpc.pb.go index de310e779dcaa..2e14497c2b25a 100644 --- a/provisionersdk/proto/provisioner_drpc.pb.go +++ b/provisionersdk/proto/provisioner_drpc.pb.go @@ -7,6 +7,7 @@ package proto import ( context "context" errors "errors" + protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/tailnet/proto/tailnet.pb.go b/tailnet/proto/tailnet.pb.go index b2a03fa53f5d1..ac56b1c1b9d47 100644 --- a/tailnet/proto/tailnet.pb.go +++ b/tailnet/proto/tailnet.pb.go @@ -7,13 +7,14 @@ package proto import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" timestamppb "google.golang.org/protobuf/types/known/timestamppb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" ) const ( @@ -2582,51 +2583,53 @@ func file_tailnet_proto_tailnet_proto_rawDescGZIP() []byte { return file_tailnet_proto_tailnet_proto_rawDescData } -var file_tailnet_proto_tailnet_proto_enumTypes = make([]protoimpl.EnumInfo, 5) -var file_tailnet_proto_tailnet_proto_msgTypes = make([]protoimpl.MessageInfo, 32) -var file_tailnet_proto_tailnet_proto_goTypes = []interface{}{ - (CoordinateResponse_PeerUpdate_Kind)(0), // 0: coder.tailnet.v2.CoordinateResponse.PeerUpdate.Kind - (IPFields_IPClass)(0), // 1: coder.tailnet.v2.IPFields.IPClass - (TelemetryEvent_Status)(0), // 2: coder.tailnet.v2.TelemetryEvent.Status - (TelemetryEvent_ClientType)(0), // 3: coder.tailnet.v2.TelemetryEvent.ClientType - (Workspace_Status)(0), // 4: coder.tailnet.v2.Workspace.Status - (*DERPMap)(nil), // 5: coder.tailnet.v2.DERPMap - (*StreamDERPMapsRequest)(nil), // 6: coder.tailnet.v2.StreamDERPMapsRequest - (*Node)(nil), // 7: coder.tailnet.v2.Node - (*RefreshResumeTokenRequest)(nil), // 8: coder.tailnet.v2.RefreshResumeTokenRequest - (*RefreshResumeTokenResponse)(nil), // 9: coder.tailnet.v2.RefreshResumeTokenResponse - (*CoordinateRequest)(nil), // 10: coder.tailnet.v2.CoordinateRequest - (*CoordinateResponse)(nil), // 11: coder.tailnet.v2.CoordinateResponse - (*IPFields)(nil), // 12: coder.tailnet.v2.IPFields - (*Netcheck)(nil), // 13: coder.tailnet.v2.Netcheck - (*TelemetryEvent)(nil), // 14: coder.tailnet.v2.TelemetryEvent - (*TelemetryRequest)(nil), // 15: coder.tailnet.v2.TelemetryRequest - (*TelemetryResponse)(nil), // 16: coder.tailnet.v2.TelemetryResponse - (*WorkspaceUpdatesRequest)(nil), // 17: coder.tailnet.v2.WorkspaceUpdatesRequest - (*WorkspaceUpdate)(nil), // 18: coder.tailnet.v2.WorkspaceUpdate - (*Workspace)(nil), // 19: coder.tailnet.v2.Workspace - (*Agent)(nil), // 20: coder.tailnet.v2.Agent - (*DERPMap_HomeParams)(nil), // 21: coder.tailnet.v2.DERPMap.HomeParams - (*DERPMap_Region)(nil), // 22: coder.tailnet.v2.DERPMap.Region - nil, // 23: coder.tailnet.v2.DERPMap.RegionsEntry - nil, // 24: coder.tailnet.v2.DERPMap.HomeParams.RegionScoreEntry - (*DERPMap_Region_Node)(nil), // 25: coder.tailnet.v2.DERPMap.Region.Node - nil, // 26: coder.tailnet.v2.Node.DerpLatencyEntry - nil, // 27: coder.tailnet.v2.Node.DerpForcedWebsocketEntry - (*CoordinateRequest_UpdateSelf)(nil), // 28: coder.tailnet.v2.CoordinateRequest.UpdateSelf - (*CoordinateRequest_Disconnect)(nil), // 29: coder.tailnet.v2.CoordinateRequest.Disconnect - (*CoordinateRequest_Tunnel)(nil), // 30: coder.tailnet.v2.CoordinateRequest.Tunnel - (*CoordinateRequest_ReadyForHandshake)(nil), // 31: coder.tailnet.v2.CoordinateRequest.ReadyForHandshake - (*CoordinateResponse_PeerUpdate)(nil), // 32: coder.tailnet.v2.CoordinateResponse.PeerUpdate - nil, // 33: coder.tailnet.v2.Netcheck.RegionV4LatencyEntry - nil, // 34: coder.tailnet.v2.Netcheck.RegionV6LatencyEntry - (*Netcheck_NetcheckIP)(nil), // 35: coder.tailnet.v2.Netcheck.NetcheckIP - (*TelemetryEvent_P2PEndpoint)(nil), // 36: coder.tailnet.v2.TelemetryEvent.P2PEndpoint - (*timestamppb.Timestamp)(nil), // 37: google.protobuf.Timestamp - (*durationpb.Duration)(nil), // 38: google.protobuf.Duration - (*wrapperspb.BoolValue)(nil), // 39: google.protobuf.BoolValue - (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue -} +var ( + file_tailnet_proto_tailnet_proto_enumTypes = make([]protoimpl.EnumInfo, 5) + file_tailnet_proto_tailnet_proto_msgTypes = make([]protoimpl.MessageInfo, 32) + file_tailnet_proto_tailnet_proto_goTypes = []interface{}{ + (CoordinateResponse_PeerUpdate_Kind)(0), // 0: coder.tailnet.v2.CoordinateResponse.PeerUpdate.Kind + (IPFields_IPClass)(0), // 1: coder.tailnet.v2.IPFields.IPClass + (TelemetryEvent_Status)(0), // 2: coder.tailnet.v2.TelemetryEvent.Status + (TelemetryEvent_ClientType)(0), // 3: coder.tailnet.v2.TelemetryEvent.ClientType + (Workspace_Status)(0), // 4: coder.tailnet.v2.Workspace.Status + (*DERPMap)(nil), // 5: coder.tailnet.v2.DERPMap + (*StreamDERPMapsRequest)(nil), // 6: coder.tailnet.v2.StreamDERPMapsRequest + (*Node)(nil), // 7: coder.tailnet.v2.Node + (*RefreshResumeTokenRequest)(nil), // 8: coder.tailnet.v2.RefreshResumeTokenRequest + (*RefreshResumeTokenResponse)(nil), // 9: coder.tailnet.v2.RefreshResumeTokenResponse + (*CoordinateRequest)(nil), // 10: coder.tailnet.v2.CoordinateRequest + (*CoordinateResponse)(nil), // 11: coder.tailnet.v2.CoordinateResponse + (*IPFields)(nil), // 12: coder.tailnet.v2.IPFields + (*Netcheck)(nil), // 13: coder.tailnet.v2.Netcheck + (*TelemetryEvent)(nil), // 14: coder.tailnet.v2.TelemetryEvent + (*TelemetryRequest)(nil), // 15: coder.tailnet.v2.TelemetryRequest + (*TelemetryResponse)(nil), // 16: coder.tailnet.v2.TelemetryResponse + (*WorkspaceUpdatesRequest)(nil), // 17: coder.tailnet.v2.WorkspaceUpdatesRequest + (*WorkspaceUpdate)(nil), // 18: coder.tailnet.v2.WorkspaceUpdate + (*Workspace)(nil), // 19: coder.tailnet.v2.Workspace + (*Agent)(nil), // 20: coder.tailnet.v2.Agent + (*DERPMap_HomeParams)(nil), // 21: coder.tailnet.v2.DERPMap.HomeParams + (*DERPMap_Region)(nil), // 22: coder.tailnet.v2.DERPMap.Region + nil, // 23: coder.tailnet.v2.DERPMap.RegionsEntry + nil, // 24: coder.tailnet.v2.DERPMap.HomeParams.RegionScoreEntry + (*DERPMap_Region_Node)(nil), // 25: coder.tailnet.v2.DERPMap.Region.Node + nil, // 26: coder.tailnet.v2.Node.DerpLatencyEntry + nil, // 27: coder.tailnet.v2.Node.DerpForcedWebsocketEntry + (*CoordinateRequest_UpdateSelf)(nil), // 28: coder.tailnet.v2.CoordinateRequest.UpdateSelf + (*CoordinateRequest_Disconnect)(nil), // 29: coder.tailnet.v2.CoordinateRequest.Disconnect + (*CoordinateRequest_Tunnel)(nil), // 30: coder.tailnet.v2.CoordinateRequest.Tunnel + (*CoordinateRequest_ReadyForHandshake)(nil), // 31: coder.tailnet.v2.CoordinateRequest.ReadyForHandshake + (*CoordinateResponse_PeerUpdate)(nil), // 32: coder.tailnet.v2.CoordinateResponse.PeerUpdate + nil, // 33: coder.tailnet.v2.Netcheck.RegionV4LatencyEntry + nil, // 34: coder.tailnet.v2.Netcheck.RegionV6LatencyEntry + (*Netcheck_NetcheckIP)(nil), // 35: coder.tailnet.v2.Netcheck.NetcheckIP + (*TelemetryEvent_P2PEndpoint)(nil), // 36: coder.tailnet.v2.TelemetryEvent.P2PEndpoint + (*timestamppb.Timestamp)(nil), // 37: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 38: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 39: google.protobuf.BoolValue + (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue + } +) var file_tailnet_proto_tailnet_proto_depIdxs = []int32{ 21, // 0: coder.tailnet.v2.DERPMap.home_params:type_name -> coder.tailnet.v2.DERPMap.HomeParams 23, // 1: coder.tailnet.v2.DERPMap.regions:type_name -> coder.tailnet.v2.DERPMap.RegionsEntry diff --git a/tailnet/proto/tailnet_drpc.pb.go b/tailnet/proto/tailnet_drpc.pb.go index 9dac4c06f3108..c205bf8193e65 100644 --- a/tailnet/proto/tailnet_drpc.pb.go +++ b/tailnet/proto/tailnet_drpc.pb.go @@ -7,6 +7,7 @@ package proto import ( context "context" errors "errors" + protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/vpn/vpn.pb.go b/vpn/vpn.pb.go index 181f57d617fa4..4bfca3697c265 100644 --- a/vpn/vpn.pb.go +++ b/vpn/vpn.pb.go @@ -7,11 +7,12 @@ package vpn import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( @@ -1884,34 +1885,36 @@ func file_vpn_vpn_proto_rawDescGZIP() []byte { return file_vpn_vpn_proto_rawDescData } -var file_vpn_vpn_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_vpn_vpn_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_vpn_vpn_proto_goTypes = []interface{}{ - (Log_Level)(0), // 0: vpn.Log.Level - (Workspace_Status)(0), // 1: vpn.Workspace.Status - (*RPC)(nil), // 2: vpn.RPC - (*ManagerMessage)(nil), // 3: vpn.ManagerMessage - (*TunnelMessage)(nil), // 4: vpn.TunnelMessage - (*Log)(nil), // 5: vpn.Log - (*GetPeerUpdate)(nil), // 6: vpn.GetPeerUpdate - (*PeerUpdate)(nil), // 7: vpn.PeerUpdate - (*Workspace)(nil), // 8: vpn.Workspace - (*Agent)(nil), // 9: vpn.Agent - (*NetworkSettingsRequest)(nil), // 10: vpn.NetworkSettingsRequest - (*NetworkSettingsResponse)(nil), // 11: vpn.NetworkSettingsResponse - (*StartRequest)(nil), // 12: vpn.StartRequest - (*StartResponse)(nil), // 13: vpn.StartResponse - (*StopRequest)(nil), // 14: vpn.StopRequest - (*StopResponse)(nil), // 15: vpn.StopResponse - (*Log_Field)(nil), // 16: vpn.Log.Field - (*NetworkSettingsRequest_DNSSettings)(nil), // 17: vpn.NetworkSettingsRequest.DNSSettings - (*NetworkSettingsRequest_IPv4Settings)(nil), // 18: vpn.NetworkSettingsRequest.IPv4Settings - (*NetworkSettingsRequest_IPv6Settings)(nil), // 19: vpn.NetworkSettingsRequest.IPv6Settings - (*NetworkSettingsRequest_IPv4Settings_IPv4Route)(nil), // 20: vpn.NetworkSettingsRequest.IPv4Settings.IPv4Route - (*NetworkSettingsRequest_IPv6Settings_IPv6Route)(nil), // 21: vpn.NetworkSettingsRequest.IPv6Settings.IPv6Route - (*StartRequest_Header)(nil), // 22: vpn.StartRequest.Header - (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp -} +var ( + file_vpn_vpn_proto_enumTypes = make([]protoimpl.EnumInfo, 2) + file_vpn_vpn_proto_msgTypes = make([]protoimpl.MessageInfo, 21) + file_vpn_vpn_proto_goTypes = []interface{}{ + (Log_Level)(0), // 0: vpn.Log.Level + (Workspace_Status)(0), // 1: vpn.Workspace.Status + (*RPC)(nil), // 2: vpn.RPC + (*ManagerMessage)(nil), // 3: vpn.ManagerMessage + (*TunnelMessage)(nil), // 4: vpn.TunnelMessage + (*Log)(nil), // 5: vpn.Log + (*GetPeerUpdate)(nil), // 6: vpn.GetPeerUpdate + (*PeerUpdate)(nil), // 7: vpn.PeerUpdate + (*Workspace)(nil), // 8: vpn.Workspace + (*Agent)(nil), // 9: vpn.Agent + (*NetworkSettingsRequest)(nil), // 10: vpn.NetworkSettingsRequest + (*NetworkSettingsResponse)(nil), // 11: vpn.NetworkSettingsResponse + (*StartRequest)(nil), // 12: vpn.StartRequest + (*StartResponse)(nil), // 13: vpn.StartResponse + (*StopRequest)(nil), // 14: vpn.StopRequest + (*StopResponse)(nil), // 15: vpn.StopResponse + (*Log_Field)(nil), // 16: vpn.Log.Field + (*NetworkSettingsRequest_DNSSettings)(nil), // 17: vpn.NetworkSettingsRequest.DNSSettings + (*NetworkSettingsRequest_IPv4Settings)(nil), // 18: vpn.NetworkSettingsRequest.IPv4Settings + (*NetworkSettingsRequest_IPv6Settings)(nil), // 19: vpn.NetworkSettingsRequest.IPv6Settings + (*NetworkSettingsRequest_IPv4Settings_IPv4Route)(nil), // 20: vpn.NetworkSettingsRequest.IPv4Settings.IPv4Route + (*NetworkSettingsRequest_IPv6Settings_IPv6Route)(nil), // 21: vpn.NetworkSettingsRequest.IPv6Settings.IPv6Route + (*StartRequest_Header)(nil), // 22: vpn.StartRequest.Header + (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp + } +) var file_vpn_vpn_proto_depIdxs = []int32{ 2, // 0: vpn.ManagerMessage.rpc:type_name -> vpn.RPC 6, // 1: vpn.ManagerMessage.get_peer_update:type_name -> vpn.GetPeerUpdate From 4fb0d410c7e4aa1abd2c16eb66a63b24f94b9936 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Sun, 29 Dec 2024 12:42:12 +0000 Subject: [PATCH 2/8] make fmt --- agent/proto/agent.pb.go | 1 + provisionerd/proto/provisionerd.pb.go | 1 + provisionersdk/proto/provisioner.pb.go | 1 + site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx | 4 +++- tailnet/proto/tailnet.pb.go | 1 + vpn/vpn.pb.go | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go index 6cb59a059cd11..ce60161992483 100644 --- a/agent/proto/agent.pb.go +++ b/agent/proto/agent.pb.go @@ -3234,6 +3234,7 @@ var ( (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp } ) + var file_agent_proto_agent_proto_depIdxs = []int32{ 1, // 0: coder.agent.v2.WorkspaceApp.sharing_level:type_name -> coder.agent.v2.WorkspaceApp.SharingLevel 37, // 1: coder.agent.v2.WorkspaceApp.healthcheck:type_name -> coder.agent.v2.WorkspaceApp.Healthcheck diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 0796c94666a9b..918b35c65ae3f 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1774,6 +1774,7 @@ var ( (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource } ) + var file_provisionerd_proto_provisionerd_proto_depIdxs = []int32{ 11, // 0: provisionerd.AcquiredJob.workspace_build:type_name -> provisionerd.AcquiredJob.WorkspaceBuild 12, // 1: provisionerd.AcquiredJob.template_import:type_name -> provisionerd.AcquiredJob.TemplateImport diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 63e79634972dc..877baa6cf80ec 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -3458,6 +3458,7 @@ var ( (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp } ) + var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 6, // 0: provisioner.RichParameter.options:type_name -> provisioner.RichParameterOption 0, // 1: provisioner.Log.level:type_name -> provisioner.LogLevel diff --git a/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx b/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx index 4863b08ec19bd..9ab5054957992 100644 --- a/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx +++ b/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx @@ -121,7 +121,9 @@ export const XGrid: FC = ({ columns, ...htmlProps }) => { // A dashed line is used as a background image to create the grid. // Using it as a background simplifies replication along the Y axis. -const dashedLine = (color: string) => ` +const dashedLine = ( + color: string, +) => ` `; diff --git a/tailnet/proto/tailnet.pb.go b/tailnet/proto/tailnet.pb.go index ac56b1c1b9d47..ba0403adfb3b6 100644 --- a/tailnet/proto/tailnet.pb.go +++ b/tailnet/proto/tailnet.pb.go @@ -2630,6 +2630,7 @@ var ( (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue } ) + var file_tailnet_proto_tailnet_proto_depIdxs = []int32{ 21, // 0: coder.tailnet.v2.DERPMap.home_params:type_name -> coder.tailnet.v2.DERPMap.HomeParams 23, // 1: coder.tailnet.v2.DERPMap.regions:type_name -> coder.tailnet.v2.DERPMap.RegionsEntry diff --git a/vpn/vpn.pb.go b/vpn/vpn.pb.go index 4bfca3697c265..a6f81343d69ea 100644 --- a/vpn/vpn.pb.go +++ b/vpn/vpn.pb.go @@ -1915,6 +1915,7 @@ var ( (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp } ) + var file_vpn_vpn_proto_depIdxs = []int32{ 2, // 0: vpn.ManagerMessage.rpc:type_name -> vpn.RPC 6, // 1: vpn.ManagerMessage.get_peer_update:type_name -> vpn.GetPeerUpdate From 037c7a99a6347b71d2fe38cbebd4687282e4243f Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Sun, 29 Dec 2024 12:49:44 +0000 Subject: [PATCH 3/8] oops --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4c45b12ac2f35..7f95e32098317 100644 --- a/Makefile +++ b/Makefile @@ -642,6 +642,8 @@ vpn/vpn.pb.go: vpn/vpn.proto site/src/api/typesGenerated.ts: $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go') # -C sets the directory for the go run command go run -C ./scripts/apitypings main.go > $@ + (cd ./site && npx biome format --write ./src/api/typesGenerated.ts) + ./scripts/pnpm_install.sh site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go cd site From ad7820d2868db41e340655b2acf9de6818721383 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Sun, 29 Dec 2024 12:58:17 +0000 Subject: [PATCH 4/8] ensure that generated files are formatted. --- Makefile | 3 ++- agent/proto/agent.pb.go | 1 - provisionerd/proto/provisionerd.pb.go | 1 - provisionersdk/proto/provisioner.pb.go | 1 - site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx | 4 +--- tailnet/proto/tailnet.pb.go | 1 - vpn/vpn.pb.go | 1 - 7 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7f95e32098317..80d720a17aa78 100644 --- a/Makefile +++ b/Makefile @@ -537,7 +537,8 @@ gen: \ site/src/theme/icons.json \ examples/examples.gen.json \ $(TAILNETTEST_MOCKS) \ - coderd/database/pubsub/psmock/psmock.go + coderd/database/pubsub/psmock/psmock.go \ + fmt .PHONY: gen # Mark all generated files as fresh so make thinks they're up-to-date. This is diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go index ce60161992483..6cb59a059cd11 100644 --- a/agent/proto/agent.pb.go +++ b/agent/proto/agent.pb.go @@ -3234,7 +3234,6 @@ var ( (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp } ) - var file_agent_proto_agent_proto_depIdxs = []int32{ 1, // 0: coder.agent.v2.WorkspaceApp.sharing_level:type_name -> coder.agent.v2.WorkspaceApp.SharingLevel 37, // 1: coder.agent.v2.WorkspaceApp.healthcheck:type_name -> coder.agent.v2.WorkspaceApp.Healthcheck diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 918b35c65ae3f..0796c94666a9b 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1774,7 +1774,6 @@ var ( (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource } ) - var file_provisionerd_proto_provisionerd_proto_depIdxs = []int32{ 11, // 0: provisionerd.AcquiredJob.workspace_build:type_name -> provisionerd.AcquiredJob.WorkspaceBuild 12, // 1: provisionerd.AcquiredJob.template_import:type_name -> provisionerd.AcquiredJob.TemplateImport diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 877baa6cf80ec..63e79634972dc 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -3458,7 +3458,6 @@ var ( (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp } ) - var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 6, // 0: provisioner.RichParameter.options:type_name -> provisioner.RichParameterOption 0, // 1: provisioner.Log.level:type_name -> provisioner.LogLevel diff --git a/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx b/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx index 9ab5054957992..4863b08ec19bd 100644 --- a/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx +++ b/site/src/modules/workspaces/WorkspaceTiming/Chart/XAxis.tsx @@ -121,9 +121,7 @@ export const XGrid: FC = ({ columns, ...htmlProps }) => { // A dashed line is used as a background image to create the grid. // Using it as a background simplifies replication along the Y axis. -const dashedLine = ( - color: string, -) => ` +const dashedLine = (color: string) => ` `; diff --git a/tailnet/proto/tailnet.pb.go b/tailnet/proto/tailnet.pb.go index ba0403adfb3b6..ac56b1c1b9d47 100644 --- a/tailnet/proto/tailnet.pb.go +++ b/tailnet/proto/tailnet.pb.go @@ -2630,7 +2630,6 @@ var ( (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue } ) - var file_tailnet_proto_tailnet_proto_depIdxs = []int32{ 21, // 0: coder.tailnet.v2.DERPMap.home_params:type_name -> coder.tailnet.v2.DERPMap.HomeParams 23, // 1: coder.tailnet.v2.DERPMap.regions:type_name -> coder.tailnet.v2.DERPMap.RegionsEntry diff --git a/vpn/vpn.pb.go b/vpn/vpn.pb.go index a6f81343d69ea..4bfca3697c265 100644 --- a/vpn/vpn.pb.go +++ b/vpn/vpn.pb.go @@ -1915,7 +1915,6 @@ var ( (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp } ) - var file_vpn_vpn_proto_depIdxs = []int32{ 2, // 0: vpn.ManagerMessage.rpc:type_name -> vpn.RPC 6, // 1: vpn.ManagerMessage.get_peer_update:type_name -> vpn.GetPeerUpdate From c25f9d9933016330c0f0aa9a22b5d1aeea3ef338 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Sun, 29 Dec 2024 13:03:02 +0000 Subject: [PATCH 5/8] make fmt --- agent/proto/agent.pb.go | 1 + provisionerd/proto/provisionerd.pb.go | 1 + provisionersdk/proto/provisioner.pb.go | 1 + tailnet/proto/tailnet.pb.go | 1 + vpn/vpn.pb.go | 1 + 5 files changed, 5 insertions(+) diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go index 6cb59a059cd11..ce60161992483 100644 --- a/agent/proto/agent.pb.go +++ b/agent/proto/agent.pb.go @@ -3234,6 +3234,7 @@ var ( (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp } ) + var file_agent_proto_agent_proto_depIdxs = []int32{ 1, // 0: coder.agent.v2.WorkspaceApp.sharing_level:type_name -> coder.agent.v2.WorkspaceApp.SharingLevel 37, // 1: coder.agent.v2.WorkspaceApp.healthcheck:type_name -> coder.agent.v2.WorkspaceApp.Healthcheck diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 0796c94666a9b..918b35c65ae3f 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1774,6 +1774,7 @@ var ( (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource } ) + var file_provisionerd_proto_provisionerd_proto_depIdxs = []int32{ 11, // 0: provisionerd.AcquiredJob.workspace_build:type_name -> provisionerd.AcquiredJob.WorkspaceBuild 12, // 1: provisionerd.AcquiredJob.template_import:type_name -> provisionerd.AcquiredJob.TemplateImport diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 63e79634972dc..877baa6cf80ec 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -3458,6 +3458,7 @@ var ( (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp } ) + var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 6, // 0: provisioner.RichParameter.options:type_name -> provisioner.RichParameterOption 0, // 1: provisioner.Log.level:type_name -> provisioner.LogLevel diff --git a/tailnet/proto/tailnet.pb.go b/tailnet/proto/tailnet.pb.go index ac56b1c1b9d47..ba0403adfb3b6 100644 --- a/tailnet/proto/tailnet.pb.go +++ b/tailnet/proto/tailnet.pb.go @@ -2630,6 +2630,7 @@ var ( (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue } ) + var file_tailnet_proto_tailnet_proto_depIdxs = []int32{ 21, // 0: coder.tailnet.v2.DERPMap.home_params:type_name -> coder.tailnet.v2.DERPMap.HomeParams 23, // 1: coder.tailnet.v2.DERPMap.regions:type_name -> coder.tailnet.v2.DERPMap.RegionsEntry diff --git a/vpn/vpn.pb.go b/vpn/vpn.pb.go index 4bfca3697c265..a6f81343d69ea 100644 --- a/vpn/vpn.pb.go +++ b/vpn/vpn.pb.go @@ -1915,6 +1915,7 @@ var ( (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp } ) + var file_vpn_vpn_proto_depIdxs = []int32{ 2, // 0: vpn.ManagerMessage.rpc:type_name -> vpn.RPC 6, // 1: vpn.ManagerMessage.get_peer_update:type_name -> vpn.GetPeerUpdate From cbde1b544490eec5e27f9e7aeba34d7a32107418 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 30 Dec 2024 08:38:56 +0000 Subject: [PATCH 6/8] don't format .pb.go files as they are generated --- Makefile | 7 +- agent/proto/agent.pb.go | 112 ++++++++++---------- agent/proto/agent_drpc.pb.go | 1 - provisionerd/proto/provisionerd.pb.go | 82 +++++++------- provisionerd/proto/provisionerd_drpc.pb.go | 1 - provisionersdk/proto/provisioner.pb.go | 94 ++++++++-------- provisionersdk/proto/provisioner_drpc.pb.go | 1 - tailnet/proto/tailnet.pb.go | 98 ++++++++--------- tailnet/proto/tailnet_drpc.pb.go | 1 - vpn/vpn.pb.go | 64 ++++++----- 10 files changed, 219 insertions(+), 242 deletions(-) diff --git a/Makefile b/Makefile index 80d720a17aa78..16190e681b6d3 100644 --- a/Makefile +++ b/Makefile @@ -417,12 +417,14 @@ RESET := $(shell tput sgr0 2>/dev/null) fmt: fmt/ts fmt/go fmt/terraform fmt/shfmt fmt/prettier .PHONY: fmt +GO_FMT_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go' ! -name '*.pb.go') + fmt/go: go mod tidy echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET)" # VS Code users should check out # https://github.com/mvdan/gofumpt#visual-studio-code - go run mvdan.cc/gofumpt@v0.4.0 -w -l $(GO_SRC_FILES) + go run mvdan.cc/gofumpt@v0.4.0 -w -l $(GO_FMT_FILES) .PHONY: fmt/go fmt/ts: @@ -537,8 +539,7 @@ gen: \ site/src/theme/icons.json \ examples/examples.gen.json \ $(TAILNETTEST_MOCKS) \ - coderd/database/pubsub/psmock/psmock.go \ - fmt + coderd/database/pubsub/psmock/psmock.go .PHONY: gen # Mark all generated files as fresh so make thinks they're up-to-date. This is diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go index ce60161992483..8063b42f3b622 100644 --- a/agent/proto/agent.pb.go +++ b/agent/proto/agent.pb.go @@ -7,14 +7,13 @@ package proto import ( - reflect "reflect" - sync "sync" - proto "github.com/coder/coder/v2/tailnet/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) const ( @@ -3180,61 +3179,58 @@ func file_agent_proto_agent_proto_rawDescGZIP() []byte { return file_agent_proto_agent_proto_rawDescData } -var ( - file_agent_proto_agent_proto_enumTypes = make([]protoimpl.EnumInfo, 9) - file_agent_proto_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 36) - file_agent_proto_agent_proto_goTypes = []interface{}{ - (AppHealth)(0), // 0: coder.agent.v2.AppHealth - (WorkspaceApp_SharingLevel)(0), // 1: coder.agent.v2.WorkspaceApp.SharingLevel - (WorkspaceApp_Health)(0), // 2: coder.agent.v2.WorkspaceApp.Health - (Stats_Metric_Type)(0), // 3: coder.agent.v2.Stats.Metric.Type - (Lifecycle_State)(0), // 4: coder.agent.v2.Lifecycle.State - (Startup_Subsystem)(0), // 5: coder.agent.v2.Startup.Subsystem - (Log_Level)(0), // 6: coder.agent.v2.Log.Level - (Timing_Stage)(0), // 7: coder.agent.v2.Timing.Stage - (Timing_Status)(0), // 8: coder.agent.v2.Timing.Status - (*WorkspaceApp)(nil), // 9: coder.agent.v2.WorkspaceApp - (*WorkspaceAgentScript)(nil), // 10: coder.agent.v2.WorkspaceAgentScript - (*WorkspaceAgentMetadata)(nil), // 11: coder.agent.v2.WorkspaceAgentMetadata - (*Manifest)(nil), // 12: coder.agent.v2.Manifest - (*GetManifestRequest)(nil), // 13: coder.agent.v2.GetManifestRequest - (*ServiceBanner)(nil), // 14: coder.agent.v2.ServiceBanner - (*GetServiceBannerRequest)(nil), // 15: coder.agent.v2.GetServiceBannerRequest - (*Stats)(nil), // 16: coder.agent.v2.Stats - (*UpdateStatsRequest)(nil), // 17: coder.agent.v2.UpdateStatsRequest - (*UpdateStatsResponse)(nil), // 18: coder.agent.v2.UpdateStatsResponse - (*Lifecycle)(nil), // 19: coder.agent.v2.Lifecycle - (*UpdateLifecycleRequest)(nil), // 20: coder.agent.v2.UpdateLifecycleRequest - (*BatchUpdateAppHealthRequest)(nil), // 21: coder.agent.v2.BatchUpdateAppHealthRequest - (*BatchUpdateAppHealthResponse)(nil), // 22: coder.agent.v2.BatchUpdateAppHealthResponse - (*Startup)(nil), // 23: coder.agent.v2.Startup - (*UpdateStartupRequest)(nil), // 24: coder.agent.v2.UpdateStartupRequest - (*Metadata)(nil), // 25: coder.agent.v2.Metadata - (*BatchUpdateMetadataRequest)(nil), // 26: coder.agent.v2.BatchUpdateMetadataRequest - (*BatchUpdateMetadataResponse)(nil), // 27: coder.agent.v2.BatchUpdateMetadataResponse - (*Log)(nil), // 28: coder.agent.v2.Log - (*BatchCreateLogsRequest)(nil), // 29: coder.agent.v2.BatchCreateLogsRequest - (*BatchCreateLogsResponse)(nil), // 30: coder.agent.v2.BatchCreateLogsResponse - (*GetAnnouncementBannersRequest)(nil), // 31: coder.agent.v2.GetAnnouncementBannersRequest - (*GetAnnouncementBannersResponse)(nil), // 32: coder.agent.v2.GetAnnouncementBannersResponse - (*BannerConfig)(nil), // 33: coder.agent.v2.BannerConfig - (*WorkspaceAgentScriptCompletedRequest)(nil), // 34: coder.agent.v2.WorkspaceAgentScriptCompletedRequest - (*WorkspaceAgentScriptCompletedResponse)(nil), // 35: coder.agent.v2.WorkspaceAgentScriptCompletedResponse - (*Timing)(nil), // 36: coder.agent.v2.Timing - (*WorkspaceApp_Healthcheck)(nil), // 37: coder.agent.v2.WorkspaceApp.Healthcheck - (*WorkspaceAgentMetadata_Result)(nil), // 38: coder.agent.v2.WorkspaceAgentMetadata.Result - (*WorkspaceAgentMetadata_Description)(nil), // 39: coder.agent.v2.WorkspaceAgentMetadata.Description - nil, // 40: coder.agent.v2.Manifest.EnvironmentVariablesEntry - nil, // 41: coder.agent.v2.Stats.ConnectionsByProtoEntry - (*Stats_Metric)(nil), // 42: coder.agent.v2.Stats.Metric - (*Stats_Metric_Label)(nil), // 43: coder.agent.v2.Stats.Metric.Label - (*BatchUpdateAppHealthRequest_HealthUpdate)(nil), // 44: coder.agent.v2.BatchUpdateAppHealthRequest.HealthUpdate - (*durationpb.Duration)(nil), // 45: google.protobuf.Duration - (*proto.DERPMap)(nil), // 46: coder.tailnet.v2.DERPMap - (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp - } -) - +var file_agent_proto_agent_proto_enumTypes = make([]protoimpl.EnumInfo, 9) +var file_agent_proto_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 36) +var file_agent_proto_agent_proto_goTypes = []interface{}{ + (AppHealth)(0), // 0: coder.agent.v2.AppHealth + (WorkspaceApp_SharingLevel)(0), // 1: coder.agent.v2.WorkspaceApp.SharingLevel + (WorkspaceApp_Health)(0), // 2: coder.agent.v2.WorkspaceApp.Health + (Stats_Metric_Type)(0), // 3: coder.agent.v2.Stats.Metric.Type + (Lifecycle_State)(0), // 4: coder.agent.v2.Lifecycle.State + (Startup_Subsystem)(0), // 5: coder.agent.v2.Startup.Subsystem + (Log_Level)(0), // 6: coder.agent.v2.Log.Level + (Timing_Stage)(0), // 7: coder.agent.v2.Timing.Stage + (Timing_Status)(0), // 8: coder.agent.v2.Timing.Status + (*WorkspaceApp)(nil), // 9: coder.agent.v2.WorkspaceApp + (*WorkspaceAgentScript)(nil), // 10: coder.agent.v2.WorkspaceAgentScript + (*WorkspaceAgentMetadata)(nil), // 11: coder.agent.v2.WorkspaceAgentMetadata + (*Manifest)(nil), // 12: coder.agent.v2.Manifest + (*GetManifestRequest)(nil), // 13: coder.agent.v2.GetManifestRequest + (*ServiceBanner)(nil), // 14: coder.agent.v2.ServiceBanner + (*GetServiceBannerRequest)(nil), // 15: coder.agent.v2.GetServiceBannerRequest + (*Stats)(nil), // 16: coder.agent.v2.Stats + (*UpdateStatsRequest)(nil), // 17: coder.agent.v2.UpdateStatsRequest + (*UpdateStatsResponse)(nil), // 18: coder.agent.v2.UpdateStatsResponse + (*Lifecycle)(nil), // 19: coder.agent.v2.Lifecycle + (*UpdateLifecycleRequest)(nil), // 20: coder.agent.v2.UpdateLifecycleRequest + (*BatchUpdateAppHealthRequest)(nil), // 21: coder.agent.v2.BatchUpdateAppHealthRequest + (*BatchUpdateAppHealthResponse)(nil), // 22: coder.agent.v2.BatchUpdateAppHealthResponse + (*Startup)(nil), // 23: coder.agent.v2.Startup + (*UpdateStartupRequest)(nil), // 24: coder.agent.v2.UpdateStartupRequest + (*Metadata)(nil), // 25: coder.agent.v2.Metadata + (*BatchUpdateMetadataRequest)(nil), // 26: coder.agent.v2.BatchUpdateMetadataRequest + (*BatchUpdateMetadataResponse)(nil), // 27: coder.agent.v2.BatchUpdateMetadataResponse + (*Log)(nil), // 28: coder.agent.v2.Log + (*BatchCreateLogsRequest)(nil), // 29: coder.agent.v2.BatchCreateLogsRequest + (*BatchCreateLogsResponse)(nil), // 30: coder.agent.v2.BatchCreateLogsResponse + (*GetAnnouncementBannersRequest)(nil), // 31: coder.agent.v2.GetAnnouncementBannersRequest + (*GetAnnouncementBannersResponse)(nil), // 32: coder.agent.v2.GetAnnouncementBannersResponse + (*BannerConfig)(nil), // 33: coder.agent.v2.BannerConfig + (*WorkspaceAgentScriptCompletedRequest)(nil), // 34: coder.agent.v2.WorkspaceAgentScriptCompletedRequest + (*WorkspaceAgentScriptCompletedResponse)(nil), // 35: coder.agent.v2.WorkspaceAgentScriptCompletedResponse + (*Timing)(nil), // 36: coder.agent.v2.Timing + (*WorkspaceApp_Healthcheck)(nil), // 37: coder.agent.v2.WorkspaceApp.Healthcheck + (*WorkspaceAgentMetadata_Result)(nil), // 38: coder.agent.v2.WorkspaceAgentMetadata.Result + (*WorkspaceAgentMetadata_Description)(nil), // 39: coder.agent.v2.WorkspaceAgentMetadata.Description + nil, // 40: coder.agent.v2.Manifest.EnvironmentVariablesEntry + nil, // 41: coder.agent.v2.Stats.ConnectionsByProtoEntry + (*Stats_Metric)(nil), // 42: coder.agent.v2.Stats.Metric + (*Stats_Metric_Label)(nil), // 43: coder.agent.v2.Stats.Metric.Label + (*BatchUpdateAppHealthRequest_HealthUpdate)(nil), // 44: coder.agent.v2.BatchUpdateAppHealthRequest.HealthUpdate + (*durationpb.Duration)(nil), // 45: google.protobuf.Duration + (*proto.DERPMap)(nil), // 46: coder.tailnet.v2.DERPMap + (*timestamppb.Timestamp)(nil), // 47: google.protobuf.Timestamp +} var file_agent_proto_agent_proto_depIdxs = []int32{ 1, // 0: coder.agent.v2.WorkspaceApp.sharing_level:type_name -> coder.agent.v2.WorkspaceApp.SharingLevel 37, // 1: coder.agent.v2.WorkspaceApp.healthcheck:type_name -> coder.agent.v2.WorkspaceApp.Healthcheck diff --git a/agent/proto/agent_drpc.pb.go b/agent/proto/agent_drpc.pb.go index 2ec708203920b..7bb1957230d76 100644 --- a/agent/proto/agent_drpc.pb.go +++ b/agent/proto/agent_drpc.pb.go @@ -7,7 +7,6 @@ package proto import ( context "context" errors "errors" - protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 918b35c65ae3f..7f5e39a85a8fa 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -7,12 +7,11 @@ package proto import ( - reflect "reflect" - sync "sync" - proto "github.com/coder/coder/v2/provisionersdk/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -1735,46 +1734,43 @@ func file_provisionerd_proto_provisionerd_proto_rawDescGZIP() []byte { return file_provisionerd_proto_provisionerd_proto_rawDescData } -var ( - file_provisionerd_proto_provisionerd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) - file_provisionerd_proto_provisionerd_proto_msgTypes = make([]protoimpl.MessageInfo, 21) - file_provisionerd_proto_provisionerd_proto_goTypes = []interface{}{ - (LogSource)(0), // 0: provisionerd.LogSource - (*Empty)(nil), // 1: provisionerd.Empty - (*AcquiredJob)(nil), // 2: provisionerd.AcquiredJob - (*FailedJob)(nil), // 3: provisionerd.FailedJob - (*CompletedJob)(nil), // 4: provisionerd.CompletedJob - (*Log)(nil), // 5: provisionerd.Log - (*UpdateJobRequest)(nil), // 6: provisionerd.UpdateJobRequest - (*UpdateJobResponse)(nil), // 7: provisionerd.UpdateJobResponse - (*CommitQuotaRequest)(nil), // 8: provisionerd.CommitQuotaRequest - (*CommitQuotaResponse)(nil), // 9: provisionerd.CommitQuotaResponse - (*CancelAcquire)(nil), // 10: provisionerd.CancelAcquire - (*AcquiredJob_WorkspaceBuild)(nil), // 11: provisionerd.AcquiredJob.WorkspaceBuild - (*AcquiredJob_TemplateImport)(nil), // 12: provisionerd.AcquiredJob.TemplateImport - (*AcquiredJob_TemplateDryRun)(nil), // 13: provisionerd.AcquiredJob.TemplateDryRun - nil, // 14: provisionerd.AcquiredJob.TraceMetadataEntry - (*FailedJob_WorkspaceBuild)(nil), // 15: provisionerd.FailedJob.WorkspaceBuild - (*FailedJob_TemplateImport)(nil), // 16: provisionerd.FailedJob.TemplateImport - (*FailedJob_TemplateDryRun)(nil), // 17: provisionerd.FailedJob.TemplateDryRun - (*CompletedJob_WorkspaceBuild)(nil), // 18: provisionerd.CompletedJob.WorkspaceBuild - (*CompletedJob_TemplateImport)(nil), // 19: provisionerd.CompletedJob.TemplateImport - (*CompletedJob_TemplateDryRun)(nil), // 20: provisionerd.CompletedJob.TemplateDryRun - nil, // 21: provisionerd.UpdateJobRequest.WorkspaceTagsEntry - (proto.LogLevel)(0), // 22: provisioner.LogLevel - (*proto.TemplateVariable)(nil), // 23: provisioner.TemplateVariable - (*proto.VariableValue)(nil), // 24: provisioner.VariableValue - (*proto.RichParameterValue)(nil), // 25: provisioner.RichParameterValue - (*proto.ExternalAuthProvider)(nil), // 26: provisioner.ExternalAuthProvider - (*proto.Metadata)(nil), // 27: provisioner.Metadata - (*proto.Timing)(nil), // 28: provisioner.Timing - (*proto.Resource)(nil), // 29: provisioner.Resource - (*proto.Module)(nil), // 30: provisioner.Module - (*proto.RichParameter)(nil), // 31: provisioner.RichParameter - (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource - } -) - +var file_provisionerd_proto_provisionerd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_provisionerd_proto_provisionerd_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_provisionerd_proto_provisionerd_proto_goTypes = []interface{}{ + (LogSource)(0), // 0: provisionerd.LogSource + (*Empty)(nil), // 1: provisionerd.Empty + (*AcquiredJob)(nil), // 2: provisionerd.AcquiredJob + (*FailedJob)(nil), // 3: provisionerd.FailedJob + (*CompletedJob)(nil), // 4: provisionerd.CompletedJob + (*Log)(nil), // 5: provisionerd.Log + (*UpdateJobRequest)(nil), // 6: provisionerd.UpdateJobRequest + (*UpdateJobResponse)(nil), // 7: provisionerd.UpdateJobResponse + (*CommitQuotaRequest)(nil), // 8: provisionerd.CommitQuotaRequest + (*CommitQuotaResponse)(nil), // 9: provisionerd.CommitQuotaResponse + (*CancelAcquire)(nil), // 10: provisionerd.CancelAcquire + (*AcquiredJob_WorkspaceBuild)(nil), // 11: provisionerd.AcquiredJob.WorkspaceBuild + (*AcquiredJob_TemplateImport)(nil), // 12: provisionerd.AcquiredJob.TemplateImport + (*AcquiredJob_TemplateDryRun)(nil), // 13: provisionerd.AcquiredJob.TemplateDryRun + nil, // 14: provisionerd.AcquiredJob.TraceMetadataEntry + (*FailedJob_WorkspaceBuild)(nil), // 15: provisionerd.FailedJob.WorkspaceBuild + (*FailedJob_TemplateImport)(nil), // 16: provisionerd.FailedJob.TemplateImport + (*FailedJob_TemplateDryRun)(nil), // 17: provisionerd.FailedJob.TemplateDryRun + (*CompletedJob_WorkspaceBuild)(nil), // 18: provisionerd.CompletedJob.WorkspaceBuild + (*CompletedJob_TemplateImport)(nil), // 19: provisionerd.CompletedJob.TemplateImport + (*CompletedJob_TemplateDryRun)(nil), // 20: provisionerd.CompletedJob.TemplateDryRun + nil, // 21: provisionerd.UpdateJobRequest.WorkspaceTagsEntry + (proto.LogLevel)(0), // 22: provisioner.LogLevel + (*proto.TemplateVariable)(nil), // 23: provisioner.TemplateVariable + (*proto.VariableValue)(nil), // 24: provisioner.VariableValue + (*proto.RichParameterValue)(nil), // 25: provisioner.RichParameterValue + (*proto.ExternalAuthProvider)(nil), // 26: provisioner.ExternalAuthProvider + (*proto.Metadata)(nil), // 27: provisioner.Metadata + (*proto.Timing)(nil), // 28: provisioner.Timing + (*proto.Resource)(nil), // 29: provisioner.Resource + (*proto.Module)(nil), // 30: provisioner.Module + (*proto.RichParameter)(nil), // 31: provisioner.RichParameter + (*proto.ExternalAuthProviderResource)(nil), // 32: provisioner.ExternalAuthProviderResource +} var file_provisionerd_proto_provisionerd_proto_depIdxs = []int32{ 11, // 0: provisionerd.AcquiredJob.workspace_build:type_name -> provisionerd.AcquiredJob.WorkspaceBuild 12, // 1: provisionerd.AcquiredJob.template_import:type_name -> provisionerd.AcquiredJob.TemplateImport diff --git a/provisionerd/proto/provisionerd_drpc.pb.go b/provisionerd/proto/provisionerd_drpc.pb.go index 06e687d2286f8..60d78a86acb17 100644 --- a/provisionerd/proto/provisionerd_drpc.pb.go +++ b/provisionerd/proto/provisionerd_drpc.pb.go @@ -7,7 +7,6 @@ package proto import ( context "context" errors "errors" - protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 877baa6cf80ec..026939d17120e 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -7,12 +7,11 @@ package proto import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) const ( @@ -3413,52 +3412,49 @@ func file_provisionersdk_proto_provisioner_proto_rawDescGZIP() []byte { return file_provisionersdk_proto_provisioner_proto_rawDescData } -var ( - file_provisionersdk_proto_provisioner_proto_enumTypes = make([]protoimpl.EnumInfo, 4) - file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 34) - file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ - (LogLevel)(0), // 0: provisioner.LogLevel - (AppSharingLevel)(0), // 1: provisioner.AppSharingLevel - (WorkspaceTransition)(0), // 2: provisioner.WorkspaceTransition - (TimingState)(0), // 3: provisioner.TimingState - (*Empty)(nil), // 4: provisioner.Empty - (*TemplateVariable)(nil), // 5: provisioner.TemplateVariable - (*RichParameterOption)(nil), // 6: provisioner.RichParameterOption - (*RichParameter)(nil), // 7: provisioner.RichParameter - (*RichParameterValue)(nil), // 8: provisioner.RichParameterValue - (*VariableValue)(nil), // 9: provisioner.VariableValue - (*Log)(nil), // 10: provisioner.Log - (*InstanceIdentityAuth)(nil), // 11: provisioner.InstanceIdentityAuth - (*ExternalAuthProviderResource)(nil), // 12: provisioner.ExternalAuthProviderResource - (*ExternalAuthProvider)(nil), // 13: provisioner.ExternalAuthProvider - (*Agent)(nil), // 14: provisioner.Agent - (*DisplayApps)(nil), // 15: provisioner.DisplayApps - (*Env)(nil), // 16: provisioner.Env - (*Script)(nil), // 17: provisioner.Script - (*App)(nil), // 18: provisioner.App - (*Healthcheck)(nil), // 19: provisioner.Healthcheck - (*Resource)(nil), // 20: provisioner.Resource - (*Module)(nil), // 21: provisioner.Module - (*Metadata)(nil), // 22: provisioner.Metadata - (*Config)(nil), // 23: provisioner.Config - (*ParseRequest)(nil), // 24: provisioner.ParseRequest - (*ParseComplete)(nil), // 25: provisioner.ParseComplete - (*PlanRequest)(nil), // 26: provisioner.PlanRequest - (*PlanComplete)(nil), // 27: provisioner.PlanComplete - (*ApplyRequest)(nil), // 28: provisioner.ApplyRequest - (*ApplyComplete)(nil), // 29: provisioner.ApplyComplete - (*Timing)(nil), // 30: provisioner.Timing - (*CancelRequest)(nil), // 31: provisioner.CancelRequest - (*Request)(nil), // 32: provisioner.Request - (*Response)(nil), // 33: provisioner.Response - (*Agent_Metadata)(nil), // 34: provisioner.Agent.Metadata - nil, // 35: provisioner.Agent.EnvEntry - (*Resource_Metadata)(nil), // 36: provisioner.Resource.Metadata - nil, // 37: provisioner.ParseComplete.WorkspaceTagsEntry - (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp - } -) - +var file_provisionersdk_proto_provisioner_proto_enumTypes = make([]protoimpl.EnumInfo, 4) +var file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 34) +var file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ + (LogLevel)(0), // 0: provisioner.LogLevel + (AppSharingLevel)(0), // 1: provisioner.AppSharingLevel + (WorkspaceTransition)(0), // 2: provisioner.WorkspaceTransition + (TimingState)(0), // 3: provisioner.TimingState + (*Empty)(nil), // 4: provisioner.Empty + (*TemplateVariable)(nil), // 5: provisioner.TemplateVariable + (*RichParameterOption)(nil), // 6: provisioner.RichParameterOption + (*RichParameter)(nil), // 7: provisioner.RichParameter + (*RichParameterValue)(nil), // 8: provisioner.RichParameterValue + (*VariableValue)(nil), // 9: provisioner.VariableValue + (*Log)(nil), // 10: provisioner.Log + (*InstanceIdentityAuth)(nil), // 11: provisioner.InstanceIdentityAuth + (*ExternalAuthProviderResource)(nil), // 12: provisioner.ExternalAuthProviderResource + (*ExternalAuthProvider)(nil), // 13: provisioner.ExternalAuthProvider + (*Agent)(nil), // 14: provisioner.Agent + (*DisplayApps)(nil), // 15: provisioner.DisplayApps + (*Env)(nil), // 16: provisioner.Env + (*Script)(nil), // 17: provisioner.Script + (*App)(nil), // 18: provisioner.App + (*Healthcheck)(nil), // 19: provisioner.Healthcheck + (*Resource)(nil), // 20: provisioner.Resource + (*Module)(nil), // 21: provisioner.Module + (*Metadata)(nil), // 22: provisioner.Metadata + (*Config)(nil), // 23: provisioner.Config + (*ParseRequest)(nil), // 24: provisioner.ParseRequest + (*ParseComplete)(nil), // 25: provisioner.ParseComplete + (*PlanRequest)(nil), // 26: provisioner.PlanRequest + (*PlanComplete)(nil), // 27: provisioner.PlanComplete + (*ApplyRequest)(nil), // 28: provisioner.ApplyRequest + (*ApplyComplete)(nil), // 29: provisioner.ApplyComplete + (*Timing)(nil), // 30: provisioner.Timing + (*CancelRequest)(nil), // 31: provisioner.CancelRequest + (*Request)(nil), // 32: provisioner.Request + (*Response)(nil), // 33: provisioner.Response + (*Agent_Metadata)(nil), // 34: provisioner.Agent.Metadata + nil, // 35: provisioner.Agent.EnvEntry + (*Resource_Metadata)(nil), // 36: provisioner.Resource.Metadata + nil, // 37: provisioner.ParseComplete.WorkspaceTagsEntry + (*timestamppb.Timestamp)(nil), // 38: google.protobuf.Timestamp +} var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 6, // 0: provisioner.RichParameter.options:type_name -> provisioner.RichParameterOption 0, // 1: provisioner.Log.level:type_name -> provisioner.LogLevel diff --git a/provisionersdk/proto/provisioner_drpc.pb.go b/provisionersdk/proto/provisioner_drpc.pb.go index 2e14497c2b25a..de310e779dcaa 100644 --- a/provisionersdk/proto/provisioner_drpc.pb.go +++ b/provisionersdk/proto/provisioner_drpc.pb.go @@ -7,7 +7,6 @@ package proto import ( context "context" errors "errors" - protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/tailnet/proto/tailnet.pb.go b/tailnet/proto/tailnet.pb.go index ba0403adfb3b6..b2a03fa53f5d1 100644 --- a/tailnet/proto/tailnet.pb.go +++ b/tailnet/proto/tailnet.pb.go @@ -7,14 +7,13 @@ package proto import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" timestamppb "google.golang.org/protobuf/types/known/timestamppb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" + reflect "reflect" + sync "sync" ) const ( @@ -2583,54 +2582,51 @@ func file_tailnet_proto_tailnet_proto_rawDescGZIP() []byte { return file_tailnet_proto_tailnet_proto_rawDescData } -var ( - file_tailnet_proto_tailnet_proto_enumTypes = make([]protoimpl.EnumInfo, 5) - file_tailnet_proto_tailnet_proto_msgTypes = make([]protoimpl.MessageInfo, 32) - file_tailnet_proto_tailnet_proto_goTypes = []interface{}{ - (CoordinateResponse_PeerUpdate_Kind)(0), // 0: coder.tailnet.v2.CoordinateResponse.PeerUpdate.Kind - (IPFields_IPClass)(0), // 1: coder.tailnet.v2.IPFields.IPClass - (TelemetryEvent_Status)(0), // 2: coder.tailnet.v2.TelemetryEvent.Status - (TelemetryEvent_ClientType)(0), // 3: coder.tailnet.v2.TelemetryEvent.ClientType - (Workspace_Status)(0), // 4: coder.tailnet.v2.Workspace.Status - (*DERPMap)(nil), // 5: coder.tailnet.v2.DERPMap - (*StreamDERPMapsRequest)(nil), // 6: coder.tailnet.v2.StreamDERPMapsRequest - (*Node)(nil), // 7: coder.tailnet.v2.Node - (*RefreshResumeTokenRequest)(nil), // 8: coder.tailnet.v2.RefreshResumeTokenRequest - (*RefreshResumeTokenResponse)(nil), // 9: coder.tailnet.v2.RefreshResumeTokenResponse - (*CoordinateRequest)(nil), // 10: coder.tailnet.v2.CoordinateRequest - (*CoordinateResponse)(nil), // 11: coder.tailnet.v2.CoordinateResponse - (*IPFields)(nil), // 12: coder.tailnet.v2.IPFields - (*Netcheck)(nil), // 13: coder.tailnet.v2.Netcheck - (*TelemetryEvent)(nil), // 14: coder.tailnet.v2.TelemetryEvent - (*TelemetryRequest)(nil), // 15: coder.tailnet.v2.TelemetryRequest - (*TelemetryResponse)(nil), // 16: coder.tailnet.v2.TelemetryResponse - (*WorkspaceUpdatesRequest)(nil), // 17: coder.tailnet.v2.WorkspaceUpdatesRequest - (*WorkspaceUpdate)(nil), // 18: coder.tailnet.v2.WorkspaceUpdate - (*Workspace)(nil), // 19: coder.tailnet.v2.Workspace - (*Agent)(nil), // 20: coder.tailnet.v2.Agent - (*DERPMap_HomeParams)(nil), // 21: coder.tailnet.v2.DERPMap.HomeParams - (*DERPMap_Region)(nil), // 22: coder.tailnet.v2.DERPMap.Region - nil, // 23: coder.tailnet.v2.DERPMap.RegionsEntry - nil, // 24: coder.tailnet.v2.DERPMap.HomeParams.RegionScoreEntry - (*DERPMap_Region_Node)(nil), // 25: coder.tailnet.v2.DERPMap.Region.Node - nil, // 26: coder.tailnet.v2.Node.DerpLatencyEntry - nil, // 27: coder.tailnet.v2.Node.DerpForcedWebsocketEntry - (*CoordinateRequest_UpdateSelf)(nil), // 28: coder.tailnet.v2.CoordinateRequest.UpdateSelf - (*CoordinateRequest_Disconnect)(nil), // 29: coder.tailnet.v2.CoordinateRequest.Disconnect - (*CoordinateRequest_Tunnel)(nil), // 30: coder.tailnet.v2.CoordinateRequest.Tunnel - (*CoordinateRequest_ReadyForHandshake)(nil), // 31: coder.tailnet.v2.CoordinateRequest.ReadyForHandshake - (*CoordinateResponse_PeerUpdate)(nil), // 32: coder.tailnet.v2.CoordinateResponse.PeerUpdate - nil, // 33: coder.tailnet.v2.Netcheck.RegionV4LatencyEntry - nil, // 34: coder.tailnet.v2.Netcheck.RegionV6LatencyEntry - (*Netcheck_NetcheckIP)(nil), // 35: coder.tailnet.v2.Netcheck.NetcheckIP - (*TelemetryEvent_P2PEndpoint)(nil), // 36: coder.tailnet.v2.TelemetryEvent.P2PEndpoint - (*timestamppb.Timestamp)(nil), // 37: google.protobuf.Timestamp - (*durationpb.Duration)(nil), // 38: google.protobuf.Duration - (*wrapperspb.BoolValue)(nil), // 39: google.protobuf.BoolValue - (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue - } -) - +var file_tailnet_proto_tailnet_proto_enumTypes = make([]protoimpl.EnumInfo, 5) +var file_tailnet_proto_tailnet_proto_msgTypes = make([]protoimpl.MessageInfo, 32) +var file_tailnet_proto_tailnet_proto_goTypes = []interface{}{ + (CoordinateResponse_PeerUpdate_Kind)(0), // 0: coder.tailnet.v2.CoordinateResponse.PeerUpdate.Kind + (IPFields_IPClass)(0), // 1: coder.tailnet.v2.IPFields.IPClass + (TelemetryEvent_Status)(0), // 2: coder.tailnet.v2.TelemetryEvent.Status + (TelemetryEvent_ClientType)(0), // 3: coder.tailnet.v2.TelemetryEvent.ClientType + (Workspace_Status)(0), // 4: coder.tailnet.v2.Workspace.Status + (*DERPMap)(nil), // 5: coder.tailnet.v2.DERPMap + (*StreamDERPMapsRequest)(nil), // 6: coder.tailnet.v2.StreamDERPMapsRequest + (*Node)(nil), // 7: coder.tailnet.v2.Node + (*RefreshResumeTokenRequest)(nil), // 8: coder.tailnet.v2.RefreshResumeTokenRequest + (*RefreshResumeTokenResponse)(nil), // 9: coder.tailnet.v2.RefreshResumeTokenResponse + (*CoordinateRequest)(nil), // 10: coder.tailnet.v2.CoordinateRequest + (*CoordinateResponse)(nil), // 11: coder.tailnet.v2.CoordinateResponse + (*IPFields)(nil), // 12: coder.tailnet.v2.IPFields + (*Netcheck)(nil), // 13: coder.tailnet.v2.Netcheck + (*TelemetryEvent)(nil), // 14: coder.tailnet.v2.TelemetryEvent + (*TelemetryRequest)(nil), // 15: coder.tailnet.v2.TelemetryRequest + (*TelemetryResponse)(nil), // 16: coder.tailnet.v2.TelemetryResponse + (*WorkspaceUpdatesRequest)(nil), // 17: coder.tailnet.v2.WorkspaceUpdatesRequest + (*WorkspaceUpdate)(nil), // 18: coder.tailnet.v2.WorkspaceUpdate + (*Workspace)(nil), // 19: coder.tailnet.v2.Workspace + (*Agent)(nil), // 20: coder.tailnet.v2.Agent + (*DERPMap_HomeParams)(nil), // 21: coder.tailnet.v2.DERPMap.HomeParams + (*DERPMap_Region)(nil), // 22: coder.tailnet.v2.DERPMap.Region + nil, // 23: coder.tailnet.v2.DERPMap.RegionsEntry + nil, // 24: coder.tailnet.v2.DERPMap.HomeParams.RegionScoreEntry + (*DERPMap_Region_Node)(nil), // 25: coder.tailnet.v2.DERPMap.Region.Node + nil, // 26: coder.tailnet.v2.Node.DerpLatencyEntry + nil, // 27: coder.tailnet.v2.Node.DerpForcedWebsocketEntry + (*CoordinateRequest_UpdateSelf)(nil), // 28: coder.tailnet.v2.CoordinateRequest.UpdateSelf + (*CoordinateRequest_Disconnect)(nil), // 29: coder.tailnet.v2.CoordinateRequest.Disconnect + (*CoordinateRequest_Tunnel)(nil), // 30: coder.tailnet.v2.CoordinateRequest.Tunnel + (*CoordinateRequest_ReadyForHandshake)(nil), // 31: coder.tailnet.v2.CoordinateRequest.ReadyForHandshake + (*CoordinateResponse_PeerUpdate)(nil), // 32: coder.tailnet.v2.CoordinateResponse.PeerUpdate + nil, // 33: coder.tailnet.v2.Netcheck.RegionV4LatencyEntry + nil, // 34: coder.tailnet.v2.Netcheck.RegionV6LatencyEntry + (*Netcheck_NetcheckIP)(nil), // 35: coder.tailnet.v2.Netcheck.NetcheckIP + (*TelemetryEvent_P2PEndpoint)(nil), // 36: coder.tailnet.v2.TelemetryEvent.P2PEndpoint + (*timestamppb.Timestamp)(nil), // 37: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 38: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 39: google.protobuf.BoolValue + (*wrapperspb.FloatValue)(nil), // 40: google.protobuf.FloatValue +} var file_tailnet_proto_tailnet_proto_depIdxs = []int32{ 21, // 0: coder.tailnet.v2.DERPMap.home_params:type_name -> coder.tailnet.v2.DERPMap.HomeParams 23, // 1: coder.tailnet.v2.DERPMap.regions:type_name -> coder.tailnet.v2.DERPMap.RegionsEntry diff --git a/tailnet/proto/tailnet_drpc.pb.go b/tailnet/proto/tailnet_drpc.pb.go index c205bf8193e65..9dac4c06f3108 100644 --- a/tailnet/proto/tailnet_drpc.pb.go +++ b/tailnet/proto/tailnet_drpc.pb.go @@ -7,7 +7,6 @@ package proto import ( context "context" errors "errors" - protojson "google.golang.org/protobuf/encoding/protojson" proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" diff --git a/vpn/vpn.pb.go b/vpn/vpn.pb.go index a6f81343d69ea..181f57d617fa4 100644 --- a/vpn/vpn.pb.go +++ b/vpn/vpn.pb.go @@ -7,12 +7,11 @@ package vpn import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) const ( @@ -1885,37 +1884,34 @@ func file_vpn_vpn_proto_rawDescGZIP() []byte { return file_vpn_vpn_proto_rawDescData } -var ( - file_vpn_vpn_proto_enumTypes = make([]protoimpl.EnumInfo, 2) - file_vpn_vpn_proto_msgTypes = make([]protoimpl.MessageInfo, 21) - file_vpn_vpn_proto_goTypes = []interface{}{ - (Log_Level)(0), // 0: vpn.Log.Level - (Workspace_Status)(0), // 1: vpn.Workspace.Status - (*RPC)(nil), // 2: vpn.RPC - (*ManagerMessage)(nil), // 3: vpn.ManagerMessage - (*TunnelMessage)(nil), // 4: vpn.TunnelMessage - (*Log)(nil), // 5: vpn.Log - (*GetPeerUpdate)(nil), // 6: vpn.GetPeerUpdate - (*PeerUpdate)(nil), // 7: vpn.PeerUpdate - (*Workspace)(nil), // 8: vpn.Workspace - (*Agent)(nil), // 9: vpn.Agent - (*NetworkSettingsRequest)(nil), // 10: vpn.NetworkSettingsRequest - (*NetworkSettingsResponse)(nil), // 11: vpn.NetworkSettingsResponse - (*StartRequest)(nil), // 12: vpn.StartRequest - (*StartResponse)(nil), // 13: vpn.StartResponse - (*StopRequest)(nil), // 14: vpn.StopRequest - (*StopResponse)(nil), // 15: vpn.StopResponse - (*Log_Field)(nil), // 16: vpn.Log.Field - (*NetworkSettingsRequest_DNSSettings)(nil), // 17: vpn.NetworkSettingsRequest.DNSSettings - (*NetworkSettingsRequest_IPv4Settings)(nil), // 18: vpn.NetworkSettingsRequest.IPv4Settings - (*NetworkSettingsRequest_IPv6Settings)(nil), // 19: vpn.NetworkSettingsRequest.IPv6Settings - (*NetworkSettingsRequest_IPv4Settings_IPv4Route)(nil), // 20: vpn.NetworkSettingsRequest.IPv4Settings.IPv4Route - (*NetworkSettingsRequest_IPv6Settings_IPv6Route)(nil), // 21: vpn.NetworkSettingsRequest.IPv6Settings.IPv6Route - (*StartRequest_Header)(nil), // 22: vpn.StartRequest.Header - (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp - } -) - +var file_vpn_vpn_proto_enumTypes = make([]protoimpl.EnumInfo, 2) +var file_vpn_vpn_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_vpn_vpn_proto_goTypes = []interface{}{ + (Log_Level)(0), // 0: vpn.Log.Level + (Workspace_Status)(0), // 1: vpn.Workspace.Status + (*RPC)(nil), // 2: vpn.RPC + (*ManagerMessage)(nil), // 3: vpn.ManagerMessage + (*TunnelMessage)(nil), // 4: vpn.TunnelMessage + (*Log)(nil), // 5: vpn.Log + (*GetPeerUpdate)(nil), // 6: vpn.GetPeerUpdate + (*PeerUpdate)(nil), // 7: vpn.PeerUpdate + (*Workspace)(nil), // 8: vpn.Workspace + (*Agent)(nil), // 9: vpn.Agent + (*NetworkSettingsRequest)(nil), // 10: vpn.NetworkSettingsRequest + (*NetworkSettingsResponse)(nil), // 11: vpn.NetworkSettingsResponse + (*StartRequest)(nil), // 12: vpn.StartRequest + (*StartResponse)(nil), // 13: vpn.StartResponse + (*StopRequest)(nil), // 14: vpn.StopRequest + (*StopResponse)(nil), // 15: vpn.StopResponse + (*Log_Field)(nil), // 16: vpn.Log.Field + (*NetworkSettingsRequest_DNSSettings)(nil), // 17: vpn.NetworkSettingsRequest.DNSSettings + (*NetworkSettingsRequest_IPv4Settings)(nil), // 18: vpn.NetworkSettingsRequest.IPv4Settings + (*NetworkSettingsRequest_IPv6Settings)(nil), // 19: vpn.NetworkSettingsRequest.IPv6Settings + (*NetworkSettingsRequest_IPv4Settings_IPv4Route)(nil), // 20: vpn.NetworkSettingsRequest.IPv4Settings.IPv4Route + (*NetworkSettingsRequest_IPv6Settings_IPv6Route)(nil), // 21: vpn.NetworkSettingsRequest.IPv6Settings.IPv6Route + (*StartRequest_Header)(nil), // 22: vpn.StartRequest.Header + (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp +} var file_vpn_vpn_proto_depIdxs = []int32{ 2, // 0: vpn.ManagerMessage.rpc:type_name -> vpn.RPC 6, // 1: vpn.ManagerMessage.get_peer_update:type_name -> vpn.GetPeerUpdate From 80e39a0105e991f1042b83af672b8188a7debf1d Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 30 Dec 2024 09:08:25 +0000 Subject: [PATCH 7/8] don't format generated go files --- Makefile | 35 ++++++----------------------------- coderd/database/models.go | 6 ++++-- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 16190e681b6d3..2a000c2293761 100644 --- a/Makefile +++ b/Makefile @@ -417,7 +417,7 @@ RESET := $(shell tput sgr0 2>/dev/null) fmt: fmt/ts fmt/go fmt/terraform fmt/shfmt fmt/prettier .PHONY: fmt -GO_FMT_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go' ! -name '*.pb.go') +GO_FMT_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go' -exec sh -c 'grep -L "DO NOT EDIT" "{}" 2>/dev/null || true' \;) fmt/go: go mod tidy @@ -513,9 +513,7 @@ TAILNETTEST_MOCKS := \ tailnet/tailnettest/workspaceupdatesprovidermock.go \ tailnet/tailnettest/subscriptionmock.go - -# all gen targets should be added here and to gen/mark-fresh -gen: \ +GEN_FILES := \ tailnet/proto/tailnet.pb.go \ agent/proto/agent.pb.go \ provisionersdk/proto/provisioner.pb.go \ @@ -540,36 +538,15 @@ gen: \ examples/examples.gen.json \ $(TAILNETTEST_MOCKS) \ coderd/database/pubsub/psmock/psmock.go + +# all gen targets should be added here and to gen/mark-fresh +gen: $(GEN_FILES) .PHONY: gen # Mark all generated files as fresh so make thinks they're up-to-date. This is # used during releases so we don't run generation scripts. gen/mark-fresh: - files="\ - tailnet/proto/tailnet.pb.go \ - agent/proto/agent.pb.go \ - provisionersdk/proto/provisioner.pb.go \ - provisionerd/proto/provisionerd.pb.go \ - vpn/vpn.pb.go \ - coderd/database/dump.sql \ - $(DB_GEN_FILES) \ - site/src/api/typesGenerated.ts \ - coderd/rbac/object_gen.go \ - codersdk/rbacresources_gen.go \ - site/src/api/rbacresourcesGenerated.ts \ - site/src/api/countriesGenerated.ts \ - docs/admin/integrations/prometheus.md \ - docs/reference/cli/index.md \ - docs/admin/security/audit-logs.md \ - coderd/apidoc/swagger.json \ - .prettierignore.include \ - .prettierignore \ - site/e2e/provisionerGenerated.ts \ - site/src/theme/icons.json \ - examples/examples.gen.json \ - $(TAILNETTEST_MOCKS) \ - coderd/database/pubsub/psmock/psmock.go \ - " + files="$(GEN_FILES)" for file in $$files; do echo "$$file" diff --git a/coderd/database/models.go b/coderd/database/models.go index 78948974bfd1b..e5ddebcbc8b9a 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -517,7 +517,8 @@ func (ns NullGroupSource) Value() (driver.Value, error) { func (e GroupSource) Valid() bool { switch e { - case GroupSourceUser, GroupSourceOidc: + case GroupSourceUser, + GroupSourceOidc: return true } return false @@ -1731,7 +1732,8 @@ func (ns NullTailnetStatus) Value() (driver.Value, error) { func (e TailnetStatus) Valid() bool { switch e { - case TailnetStatusOk, TailnetStatusLost: + case TailnetStatusOk, + TailnetStatusLost: return true } return false From d25cf8a37c512ed54027892030f6bf346d59a718 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 30 Dec 2024 09:16:13 +0000 Subject: [PATCH 8/8] revert change to gen/mark-fresh --- Makefile | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2a000c2293761..26dc74b00966c 100644 --- a/Makefile +++ b/Makefile @@ -546,7 +546,31 @@ gen: $(GEN_FILES) # Mark all generated files as fresh so make thinks they're up-to-date. This is # used during releases so we don't run generation scripts. gen/mark-fresh: - files="$(GEN_FILES)" + files="\ + tailnet/proto/tailnet.pb.go \ + agent/proto/agent.pb.go \ + provisionersdk/proto/provisioner.pb.go \ + provisionerd/proto/provisionerd.pb.go \ + vpn/vpn.pb.go \ + coderd/database/dump.sql \ + $(DB_GEN_FILES) \ + site/src/api/typesGenerated.ts \ + coderd/rbac/object_gen.go \ + codersdk/rbacresources_gen.go \ + site/src/api/rbacresourcesGenerated.ts \ + site/src/api/countriesGenerated.ts \ + docs/admin/integrations/prometheus.md \ + docs/reference/cli/index.md \ + docs/admin/security/audit-logs.md \ + coderd/apidoc/swagger.json \ + .prettierignore.include \ + .prettierignore \ + site/e2e/provisionerGenerated.ts \ + site/src/theme/icons.json \ + examples/examples.gen.json \ + $(TAILNETTEST_MOCKS) \ + coderd/database/pubsub/psmock/psmock.go \ + " for file in $$files; do echo "$$file"