diff --git a/docs/reference/cli.md b/docs/reference/cli.md index fc244da3ae..dddd3e113b 100644 --- a/docs/reference/cli.md +++ b/docs/reference/cli.md @@ -21,7 +21,6 @@ Flags: -f, --file string specify an alternate config file (default: sqlc.yaml) -h, --help help for sqlc --no-database disable database connections (default: false) - --no-remote disable remote execution (default: false) Use "sqlc [command] --help" for more information about a command. ``` diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 80a167353e..f9c09dfe06 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -37,8 +37,6 @@ func init() { func Do(args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) int { rootCmd := &cobra.Command{Use: "sqlc", SilenceUsage: true} rootCmd.PersistentFlags().StringP("file", "f", "", "specify an alternate config file (default: sqlc.yaml)") - rootCmd.PersistentFlags().Bool("no-remote", false, "disable remote execution (default: false)") - rootCmd.PersistentFlags().Bool("remote", false, "enable remote execution (default: false)") rootCmd.AddCommand(checkCmd) rootCmd.AddCommand(createDBCmd) @@ -141,20 +139,14 @@ type Env struct { DryRun bool Debug opts.Debug Experiment opts.Experiment - Remote bool - NoRemote bool } func ParseEnv(c *cobra.Command) Env { dr := c.Flag("dry-run") - r := c.Flag("remote") - nr := c.Flag("no-remote") return Env{ DryRun: dr != nil && dr.Changed, Debug: opts.DebugFromEnv(), Experiment: opts.ExperimentFromEnv(), - Remote: r != nil && r.Value.String() == "true", - NoRemote: nr != nil && nr.Value.String() == "true", } } diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go index 05b5445ebb..ca3ee680b5 100644 --- a/internal/cmd/generate.go +++ b/internal/cmd/generate.go @@ -13,7 +13,6 @@ import ( "sync" "google.golang.org/grpc" - "google.golang.org/grpc/status" "github.com/sqlc-dev/sqlc/internal/codegen/golang" genjson "github.com/sqlc-dev/sqlc/internal/codegen/json" @@ -24,12 +23,9 @@ import ( "github.com/sqlc-dev/sqlc/internal/ext" "github.com/sqlc-dev/sqlc/internal/ext/process" "github.com/sqlc-dev/sqlc/internal/ext/wasm" - "github.com/sqlc-dev/sqlc/internal/info" "github.com/sqlc-dev/sqlc/internal/multierr" "github.com/sqlc-dev/sqlc/internal/opts" "github.com/sqlc-dev/sqlc/internal/plugin" - "github.com/sqlc-dev/sqlc/internal/remote" - "github.com/sqlc-dev/sqlc/internal/sql/sqlpath" ) const errMessageNoVersion = `The configuration file must have a version number. @@ -151,11 +147,6 @@ func Generate(ctx context.Context, dir, filename string, o *Options) (map[string return nil, err } - // Comment on why these two methods exist - if conf.Cloud.Project != "" && e.Remote && !e.NoRemote { - return remoteGenerate(ctx, configPath, conf, dir, stderr) - } - g := &generator{ dir: dir, output: map[string]string{}, @@ -230,69 +221,6 @@ func (g *generator) ProcessResult(ctx context.Context, combo config.CombinedSett return nil } -func remoteGenerate(ctx context.Context, configPath string, conf *config.Config, dir string, stderr io.Writer) (map[string]string, error) { - rpcClient, err := remote.NewClient(conf.Cloud) - if err != nil { - fmt.Fprintf(stderr, "error creating rpc client: %s\n", err) - return nil, err - } - - configBytes, err := os.ReadFile(configPath) - if err != nil { - fmt.Fprintf(stderr, "error reading config file %s: %s\n", configPath, err) - return nil, err - } - - rpcReq := remote.GenerateRequest{ - Version: info.Version, - Inputs: []*remote.File{{Path: filepath.Base(configPath), Bytes: configBytes}}, - } - - for _, pkg := range conf.SQL { - for _, paths := range []config.Paths{pkg.Schema, pkg.Queries} { - for i, relFilePath := range paths { - paths[i] = filepath.Join(dir, relFilePath) - } - files, err := sqlpath.Glob(paths) - if err != nil { - fmt.Fprintf(stderr, "error globbing paths: %s\n", err) - return nil, err - } - for _, filePath := range files { - fileBytes, err := os.ReadFile(filePath) - if err != nil { - fmt.Fprintf(stderr, "error reading file %s: %s\n", filePath, err) - return nil, err - } - fileRelPath, _ := filepath.Rel(dir, filePath) - rpcReq.Inputs = append(rpcReq.Inputs, &remote.File{Path: fileRelPath, Bytes: fileBytes}) - } - } - } - - rpcResp, err := rpcClient.Generate(ctx, &rpcReq) - if err != nil { - rpcStatus, ok := status.FromError(err) - if !ok { - return nil, err - } - fmt.Fprintf(stderr, "rpc error: %s", rpcStatus.Message()) - return nil, rpcStatus.Err() - } - - if rpcResp.ExitCode != 0 { - fmt.Fprintf(stderr, "%s", rpcResp.Stderr) - return nil, errors.New("remote execution returned with non-zero exit code") - } - - output := map[string]string{} - for _, file := range rpcResp.Outputs { - output[filepath.Join(dir, file.Path)] = string(file.Bytes) - } - - return output, nil -} - func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.CombinedSettings, parserOpts opts.Parser, stderr io.Writer) (*compiler.Result, bool) { defer trace.StartRegion(ctx, "parse").End() c, err := compiler.NewCompiler(sql, combo, parserOpts) diff --git a/internal/endtoend/endtoend_test.go b/internal/endtoend/endtoend_test.go index 7634918446..91e44ff7f0 100644 --- a/internal/endtoend/endtoend_test.go +++ b/internal/endtoend/endtoend_test.go @@ -265,7 +265,6 @@ func TestReplay(t *testing.T) { Env: cmd.Env{ Debug: opts.DebugFromString(args.Env["SQLCDEBUG"]), Experiment: opts.ExperimentFromString(args.Env["SQLCEXPERIMENT"]), - NoRemote: true, }, Stderr: &stderr, MutateConfig: testctx.Mutate(t, path), diff --git a/internal/remote/gen.pb.go b/internal/remote/gen.pb.go deleted file mode 100644 index bba3d16444..0000000000 --- a/internal/remote/gen.pb.go +++ /dev/null @@ -1,340 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.0 -// protoc v3.21.0 -// source: internal/remote/gen.proto - -package remote - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -type GenerateRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - Inputs []*File `protobuf:"bytes,2,rep,name=inputs,proto3" json:"inputs,omitempty"` -} - -func (x *GenerateRequest) Reset() { - *x = GenerateRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_remote_gen_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GenerateRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GenerateRequest) ProtoMessage() {} - -func (x *GenerateRequest) ProtoReflect() protoreflect.Message { - mi := &file_internal_remote_gen_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GenerateRequest.ProtoReflect.Descriptor instead. -func (*GenerateRequest) Descriptor() ([]byte, []int) { - return file_internal_remote_gen_proto_rawDescGZIP(), []int{0} -} - -func (x *GenerateRequest) GetVersion() string { - if x != nil { - return x.Version - } - return "" -} - -func (x *GenerateRequest) GetInputs() []*File { - if x != nil { - return x.Inputs - } - return nil -} - -type GenerateResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Outputs []*File `protobuf:"bytes,1,rep,name=outputs,proto3" json:"outputs,omitempty"` - ExitCode int64 `protobuf:"varint,2,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"` - Stdout []byte `protobuf:"bytes,3,opt,name=stdout,proto3" json:"stdout,omitempty"` - Stderr []byte `protobuf:"bytes,4,opt,name=stderr,proto3" json:"stderr,omitempty"` -} - -func (x *GenerateResponse) Reset() { - *x = GenerateResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_remote_gen_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GenerateResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GenerateResponse) ProtoMessage() {} - -func (x *GenerateResponse) ProtoReflect() protoreflect.Message { - mi := &file_internal_remote_gen_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GenerateResponse.ProtoReflect.Descriptor instead. -func (*GenerateResponse) Descriptor() ([]byte, []int) { - return file_internal_remote_gen_proto_rawDescGZIP(), []int{1} -} - -func (x *GenerateResponse) GetOutputs() []*File { - if x != nil { - return x.Outputs - } - return nil -} - -func (x *GenerateResponse) GetExitCode() int64 { - if x != nil { - return x.ExitCode - } - return 0 -} - -func (x *GenerateResponse) GetStdout() []byte { - if x != nil { - return x.Stdout - } - return nil -} - -func (x *GenerateResponse) GetStderr() []byte { - if x != nil { - return x.Stderr - } - return nil -} - -type File struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - ContentType string `protobuf:"bytes,2,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"` - Bytes []byte `protobuf:"bytes,3,opt,name=bytes,proto3" json:"bytes,omitempty"` -} - -func (x *File) Reset() { - *x = File{} - if protoimpl.UnsafeEnabled { - mi := &file_internal_remote_gen_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *File) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*File) ProtoMessage() {} - -func (x *File) ProtoReflect() protoreflect.Message { - mi := &file_internal_remote_gen_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use File.ProtoReflect.Descriptor instead. -func (*File) Descriptor() ([]byte, []int) { - return file_internal_remote_gen_proto_rawDescGZIP(), []int{2} -} - -func (x *File) GetPath() string { - if x != nil { - return x.Path - } - return "" -} - -func (x *File) GetContentType() string { - if x != nil { - return x.ContentType - } - return "" -} - -func (x *File) GetBytes() []byte { - if x != nil { - return x.Bytes - } - return nil -} - -var File_internal_remote_gen_proto protoreflect.FileDescriptor - -var file_internal_remote_gen_proto_rawDesc = []byte{ - 0x0a, 0x19, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2f, 0x67, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x2e, 0x73, 0x71, 0x6c, 0x63, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x47, 0x65, 0x6e, - 0x2e, 0x76, 0x31, 0x22, 0x61, 0x0a, 0x0f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x12, 0x34, 0x0a, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x73, 0x71, 0x6c, 0x63, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x47, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x06, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x22, 0x97, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x6f, - 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x73, 0x71, 0x6c, 0x63, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x47, - 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x70, - 0x75, 0x74, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x78, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x64, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x65, 0x78, 0x69, 0x74, 0x43, 0x6f, 0x64, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x65, - 0x72, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, - 0x22, 0x53, 0x0a, 0x04, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x0c, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, - 0x62, 0x79, 0x74, 0x65, 0x73, 0x32, 0x64, 0x0a, 0x03, 0x47, 0x65, 0x6e, 0x12, 0x5d, 0x0a, 0x08, - 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x12, 0x27, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2e, 0x73, 0x71, 0x6c, 0x63, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x47, 0x65, 0x6e, 0x2e, 0x76, - 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x28, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x73, 0x71, 0x6c, 0x63, 0x2e, - 0x64, 0x65, 0x76, 0x2e, 0x47, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, -} - -var ( - file_internal_remote_gen_proto_rawDescOnce sync.Once - file_internal_remote_gen_proto_rawDescData = file_internal_remote_gen_proto_rawDesc -) - -func file_internal_remote_gen_proto_rawDescGZIP() []byte { - file_internal_remote_gen_proto_rawDescOnce.Do(func() { - file_internal_remote_gen_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_remote_gen_proto_rawDescData) - }) - return file_internal_remote_gen_proto_rawDescData -} - -var file_internal_remote_gen_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_internal_remote_gen_proto_goTypes = []interface{}{ - (*GenerateRequest)(nil), // 0: remote.sqlc.dev.Gen.v1.GenerateRequest - (*GenerateResponse)(nil), // 1: remote.sqlc.dev.Gen.v1.GenerateResponse - (*File)(nil), // 2: remote.sqlc.dev.Gen.v1.File -} -var file_internal_remote_gen_proto_depIdxs = []int32{ - 2, // 0: remote.sqlc.dev.Gen.v1.GenerateRequest.inputs:type_name -> remote.sqlc.dev.Gen.v1.File - 2, // 1: remote.sqlc.dev.Gen.v1.GenerateResponse.outputs:type_name -> remote.sqlc.dev.Gen.v1.File - 0, // 2: remote.sqlc.dev.Gen.v1.Gen.Generate:input_type -> remote.sqlc.dev.Gen.v1.GenerateRequest - 1, // 3: remote.sqlc.dev.Gen.v1.Gen.Generate:output_type -> remote.sqlc.dev.Gen.v1.GenerateResponse - 3, // [3:4] is the sub-list for method output_type - 2, // [2:3] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name -} - -func init() { file_internal_remote_gen_proto_init() } -func file_internal_remote_gen_proto_init() { - if File_internal_remote_gen_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_internal_remote_gen_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GenerateRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_internal_remote_gen_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GenerateResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_internal_remote_gen_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*File); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_internal_remote_gen_proto_rawDesc, - NumEnums: 0, - NumMessages: 3, - NumExtensions: 0, - NumServices: 1, - }, - GoTypes: file_internal_remote_gen_proto_goTypes, - DependencyIndexes: file_internal_remote_gen_proto_depIdxs, - MessageInfos: file_internal_remote_gen_proto_msgTypes, - }.Build() - File_internal_remote_gen_proto = out.File - file_internal_remote_gen_proto_rawDesc = nil - file_internal_remote_gen_proto_goTypes = nil - file_internal_remote_gen_proto_depIdxs = nil -} diff --git a/internal/remote/gen.proto b/internal/remote/gen.proto deleted file mode 100644 index dc85465154..0000000000 --- a/internal/remote/gen.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto3"; - -package remote.sqlc.dev.Gen.v1; - -service Gen { - rpc Generate(GenerateRequest) returns (GenerateResponse); -} - -message GenerateRequest { - string version = 1; - repeated File inputs = 2; -} - -message GenerateResponse { - repeated File outputs = 1; - int32 exit_code = 2; - bytes stdout = 3; - bytes stderr = 4; -} - -message File { - string path = 1; - string content_type = 2; - bytes bytes = 3; -} \ No newline at end of file diff --git a/internal/remote/gen_grpc.pb.go b/internal/remote/gen_grpc.pb.go deleted file mode 100644 index a2fb3d76a0..0000000000 --- a/internal/remote/gen_grpc.pb.go +++ /dev/null @@ -1,105 +0,0 @@ -// Code generated by protoc-gen-go-grpc. DO NOT EDIT. -// versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.0 -// source: internal/remote/gen.proto - -package remote - -import ( - context "context" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" -) - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 - -// GenClient is the client API for Gen service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -type GenClient interface { - Generate(ctx context.Context, in *GenerateRequest, opts ...grpc.CallOption) (*GenerateResponse, error) -} - -type genClient struct { - cc grpc.ClientConnInterface -} - -func NewGenClient(cc grpc.ClientConnInterface) GenClient { - return &genClient{cc} -} - -func (c *genClient) Generate(ctx context.Context, in *GenerateRequest, opts ...grpc.CallOption) (*GenerateResponse, error) { - out := new(GenerateResponse) - err := c.cc.Invoke(ctx, "/remote.sqlc.dev.Gen.v1.Gen/Generate", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// GenServer is the server API for Gen service. -// All implementations must embed UnimplementedGenServer -// for forward compatibility -type GenServer interface { - Generate(context.Context, *GenerateRequest) (*GenerateResponse, error) - mustEmbedUnimplementedGenServer() -} - -// UnimplementedGenServer must be embedded to have forward compatible implementations. -type UnimplementedGenServer struct { -} - -func (UnimplementedGenServer) Generate(context.Context, *GenerateRequest) (*GenerateResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Generate not implemented") -} -func (UnimplementedGenServer) mustEmbedUnimplementedGenServer() {} - -// UnsafeGenServer may be embedded to opt out of forward compatibility for this service. -// Use of this interface is not recommended, as added methods to GenServer will -// result in compilation errors. -type UnsafeGenServer interface { - mustEmbedUnimplementedGenServer() -} - -func RegisterGenServer(s grpc.ServiceRegistrar, srv GenServer) { - s.RegisterService(&Gen_ServiceDesc, srv) -} - -func _Gen_Generate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GenerateRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(GenServer).Generate(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/remote.sqlc.dev.Gen.v1.Gen/Generate", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(GenServer).Generate(ctx, req.(*GenerateRequest)) - } - return interceptor(ctx, in, info, handler) -} - -// Gen_ServiceDesc is the grpc.ServiceDesc for Gen service. -// It's only intended for direct use with grpc.RegisterService, -// and not to be introspected or modified (even as a copy) -var Gen_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "remote.sqlc.dev.Gen.v1.Gen", - HandlerType: (*GenServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Generate", - Handler: _Gen_Generate_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "internal/remote/gen.proto", -} diff --git a/internal/remote/rpc.go b/internal/remote/rpc.go deleted file mode 100644 index 4adc9f8681..0000000000 --- a/internal/remote/rpc.go +++ /dev/null @@ -1,35 +0,0 @@ -package remote - -import ( - "crypto/tls" - - "github.com/riza-io/grpc-go/credentials/basic" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" - - "github.com/sqlc-dev/sqlc/internal/config" - "github.com/sqlc-dev/sqlc/internal/rpc" -) - -const defaultHostname = "remote.sqlc.dev" - -func NewClient(cloudConfig config.Cloud) (GenClient, error) { - authID := cloudConfig.Organization + "/" + cloudConfig.Project - opts := []grpc.DialOption{ - grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{})), - grpc.WithPerRPCCredentials(basic.NewPerRPCCredentials(authID, cloudConfig.AuthToken)), - grpc.WithUnaryInterceptor(rpc.UnaryInterceptor), - } - - hostname := cloudConfig.Hostname - if hostname == "" { - hostname = defaultHostname - } - - conn, err := grpc.Dial(hostname+":443", opts...) - if err != nil { - return nil, err - } - - return NewGenClient(conn), nil -}