diff --git a/go/cmd/dolt/commands/credcmds/check.go b/go/cmd/dolt/commands/credcmds/check.go new file mode 100644 index 0000000000..8787199665 --- /dev/null +++ b/go/cmd/dolt/commands/credcmds/check.go @@ -0,0 +1,117 @@ +// Copyright 2020 Liquidata, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package credcmds + +import ( + "context" + "fmt" + + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/creds" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" +) + +var checkShortDesc = "Check authenticating with a credential keypair against a doltremoteapi." +var checkLongDesc = `Tests calling a doltremoteapi with dolt credentials and reports the authentication result.` +var checkSynopsis = []string{"[--endpoint doltremoteapi.dolthub.com:443] [--creds ]"} + +func Check(ctx context.Context, commandStr string, args []string, dEnv *env.DoltEnv) int { + ap := argparser.NewArgParser() + ap.SupportsString("endpoint", "", "", "API endpoint, otherwise taken from config.") + ap.SupportsString("creds", "", "", "Public Key ID or Public Key for credentials, otherwise taken from config.") + help, usage := cli.HelpAndUsagePrinters(commandStr, lsShortDesc, lsLongDesc, lsSynopsis, ap) + apr := cli.ParseArgs(ap, args, help) + + endpoint := loadEndpoint(dEnv, apr) + + dc, verr := loadCred(dEnv, apr) + if verr != nil { + return commands.HandleVErrAndExitCode(verr, usage) + } + + verr = checkCredAndPrintSuccess(ctx, dEnv, dc, endpoint) + + return commands.HandleVErrAndExitCode(verr, usage) +} + +func loadEndpoint(dEnv *env.DoltEnv, apr *argparser.ArgParseResults) string { + earg, ok := apr.GetValue("endpoint") + if ok { + return earg + } + + host := dEnv.Config.GetStringOrDefault(env.RemotesApiHostKey, env.DefaultRemotesApiHost) + port := dEnv.Config.GetStringOrDefault(env.RemotesApiHostPortKey, env.DefaultRemotesApiPort) + return fmt.Sprintf("%s:%s", *host, *port) +} + +func loadCred(dEnv *env.DoltEnv, apr *argparser.ArgParseResults) (creds.DoltCreds, errhand.VerboseError) { + keyIdOrPubKey, argSupplied := apr.GetValue("creds") + if argSupplied { + credsdir, err := dEnv.CredsDir() + if err != nil { + return creds.EmptyCreds, errhand.BuildDError("error: reading credentials").AddCause(err).Build() + } + + found, err := dEnv.FindCreds(credsdir, keyIdOrPubKey) + if err != nil { + return creds.EmptyCreds, errhand.BuildDError("error: finding credential %s", keyIdOrPubKey).AddCause(err).Build() + } + + dc, err := creds.JWKCredsReadFromFile(dEnv.FS, found) + if err != nil { + return creds.EmptyCreds, errhand.BuildDError("error: reading credentials").AddCause(err).Build() + } + return dc, nil + } else { + dc, valid, err := dEnv.UserRPCCreds() + if !valid { + return creds.EmptyCreds, errhand.BuildDError("error: no user credentials found").Build() + } + if err != nil { + return creds.EmptyCreds, errhand.BuildDError("error: reading credentials").AddCause(err).Build() + } + return dc, nil + } +} + +func checkCredAndPrintSuccess(ctx context.Context, dEnv *env.DoltEnv, dc creds.DoltCreds, endpoint string) errhand.VerboseError { + conn, err := dEnv.GrpcConnWithCreds(endpoint, false, dc) + + if err != nil { + return errhand.BuildDError("error: unable to connect to server with credentials.").AddCause(err).Build() + } + + grpcClient := remotesapi.NewCredentialsServiceClient(conn) + + cli.Printf("Calling...\n") + cli.Printf(" Endpoint: %s\n", endpoint) + cli.Printf(" Key: %s\n", dc.PubKeyBase32Str()) + + var whoAmI *remotesapi.WhoAmIResponse + whoAmI, err = grpcClient.WhoAmI(ctx, &remotesapi.WhoAmIRequest{}) + if err != nil { + return errhand.BuildDError("error: calling doltremoteapi with credentials.").AddCause(err).Build() + } + + cli.Printf("\nSuccess.\n") + cli.Printf(" User: %s\n", whoAmI.Username) + cli.Printf(" Email: %s\n", whoAmI.EmailAddress) + return nil +} diff --git a/go/cmd/dolt/commands/credcmds/creds.go b/go/cmd/dolt/commands/credcmds/creds.go index b691267510..ec1800f4aa 100644 --- a/go/cmd/dolt/commands/credcmds/creds.go +++ b/go/cmd/dolt/commands/credcmds/creds.go @@ -26,7 +26,5 @@ var Commands = cli.GenSubCommandHandler([]*cli.Command{ // TODO(aaron): Command to select a credential by public key and update global/repo config // to use it for authentication. //{Name: "use", Desc: useShortDesc, Func: Ls, ReqRepo: false, EventType: eventsapi.ClientEventType_CREDS_USE}, - // TODO(aaron): Command to call WhoAmI endpoint for dEnv with selected credentials and output - // result. - //{Name: "test", Desc: testShortDesc, Func: Ls, ReqRepo: false, EventType: eventsapi.ClientEventType_CREDS_TEST}, + {Name: "check", Desc: checkShortDesc, Func: Check, ReqRepo: false, EventType: eventsapi.ClientEventType_CREDS_CHECK}, }) diff --git a/go/gen/proto/dolt/services/eventsapi/v1alpha1/event_constants.pb.go b/go/gen/proto/dolt/services/eventsapi/v1alpha1/event_constants.pb.go index e9098ccbaa..b926c6551c 100644 --- a/go/gen/proto/dolt/services/eventsapi/v1alpha1/event_constants.pb.go +++ b/go/gen/proto/dolt/services/eventsapi/v1alpha1/event_constants.pb.go @@ -101,6 +101,8 @@ const ( ClientEventType_REMOTEAPI_COMMIT ClientEventType = 43 ClientEventType_REMOTEAPI_LIST_TABLE_FILES ClientEventType = 44 ClientEventType_BLAME ClientEventType = 45 + ClientEventType_CREDS_CHECK ClientEventType = 46 + ClientEventType_CREDS_USE ClientEventType = 47 ) var ClientEventType_name = map[int32]string{ @@ -150,6 +152,8 @@ var ClientEventType_name = map[int32]string{ 43: "REMOTEAPI_COMMIT", 44: "REMOTEAPI_LIST_TABLE_FILES", 45: "BLAME", + 46: "CREDS_CHECK", + 47: "CREDS_USE", } var ClientEventType_value = map[string]int32{ @@ -199,6 +203,8 @@ var ClientEventType_value = map[string]int32{ "REMOTEAPI_COMMIT": 43, "REMOTEAPI_LIST_TABLE_FILES": 44, "BLAME": 45, + "CREDS_CHECK": 46, + "CREDS_USE": 47, } func (x ClientEventType) String() string { @@ -303,52 +309,53 @@ func init() { } var fileDescriptor_d970d881fa70959f = []byte{ - // 750 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdb, 0x72, 0xdb, 0x36, - 0x10, 0xad, 0x7c, 0x95, 0xe1, 0x4b, 0xd6, 0x88, 0x9d, 0x6b, 0xeb, 0xb8, 0x6e, 0x7a, 0x53, 0x6b, - 0x69, 0x32, 0x9d, 0xe9, 0x4b, 0x9f, 0x20, 0x70, 0x25, 0x61, 0x02, 0x10, 0x0c, 0x00, 0x5a, 0x49, - 0x5f, 0x30, 0xb2, 0xc2, 0x3a, 0xec, 0x28, 0x92, 0x2a, 0xd1, 0x9e, 0xe9, 0x4f, 0xf7, 0x1b, 0x3a, - 0x20, 0x1b, 0x31, 0xd6, 0x4b, 0xdf, 0xb0, 0x67, 0xcf, 0x39, 0x58, 0x2c, 0x97, 0x4b, 0x7e, 0x7d, - 0x3f, 0x9b, 0x14, 0x9d, 0x65, 0xb6, 0xb8, 0xcb, 0xc7, 0xd9, 0xb2, 0x93, 0xdd, 0x65, 0xd3, 0x62, - 0x39, 0x9a, 0xe7, 0x9d, 0xbb, 0x57, 0xa3, 0xc9, 0xfc, 0xc3, 0xe8, 0x55, 0x05, 0xf9, 0xf1, 0x6c, - 0xba, 0x2c, 0x46, 0xd3, 0x62, 0xd9, 0x9e, 0x2f, 0x66, 0xc5, 0x8c, 0x9e, 0x07, 0x5d, 0xfb, 0x93, - 0xae, 0xbd, 0xd2, 0xb5, 0x3f, 0xe9, 0x5a, 0x03, 0xd2, 0x4c, 0x26, 0xa3, 0xe2, 0x8f, 0xd9, 0xe2, - 0x23, 0x7d, 0x42, 0x4e, 0x12, 0xc9, 0x5c, 0x4f, 0x1b, 0xe5, 0xd3, 0xd8, 0x26, 0xc8, 0x45, 0x4f, - 0x60, 0x04, 0x5f, 0xd0, 0x3d, 0xb2, 0x2d, 0x45, 0x9c, 0xbe, 0x85, 0x06, 0xdd, 0x27, 0xbb, 0x43, - 0x11, 0x47, 0x7a, 0x68, 0x61, 0x83, 0x12, 0xb2, 0x13, 0x31, 0x33, 0x14, 0x31, 0x6c, 0xb6, 0xfe, - 0xd9, 0x26, 0x0f, 0xf8, 0x24, 0xcf, 0xa6, 0x05, 0x86, 0x6b, 0xdc, 0xdf, 0xf3, 0x8c, 0x9e, 0x10, - 0x70, 0xef, 0x12, 0x5c, 0x73, 0x6b, 0x92, 0x2d, 0x11, 0x0b, 0x07, 0x8d, 0xa0, 0xb7, 0x8e, 0xb9, - 0x34, 0x78, 0xed, 0x92, 0x4d, 0x16, 0x45, 0xb0, 0x19, 0x2e, 0x33, 0x68, 0xd1, 0xc1, 0x56, 0xc8, - 0x73, 0xad, 0x94, 0x70, 0xb0, 0x1d, 0xf2, 0xf6, 0x8d, 0x84, 0x1d, 0x7a, 0x44, 0x88, 0x7d, 0x23, - 0xbd, 0x45, 0x73, 0x85, 0x06, 0x76, 0x43, 0x42, 0xea, 0x3e, 0x34, 0x83, 0x6f, 0x24, 0x7a, 0x3d, - 0xd8, 0x0b, 0x16, 0x0a, 0x4d, 0x1f, 0x81, 0x04, 0x8b, 0xae, 0x61, 0x31, 0x1f, 0xc0, 0x3e, 0x3d, - 0x20, 0x4d, 0x3e, 0x40, 0xfe, 0x5a, 0xa7, 0x0e, 0x0e, 0x42, 0xc6, 0xa0, 0xd2, 0x0e, 0xe1, 0x30, - 0x48, 0x93, 0xd4, 0x0e, 0xe0, 0xa8, 0x3a, 0x49, 0x09, 0x0f, 0x82, 0x49, 0x0f, 0x1d, 0x1f, 0x00, - 0x84, 0x23, 0x97, 0x3a, 0x46, 0x38, 0x2e, 0x5b, 0xa1, 0xfb, 0x22, 0x06, 0x1a, 0x5a, 0x71, 0x85, - 0xc6, 0x0a, 0x1d, 0xc3, 0xc3, 0xaa, 0xd4, 0xb8, 0x27, 0xfa, 0x70, 0x42, 0x77, 0xc8, 0x86, 0xb4, - 0x70, 0x5a, 0x3e, 0x8f, 0x0f, 0x50, 0x31, 0x78, 0x44, 0x81, 0x1c, 0x38, 0xd6, 0x95, 0xe8, 0x85, - 0x4a, 0xb4, 0x71, 0xf0, 0xb8, 0x46, 0xf0, 0x6d, 0x89, 0x3c, 0xa9, 0x11, 0x6e, 0x90, 0x39, 0x84, - 0xa7, 0xa1, 0xe2, 0x0a, 0x31, 0x0a, 0x9e, 0xd5, 0x91, 0xba, 0x82, 0xe7, 0x75, 0xc4, 0x13, 0xf8, - 0xb2, 0xd6, 0x5a, 0x94, 0xc8, 0x1d, 0x7c, 0x45, 0x8f, 0xc9, 0x61, 0x85, 0x24, 0xa9, 0xf3, 0x46, - 0x0f, 0xe1, 0xac, 0x26, 0x19, 0x55, 0x22, 0x2f, 0xe8, 0x21, 0xd9, 0xe3, 0x06, 0x23, 0xeb, 0x63, - 0x1c, 0xc2, 0x79, 0xd9, 0xa1, 0x32, 0x34, 0x0a, 0xbe, 0xae, 0x23, 0x69, 0xe1, 0xa2, 0x8c, 0x74, - 0xdc, 0xf3, 0x9c, 0x39, 0xf8, 0x26, 0x58, 0x95, 0x91, 0x41, 0xab, 0xe5, 0x15, 0xc2, 0x4b, 0xfa, - 0x82, 0x3c, 0xaf, 0xfa, 0xc9, 0x12, 0xe1, 0xfb, 0xe8, 0xbc, 0xc1, 0x44, 0x7b, 0x85, 0x8e, 0x45, - 0xcc, 0x31, 0xf8, 0x36, 0xcc, 0x57, 0x4d, 0x18, 0x30, 0xeb, 0xf9, 0x20, 0x8d, 0x5f, 0x5b, 0xf8, - 0x8e, 0xbe, 0x24, 0xe7, 0xf7, 0xa5, 0x91, 0x1e, 0xc6, 0x52, 0xb3, 0xc8, 0x4b, 0xcd, 0x99, 0x13, - 0x3a, 0xb6, 0xf0, 0x3d, 0xbd, 0x20, 0x67, 0xf7, 0x59, 0x69, 0xb2, 0xc6, 0xf9, 0x21, 0x4c, 0x5c, - 0xcd, 0x31, 0xd8, 0x65, 0x16, 0xe1, 0x47, 0x4a, 0xc9, 0xd1, 0x67, 0xa8, 0xd6, 0x0e, 0x5a, 0xf7, - 0x99, 0xff, 0x4d, 0xd9, 0x4f, 0xf4, 0x8c, 0x3c, 0xab, 0x51, 0x29, 0xac, 0xf3, 0x55, 0xc3, 0x7a, - 0x42, 0xa2, 0x85, 0x9f, 0xc3, 0xe7, 0xef, 0x4a, 0xa6, 0x10, 0x2e, 0x5b, 0x7f, 0x92, 0xa6, 0xca, - 0x8a, 0x45, 0x3e, 0x16, 0x11, 0x7d, 0x44, 0xa8, 0x42, 0x67, 0x04, 0x5f, 0x1b, 0xf5, 0x13, 0x02, - 0xdd, 0x77, 0x0e, 0xed, 0xea, 0x41, 0x18, 0x41, 0x83, 0x3e, 0x26, 0x0f, 0x57, 0x0f, 0x54, 0xd6, - 0xa3, 0x64, 0x89, 0xc5, 0x08, 0x36, 0x42, 0xe2, 0xb3, 0x3a, 0x13, 0xee, 0xd1, 0x18, 0x6d, 0x60, - 0xb3, 0x85, 0x64, 0x9f, 0x15, 0xc5, 0x22, 0xbf, 0xbe, 0x2d, 0x32, 0x11, 0xd1, 0xa7, 0xe4, 0x94, - 0x39, 0x67, 0x44, 0x37, 0x75, 0xeb, 0x3f, 0xd7, 0x29, 0x39, 0xae, 0x2c, 0x7c, 0x6a, 0xa4, 0x2f, - 0xc7, 0x0f, 0x61, 0xe3, 0x62, 0xab, 0xd9, 0x80, 0x46, 0xeb, 0x92, 0x6c, 0xb3, 0xf9, 0xbc, 0xaa, - 0x97, 0x25, 0x89, 0x17, 0xd1, 0x9a, 0xfa, 0x80, 0x34, 0x03, 0x1e, 0x69, 0xe9, 0xa0, 0xd1, 0x1d, - 0xfe, 0x9e, 0xde, 0xe4, 0xc5, 0x87, 0xdb, 0xeb, 0xf6, 0x78, 0xf6, 0xb1, 0x33, 0xc9, 0xff, 0xba, - 0xcd, 0xdf, 0x8f, 0x8a, 0xd1, 0x65, 0x3e, 0x1d, 0x77, 0xca, 0x8d, 0x74, 0x33, 0xeb, 0xdc, 0x64, - 0xd3, 0x4e, 0xb9, 0x6c, 0x3a, 0xff, 0xb7, 0xa3, 0x7e, 0x5b, 0x41, 0xd7, 0x3b, 0xa5, 0xe2, 0x97, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xc2, 0xb6, 0x75, 0xd8, 0x04, 0x00, 0x00, + // 764 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcb, 0x72, 0xdb, 0x36, + 0x14, 0xad, 0xfc, 0x90, 0x65, 0xf8, 0x75, 0x8d, 0xd8, 0x79, 0xb6, 0x8e, 0xeb, 0xa6, 0x2f, 0xb5, + 0x16, 0x27, 0xd3, 0x99, 0x6e, 0xba, 0x82, 0xc0, 0x2b, 0x09, 0x13, 0x90, 0x60, 0x00, 0xd0, 0x4a, + 0xba, 0xc1, 0xc8, 0x0a, 0xeb, 0xb0, 0xa3, 0x48, 0xaa, 0x44, 0x7b, 0xa6, 0x3f, 0xd1, 0x6f, 0xee, + 0x80, 0x6c, 0x44, 0x5b, 0x9b, 0xee, 0x78, 0xcf, 0x3d, 0xe7, 0x00, 0x38, 0xbc, 0x00, 0xf9, 0xf5, + 0xc3, 0x6c, 0x52, 0x04, 0xcb, 0x6c, 0x71, 0x97, 0x8f, 0xb3, 0x65, 0x90, 0xdd, 0x65, 0xd3, 0x62, + 0x39, 0x9a, 0xe7, 0xc1, 0xdd, 0xeb, 0xd1, 0x64, 0xfe, 0x71, 0xf4, 0xba, 0x82, 0xdc, 0x78, 0x36, + 0x5d, 0x16, 0xa3, 0x69, 0xb1, 0xec, 0xcc, 0x17, 0xb3, 0x62, 0x46, 0xcf, 0xbd, 0xae, 0xf3, 0x59, + 0xd7, 0x59, 0xe9, 0x3a, 0x9f, 0x75, 0xed, 0x01, 0x69, 0x25, 0x93, 0x51, 0xf1, 0xc7, 0x6c, 0xf1, + 0x89, 0x3e, 0x25, 0x27, 0x89, 0x64, 0xb6, 0xa7, 0x74, 0xe4, 0xd2, 0xd8, 0x24, 0xc8, 0x45, 0x4f, + 0x60, 0x08, 0x5f, 0xd0, 0x5d, 0xb2, 0x2d, 0x45, 0x9c, 0xbe, 0x83, 0x06, 0xdd, 0x23, 0x3b, 0x43, + 0x11, 0x87, 0x6a, 0x68, 0x60, 0x83, 0x12, 0xd2, 0x0c, 0x99, 0x1e, 0x8a, 0x18, 0x36, 0xdb, 0xff, + 0x34, 0xc9, 0x11, 0x9f, 0xe4, 0xd9, 0xb4, 0x40, 0xbf, 0x8c, 0xfd, 0x7b, 0x9e, 0xd1, 0x13, 0x02, + 0xf6, 0x7d, 0x82, 0x6b, 0x6e, 0x2d, 0xb2, 0x25, 0x62, 0x61, 0xa1, 0xe1, 0xf5, 0xc6, 0x32, 0x9b, + 0x7a, 0xaf, 0x1d, 0xb2, 0xc9, 0xc2, 0x10, 0x36, 0xfd, 0x62, 0x1a, 0x0d, 0x5a, 0xd8, 0xf2, 0x7d, + 0xae, 0xa2, 0x48, 0x58, 0xd8, 0xf6, 0x7d, 0xf3, 0x56, 0x42, 0x93, 0x1e, 0x12, 0x62, 0xde, 0x4a, + 0x67, 0x50, 0x5f, 0xa1, 0x86, 0x1d, 0xdf, 0x90, 0xaa, 0x0f, 0x2d, 0xef, 0x1b, 0x8a, 0x5e, 0x0f, + 0x76, 0xbd, 0x45, 0x84, 0xba, 0x8f, 0x40, 0xbc, 0x45, 0x57, 0xb3, 0x98, 0x0f, 0x60, 0x8f, 0xee, + 0x93, 0x16, 0x1f, 0x20, 0x7f, 0xa3, 0x52, 0x0b, 0xfb, 0xbe, 0xa3, 0x31, 0x52, 0x16, 0xe1, 0xc0, + 0x4b, 0x93, 0xd4, 0x0c, 0xe0, 0xb0, 0xfa, 0x92, 0x12, 0x8e, 0xbc, 0x49, 0x0f, 0x2d, 0x1f, 0x00, + 0xf8, 0x4f, 0x2e, 0x55, 0x8c, 0x70, 0x5c, 0x46, 0xa1, 0xfa, 0x22, 0x06, 0xea, 0xa3, 0xb8, 0x42, + 0x6d, 0x84, 0x8a, 0xe1, 0x51, 0xb5, 0xd5, 0xb8, 0x27, 0xfa, 0x70, 0x42, 0x9b, 0x64, 0x43, 0x1a, + 0x38, 0x2d, 0x8f, 0xc7, 0x07, 0x18, 0x31, 0x78, 0x4c, 0x81, 0xec, 0x5b, 0xd6, 0x95, 0xe8, 0x44, + 0x94, 0x28, 0x6d, 0xe1, 0x49, 0x8d, 0xe0, 0xbb, 0x12, 0x79, 0x5a, 0x23, 0x5c, 0x23, 0xb3, 0x08, + 0xcf, 0xfc, 0x8e, 0x2b, 0x44, 0x47, 0xf0, 0xbc, 0xae, 0xa2, 0x2b, 0x78, 0x51, 0x57, 0x3c, 0x81, + 0x2f, 0x6b, 0xad, 0x41, 0x89, 0xdc, 0xc2, 0x57, 0xf4, 0x98, 0x1c, 0x54, 0x48, 0x92, 0x5a, 0xa7, + 0xd5, 0x10, 0xce, 0x6a, 0x92, 0x8e, 0x4a, 0xe4, 0x25, 0x3d, 0x20, 0xbb, 0x5c, 0x63, 0x68, 0x5c, + 0x8c, 0x43, 0x38, 0x2f, 0x13, 0x2a, 0x4b, 0x1d, 0xc1, 0xd7, 0x75, 0x25, 0x0d, 0x5c, 0x94, 0x95, + 0x8a, 0x7b, 0x8e, 0x33, 0x0b, 0xdf, 0x78, 0xab, 0xb2, 0xd2, 0x68, 0x94, 0xbc, 0x42, 0x78, 0x45, + 0x5f, 0x92, 0x17, 0x55, 0x9e, 0x2c, 0x11, 0xae, 0x8f, 0xd6, 0x69, 0x4c, 0x94, 0x8b, 0xd0, 0xb2, + 0x90, 0x59, 0x06, 0xdf, 0xfa, 0xf9, 0xaa, 0x09, 0x03, 0x66, 0x1c, 0x1f, 0xa4, 0xf1, 0x1b, 0x03, + 0xdf, 0xd1, 0x57, 0xe4, 0xfc, 0xa1, 0x34, 0x54, 0xc3, 0x58, 0x2a, 0x16, 0x3a, 0xa9, 0x38, 0xb3, + 0x42, 0xc5, 0x06, 0xbe, 0xa7, 0x17, 0xe4, 0xec, 0x21, 0x2b, 0x4d, 0xd6, 0x38, 0x3f, 0xf8, 0x89, + 0xab, 0x39, 0x1a, 0xbb, 0xcc, 0x20, 0xfc, 0x48, 0x29, 0x39, 0xbc, 0x87, 0x2a, 0x65, 0xa1, 0xfd, + 0x90, 0xf9, 0xdf, 0x94, 0xfd, 0x44, 0xcf, 0xc8, 0xf3, 0x1a, 0x95, 0xc2, 0x58, 0x57, 0x05, 0xd6, + 0x13, 0x12, 0x0d, 0xfc, 0xec, 0x7f, 0x7f, 0x57, 0xb2, 0x08, 0xe1, 0x92, 0x1e, 0x91, 0xbd, 0x2a, + 0x9d, 0x72, 0xa6, 0xa0, 0x53, 0x67, 0x99, 0x1a, 0x84, 0xa0, 0xfd, 0x27, 0x69, 0x45, 0x59, 0xb1, + 0xc8, 0xc7, 0x22, 0xa4, 0x8f, 0x09, 0x8d, 0xd0, 0x6a, 0xc1, 0xd7, 0xae, 0xc2, 0x09, 0x81, 0xee, + 0x7b, 0x8b, 0x66, 0x75, 0x60, 0x0c, 0xa1, 0x41, 0x9f, 0x90, 0x47, 0xab, 0x00, 0x22, 0xe3, 0x50, + 0xb2, 0xc4, 0x60, 0x08, 0x1b, 0xbe, 0x71, 0xef, 0x1c, 0x09, 0x77, 0xa8, 0xb5, 0xd2, 0xb0, 0xd9, + 0x46, 0xb2, 0xc7, 0x8a, 0x62, 0x91, 0x5f, 0xdf, 0x16, 0x99, 0x08, 0xe9, 0x33, 0x72, 0xca, 0xac, + 0xd5, 0xa2, 0x9b, 0xda, 0xf5, 0xcb, 0x77, 0x4a, 0x8e, 0x2b, 0x0b, 0x97, 0x6a, 0xe9, 0xca, 0xf1, + 0x44, 0xd8, 0xb8, 0xd8, 0x6a, 0x35, 0xa0, 0xd1, 0xbe, 0x24, 0xdb, 0x6c, 0x3e, 0xaf, 0xf6, 0xcb, + 0x92, 0xc4, 0x89, 0x70, 0x4d, 0xbd, 0x4f, 0x5a, 0x1e, 0x0f, 0x95, 0xb4, 0xd0, 0xe8, 0x0e, 0x7f, + 0x4f, 0x6f, 0xf2, 0xe2, 0xe3, 0xed, 0x75, 0x67, 0x3c, 0xfb, 0x14, 0x4c, 0xf2, 0xbf, 0x6e, 0xf3, + 0x0f, 0xa3, 0x62, 0x74, 0x99, 0x4f, 0xc7, 0x41, 0xf9, 0x62, 0xdd, 0xcc, 0x82, 0x9b, 0x6c, 0x1a, + 0x94, 0x8f, 0x51, 0xf0, 0x7f, 0x6f, 0xd8, 0x6f, 0x2b, 0xe8, 0xba, 0x59, 0x2a, 0x7e, 0xf9, 0x37, + 0x00, 0x00, 0xff, 0xff, 0xbf, 0x8f, 0x66, 0xbe, 0xf8, 0x04, 0x00, 0x00, } diff --git a/go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore.pb.go b/go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore.pb.go index 16a30fb022..128b7524e3 100644 --- a/go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore.pb.go +++ b/go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore.pb.go @@ -642,7 +642,7 @@ func (m *TableFileDetails) GetContentHash() []byte { type GetUploadLocsRequest struct { RepoId *RepoId `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"` - TableFileHashes [][]byte `protobuf:"bytes,2,rep,name=table_file_hashes,json=tableFileHashes,proto3" json:"table_file_hashes,omitempty"` + TableFileHashes [][]byte `protobuf:"bytes,2,rep,name=table_file_hashes,json=tableFileHashes,proto3" json:"table_file_hashes,omitempty"` // Deprecated: Do not use. TableFileDetails []*TableFileDetails `protobuf:"bytes,3,rep,name=table_file_details,json=tableFileDetails,proto3" json:"table_file_details,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -681,6 +681,7 @@ func (m *GetUploadLocsRequest) GetRepoId() *RepoId { return nil } +// Deprecated: Do not use. func (m *GetUploadLocsRequest) GetTableFileHashes() [][]byte { if m != nil { return m.TableFileHashes @@ -1456,83 +1457,83 @@ func init() { } var fileDescriptor_702c187af9ca94ec = []byte{ - // 1210 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdf, 0x6f, 0x1b, 0xc5, - 0x13, 0xef, 0xd9, 0xf9, 0x3a, 0xf1, 0xf8, 0x47, 0x9d, 0x55, 0x93, 0x5a, 0xfe, 0x0a, 0x35, 0x3d, - 0xa9, 0x28, 0xb4, 0xd4, 0x6e, 0xd2, 0x4a, 0x6d, 0xe1, 0x05, 0x92, 0xb6, 0x71, 0xa4, 0x80, 0xca, - 0xa6, 0x50, 0x42, 0x84, 0xac, 0xf3, 0x79, 0x6d, 0x9f, 0x38, 0xdf, 0xba, 0xb7, 0xeb, 0xf0, 0x88, - 0x84, 0x40, 0xf0, 0x82, 0x78, 0xe1, 0x89, 0x7f, 0x06, 0xf8, 0x73, 0xf8, 0x2f, 0xd0, 0xce, 0xee, - 0x39, 0x77, 0x57, 0x57, 0xd9, 0x54, 0x86, 0xb7, 0xec, 0x64, 0x67, 0xe6, 0x33, 0x9f, 0xf9, 0xb1, - 0x73, 0x86, 0xdd, 0x01, 0x0f, 0x65, 0x47, 0xb0, 0xf8, 0x2c, 0xf0, 0x99, 0xe8, 0xc4, 0x6c, 0xc2, - 0x25, 0x13, 0xde, 0x34, 0xe8, 0x9c, 0xed, 0x78, 0xe1, 0x74, 0xec, 0xed, 0x74, 0xfc, 0xf1, 0x2c, - 0xfa, 0x46, 0x48, 0x1e, 0xb3, 0xf6, 0x34, 0xe6, 0x92, 0x93, 0x9b, 0x4a, 0xa7, 0x9d, 0xe8, 0xb4, - 0xcf, 0x75, 0xda, 0x89, 0x8e, 0xfb, 0x10, 0x4a, 0x94, 0x4d, 0xf9, 0xe1, 0x80, 0x34, 0xa0, 0xc8, - 0xe3, 0x51, 0xd3, 0xd9, 0x72, 0xb6, 0xcb, 0x54, 0xfd, 0x49, 0xfe, 0x0f, 0xe5, 0x98, 0x4d, 0x79, - 0x2f, 0xf2, 0x26, 0xac, 0x59, 0x40, 0xf9, 0x9a, 0x12, 0x7c, 0xea, 0x4d, 0x98, 0x1b, 0x41, 0xa3, - 0xeb, 0x89, 0x7d, 0x74, 0x49, 0xd9, 0xab, 0x19, 0x13, 0x92, 0xec, 0xc1, 0x2a, 0x2a, 0x04, 0x03, - 0x34, 0x53, 0xd9, 0x7d, 0xaf, 0x7d, 0x21, 0x82, 0xb6, 0x76, 0x4f, 0x4b, 0xb1, 0x86, 0xb1, 0x09, - 0xa5, 0xb1, 0x27, 0xc6, 0x4c, 0x34, 0x0b, 0x5b, 0xc5, 0xed, 0x2a, 0x35, 0x27, 0xf7, 0x0e, 0xac, - 0xa7, 0xfc, 0x89, 0x29, 0x8f, 0x04, 0x53, 0x97, 0xbd, 0xbe, 0x60, 0x91, 0x6c, 0x3a, 0x5b, 0xc5, - 0xed, 0xff, 0x51, 0x73, 0x72, 0x1f, 0x41, 0xb5, 0x2b, 0xe5, 0xf4, 0x80, 0x49, 0x54, 0x50, 0xb1, - 0xcd, 0xe2, 0x30, 0x89, 0x6d, 0x16, 0x87, 0x6f, 0x74, 0xf3, 0x1c, 0x80, 0x7a, 0xd1, 0x88, 0x69, - 0x3d, 0x02, 0x2b, 0x4a, 0x8e, 0x8a, 0x55, 0x8a, 0x7f, 0x2b, 0x4d, 0x3e, 0x1c, 0x0a, 0x26, 0x91, - 0x92, 0x15, 0x6a, 0x4e, 0x4a, 0x1e, 0xb2, 0x68, 0x24, 0xc7, 0xcd, 0xe2, 0x96, 0xb3, 0x5d, 0xa3, - 0xe6, 0xe4, 0x8e, 0xe6, 0x58, 0xd0, 0xf0, 0x02, 0x2c, 0x4f, 0xa1, 0x14, 0xab, 0x7f, 0x69, 0x2c, - 0x95, 0xdd, 0xbb, 0x36, 0xac, 0xcd, 0x41, 0x52, 0xa3, 0xec, 0xfe, 0xe9, 0x40, 0xe5, 0x09, 0xff, - 0x36, 0x0a, 0xb9, 0x37, 0x38, 0xe2, 0x3e, 0x39, 0x82, 0xb5, 0xb1, 0x94, 0xd3, 0xde, 0x88, 0x49, - 0x93, 0x8e, 0x8e, 0x85, 0xe1, 0x34, 0x6f, 0xdd, 0x2b, 0x74, 0x75, 0xac, 0xcf, 0xe4, 0x25, 0xd4, - 0x13, 0x6b, 0x3d, 0x74, 0x88, 0xe1, 0x5f, 0xca, 0x26, 0x62, 0xee, 0x5e, 0xa1, 0xd5, 0x71, 0xea, - 0xbc, 0x07, 0xb0, 0x16, 0x72, 0xdf, 0x93, 0x01, 0x8f, 0xdc, 0x5b, 0xb0, 0xae, 0xee, 0x3e, 0xe7, - 0x42, 0xbe, 0xf0, 0xfa, 0x21, 0x7b, 0x16, 0x84, 0x0b, 0x08, 0x73, 0x7f, 0x73, 0xa0, 0xfc, 0xf9, - 0x34, 0x89, 0xf3, 0x5d, 0xb8, 0x2a, 0xd5, 0xe5, 0xde, 0x30, 0x08, 0x59, 0x2f, 0x95, 0xaf, 0x9a, - 0x4c, 0x6c, 0x74, 0x55, 0xe2, 0x8e, 0xa1, 0x8c, 0x11, 0x4c, 0xb9, 0x90, 0x06, 0xfc, 0x03, 0x4b, - 0xf0, 0x19, 0x40, 0xdd, 0x2b, 0x14, 0x89, 0x55, 0xc2, 0x0c, 0xfa, 0xef, 0x60, 0xf3, 0x80, 0xc9, - 0x54, 0x0a, 0x96, 0xda, 0x18, 0x37, 0xa1, 0x8a, 0x0d, 0xde, 0xcb, 0xd4, 0x6d, 0x05, 0x65, 0x5d, - 0x5d, 0xbc, 0x5f, 0xc3, 0xf5, 0xd7, 0x00, 0x98, 0x4e, 0xd9, 0x83, 0x95, 0x90, 0xfb, 0x02, 0xfb, - 0xa4, 0xb2, 0xdb, 0xb6, 0x70, 0x9f, 0x32, 0x43, 0x51, 0xd7, 0x0d, 0xa1, 0x31, 0x27, 0xe1, 0x09, - 0x93, 0x5e, 0x10, 0x0a, 0x52, 0x87, 0x82, 0x09, 0xaa, 0x4a, 0x0b, 0xc1, 0x80, 0xdc, 0x82, 0xba, - 0xcf, 0x23, 0xc9, 0x22, 0xd9, 0x33, 0xdd, 0xa0, 0xbb, 0xa4, 0x66, 0xa4, 0x47, 0x28, 0xc4, 0x60, - 0xcc, 0x35, 0x4c, 0x58, 0x11, 0x0d, 0x54, 0x8c, 0x4c, 0x85, 0xe3, 0xfe, 0xed, 0xc0, 0xb5, 0x03, - 0x26, 0xe7, 0x79, 0x5e, 0x2a, 0x99, 0xb7, 0x61, 0x3d, 0x57, 0x33, 0x73, 0x46, 0xaf, 0x66, 0xaa, - 0x86, 0x09, 0xe2, 0x01, 0x49, 0xdd, 0x1d, 0xe8, 0xc0, 0x9b, 0x45, 0x24, 0xf2, 0xbe, 0x85, 0xeb, - 0x3c, 0x67, 0xb4, 0x21, 0x73, 0x12, 0xf7, 0x04, 0x36, 0x72, 0xa1, 0x9a, 0xb4, 0x7d, 0x94, 0x49, - 0xdb, 0xfb, 0x16, 0xde, 0xe6, 0x46, 0x4c, 0xd2, 0x8e, 0xa1, 0x46, 0x59, 0xdf, 0x13, 0x6c, 0x89, - 0xf4, 0xb9, 0x0d, 0xa8, 0x27, 0x46, 0x35, 0x50, 0xf7, 0x33, 0xa8, 0x50, 0xce, 0xe5, 0x32, 0x9d, - 0xdc, 0x81, 0xaa, 0x36, 0x69, 0xb8, 0x50, 0xcf, 0x11, 0xe7, 0x32, 0xdd, 0xe1, 0x6b, 0x4a, 0x80, - 0xd5, 0xf2, 0x14, 0xea, 0x38, 0xb2, 0x90, 0xec, 0xc3, 0x68, 0xc8, 0x17, 0xce, 0xee, 0x1b, 0xa0, - 0xfb, 0xa5, 0xe7, 0xf3, 0x59, 0xa4, 0x87, 0x40, 0x8d, 0x02, 0x8a, 0xf6, 0x95, 0xc4, 0xfd, 0xab, - 0x00, 0xb5, 0x7d, 0x3e, 0x99, 0x04, 0xcb, 0x8c, 0x84, 0x34, 0x61, 0xd5, 0x9f, 0xc5, 0x31, 0x33, - 0x2e, 0xab, 0x34, 0x39, 0x2a, 0x90, 0xa1, 0x27, 0xa4, 0xa9, 0x7f, 0xfc, 0x9b, 0x9c, 0x42, 0x43, - 0x83, 0xd4, 0x55, 0x17, 0x44, 0x43, 0xde, 0x5c, 0xc1, 0xfc, 0xef, 0x58, 0xb8, 0xce, 0xb2, 0x40, - 0xeb, 0x7e, 0x96, 0x15, 0x0f, 0x88, 0x1f, 0x06, 0xaa, 0xef, 0x30, 0xaa, 0x21, 0x8f, 0x27, 0x9e, - 0x6c, 0xd6, 0x31, 0x32, 0x9b, 0x62, 0xde, 0x47, 0x65, 0x15, 0xdf, 0x33, 0x54, 0xa5, 0x0d, 0x3f, - 0x27, 0x71, 0x6f, 0x43, 0x3d, 0xa1, 0xd0, 0x64, 0xae, 0x09, 0xab, 0x62, 0xe6, 0xfb, 0x4c, 0x08, - 0xe4, 0x70, 0x8d, 0x26, 0x47, 0xf7, 0x0f, 0x07, 0x67, 0xa6, 0xd2, 0xfe, 0x84, 0x49, 0x6f, 0xe0, - 0x49, 0x6f, 0x99, 0xc4, 0xff, 0x07, 0xd1, 0x9e, 0xe2, 0xcc, 0xcd, 0x06, 0x60, 0xc2, 0xbe, 0x01, - 0x95, 0xa8, 0x3f, 0xec, 0x9d, 0xb1, 0x58, 0x04, 0x3c, 0x32, 0x0f, 0x18, 0x44, 0xfd, 0xe1, 0x17, - 0x5a, 0xa2, 0x2f, 0x88, 0xf9, 0x85, 0x42, 0x72, 0x41, 0x98, 0x0b, 0xee, 0x0b, 0x68, 0xe4, 0x21, - 0x2c, 0xc1, 0xea, 0x29, 0x6c, 0x1c, 0x05, 0xa9, 0x07, 0x6d, 0x99, 0x93, 0xd5, 0x3d, 0x81, 0xda, - 0xdc, 0x30, 0x56, 0xdc, 0x75, 0x58, 0xc5, 0xc1, 0x69, 0x8c, 0x96, 0x69, 0x49, 0x1d, 0x0f, 0x07, - 0xe4, 0x1d, 0x80, 0x68, 0x36, 0xe9, 0xe9, 0xad, 0xd5, 0xf4, 0x62, 0x39, 0x9a, 0x4d, 0xf4, 0x8e, - 0x97, 0x3c, 0xfb, 0xc5, 0xf3, 0x67, 0xff, 0x57, 0x07, 0x36, 0xf3, 0xc0, 0x2d, 0x66, 0x03, 0xf9, - 0x32, 0xb3, 0x20, 0x60, 0x3f, 0xe9, 0x45, 0xeb, 0xde, 0x65, 0xa6, 0x37, 0xb6, 0xd3, 0xf9, 0x4a, - 0xa1, 0x8e, 0xee, 0xef, 0x05, 0xb8, 0xf6, 0xf1, 0x60, 0xf0, 0xaf, 0x30, 0xf9, 0x86, 0xe2, 0x2d, - 0x2c, 0xb1, 0x78, 0x17, 0x8e, 0x9a, 0xe2, 0x92, 0x46, 0x8d, 0xbb, 0x03, 0x1b, 0x39, 0x6e, 0x2e, - 0x1a, 0x07, 0xbb, 0x3f, 0x94, 0x61, 0x1d, 0xad, 0x1e, 0xab, 0xaf, 0x98, 0x63, 0xed, 0x9c, 0xfc, - 0xec, 0xc0, 0xd5, 0x5c, 0x8f, 0x91, 0xc7, 0x16, 0xf8, 0x16, 0x0f, 0x96, 0xd6, 0x07, 0x6f, 0xa3, - 0x6a, 0xa0, 0x9f, 0x41, 0x79, 0xfe, 0x15, 0x42, 0x6c, 0x92, 0x90, 0xff, 0x46, 0x6a, 0x3d, 0xb8, - 0x9c, 0x92, 0xf1, 0xfb, 0x8b, 0x5e, 0x86, 0x52, 0x3b, 0x19, 0xae, 0x9c, 0xc2, 0x96, 0x87, 0x05, - 0x4b, 0xa9, 0x2d, 0x0f, 0x0b, 0xd7, 0xc9, 0x9f, 0x1c, 0x20, 0xe9, 0x8d, 0xc5, 0xa0, 0x79, 0x68, - 0x67, 0xf2, 0xb5, 0x9d, 0xae, 0xf5, 0xe8, 0xf2, 0x8a, 0x06, 0xc9, 0x44, 0x7d, 0xc0, 0xaa, 0x55, - 0x84, 0xdc, 0xb3, 0x6a, 0xb1, 0xd4, 0x2a, 0xd4, 0xda, 0xb9, 0x84, 0x86, 0x71, 0x37, 0x82, 0x15, - 0xb5, 0x94, 0x10, 0x9b, 0x0d, 0x3a, 0xb5, 0x10, 0xb5, 0x3a, 0xd6, 0xf7, 0xcf, 0xe3, 0xd2, 0xaf, - 0xa8, 0x55, 0x5c, 0x99, 0x9d, 0xc5, 0x2a, 0xae, 0xdc, 0x13, 0xfd, 0xa3, 0x03, 0xf5, 0xec, 0x6c, - 0x25, 0x36, 0x39, 0x59, 0xf8, 0x8e, 0xb4, 0x1e, 0xbf, 0x85, 0xa6, 0xc1, 0xf1, 0xbd, 0x03, 0xb5, - 0xcc, 0xd4, 0xb0, 0xaa, 0xa9, 0x45, 0x33, 0xd8, 0xaa, 0xa6, 0x16, 0x0e, 0xa8, 0xbd, 0x93, 0xaf, - 0x5e, 0x8e, 0x02, 0x39, 0x9e, 0xf5, 0xdb, 0x3e, 0x9f, 0x74, 0xc2, 0xe0, 0xd5, 0x2c, 0x50, 0x53, - 0xe0, 0x6e, 0x10, 0xf9, 0x1d, 0xfc, 0x19, 0x66, 0xc4, 0x3b, 0x23, 0x16, 0x75, 0xf0, 0x57, 0x96, - 0xce, 0x85, 0x3f, 0xcc, 0x7c, 0x78, 0x2e, 0xeb, 0x97, 0x50, 0xe7, 0xfe, 0x3f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x9b, 0x26, 0xa3, 0x10, 0xcf, 0x11, 0x00, 0x00, + // 1212 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x6f, 0x1b, 0x45, + 0x10, 0xef, 0xd9, 0xc1, 0x89, 0xc7, 0x7f, 0xea, 0xac, 0x9a, 0xd4, 0x32, 0x42, 0x4d, 0x4f, 0x2a, + 0x0a, 0x94, 0xda, 0x4d, 0x5a, 0xa9, 0x2d, 0xbc, 0x40, 0xd2, 0x36, 0x8e, 0x14, 0x50, 0xd9, 0x14, + 0x4a, 0x88, 0x90, 0x75, 0x3e, 0xaf, 0xed, 0x13, 0xe7, 0x5b, 0xf7, 0x76, 0x1d, 0x1e, 0x91, 0x10, + 0x08, 0x5e, 0x10, 0x2f, 0x3c, 0xf1, 0x65, 0x80, 0x0f, 0xc4, 0x77, 0x40, 0x3b, 0xbb, 0xe7, 0xdc, + 0x5d, 0x5d, 0x65, 0x53, 0x19, 0xde, 0xb2, 0x93, 0x9d, 0x99, 0xdf, 0xfc, 0xe6, 0xcf, 0xce, 0x19, + 0x76, 0x07, 0x3c, 0x94, 0x1d, 0xc1, 0xe2, 0xb3, 0xc0, 0x67, 0xa2, 0x13, 0xb3, 0x09, 0x97, 0x4c, + 0x78, 0xd3, 0xa0, 0x73, 0xb6, 0xe3, 0x85, 0xd3, 0xb1, 0xb7, 0xd3, 0xf1, 0xc7, 0xb3, 0xe8, 0x5b, + 0x21, 0x79, 0xcc, 0xda, 0xd3, 0x98, 0x4b, 0x4e, 0x6e, 0x2a, 0x9d, 0x76, 0xa2, 0xd3, 0x3e, 0xd7, + 0x69, 0x27, 0x3a, 0xee, 0x03, 0x28, 0x51, 0x36, 0xe5, 0x87, 0x03, 0xd2, 0x80, 0x22, 0x8f, 0x47, + 0x4d, 0x67, 0xcb, 0xd9, 0x2e, 0x53, 0xf5, 0x27, 0x79, 0x1b, 0xca, 0x31, 0x9b, 0xf2, 0x5e, 0xe4, + 0x4d, 0x58, 0xb3, 0x80, 0xf2, 0x35, 0x25, 0xf8, 0xcc, 0x9b, 0x30, 0x37, 0x82, 0x46, 0xd7, 0x13, + 0xfb, 0xe8, 0x92, 0xb2, 0x97, 0x33, 0x26, 0x24, 0xd9, 0x83, 0x55, 0x54, 0x08, 0x06, 0x68, 0xa6, + 0xb2, 0xfb, 0x5e, 0xfb, 0x42, 0x04, 0x6d, 0xed, 0x9e, 0x96, 0x62, 0x0d, 0x63, 0x13, 0x4a, 0x63, + 0x4f, 0x8c, 0x99, 0x68, 0x16, 0xb6, 0x8a, 0xdb, 0x55, 0x6a, 0x4e, 0xee, 0x6d, 0x58, 0x4f, 0xf9, + 0x13, 0x53, 0x1e, 0x09, 0xa6, 0x2e, 0x7b, 0x7d, 0xc1, 0x22, 0xd9, 0x74, 0xb6, 0x8a, 0xdb, 0x6f, + 0x51, 0x73, 0x72, 0x1f, 0x42, 0xb5, 0x2b, 0xe5, 0xf4, 0x80, 0x49, 0x54, 0x50, 0xb1, 0xcd, 0xe2, + 0x30, 0x89, 0x6d, 0x16, 0x87, 0xaf, 0x75, 0xf3, 0x0c, 0x80, 0x7a, 0xd1, 0x88, 0x69, 0x3d, 0x02, + 0x2b, 0x4a, 0x8e, 0x8a, 0x55, 0x8a, 0x7f, 0x2b, 0x4d, 0x3e, 0x1c, 0x0a, 0x26, 0x91, 0x92, 0x15, + 0x6a, 0x4e, 0x4a, 0x1e, 0xb2, 0x68, 0x24, 0xc7, 0xcd, 0xe2, 0x96, 0xb3, 0x5d, 0xa3, 0xe6, 0xe4, + 0x8e, 0xe6, 0x58, 0xd0, 0xf0, 0x02, 0x2c, 0x4f, 0xa0, 0x14, 0xab, 0x7f, 0x69, 0x2c, 0x95, 0xdd, + 0x3b, 0x36, 0xac, 0xcd, 0x41, 0x52, 0xa3, 0xec, 0xfe, 0xe5, 0x40, 0xe5, 0x31, 0xff, 0x2e, 0x0a, + 0xb9, 0x37, 0x38, 0xe2, 0x3e, 0x39, 0x82, 0xb5, 0xb1, 0x94, 0xd3, 0xde, 0x88, 0x49, 0x93, 0x8e, + 0x8e, 0x85, 0xe1, 0x34, 0x6f, 0xdd, 0x2b, 0x74, 0x75, 0xac, 0xcf, 0xe4, 0x05, 0xd4, 0x13, 0x6b, + 0x3d, 0x74, 0x88, 0xe1, 0x5f, 0xca, 0x26, 0x62, 0xee, 0x5e, 0xa1, 0xd5, 0x71, 0xea, 0xbc, 0x07, + 0xb0, 0x16, 0x72, 0xdf, 0x93, 0x01, 0x8f, 0xdc, 0x5b, 0xb0, 0xae, 0xee, 0x3e, 0xe3, 0x42, 0x3e, + 0xf7, 0xfa, 0x21, 0x7b, 0x1a, 0x84, 0x0b, 0x08, 0x73, 0x7f, 0x77, 0xa0, 0xfc, 0xc5, 0x34, 0x89, + 0xf3, 0x5d, 0xb8, 0x2a, 0xd5, 0xe5, 0xde, 0x30, 0x08, 0x59, 0x2f, 0x95, 0xaf, 0x9a, 0x4c, 0x6c, + 0x74, 0x55, 0xe2, 0x8e, 0xa1, 0x8c, 0x11, 0x4c, 0xb9, 0x90, 0x06, 0xfc, 0x7d, 0x4b, 0xf0, 0x19, + 0x40, 0xdd, 0x2b, 0x14, 0x89, 0x55, 0xc2, 0x0c, 0xfa, 0xef, 0x61, 0xf3, 0x80, 0xc9, 0x54, 0x0a, + 0x96, 0xda, 0x18, 0x37, 0xa1, 0x8a, 0x0d, 0xde, 0xcb, 0xd4, 0x6d, 0x05, 0x65, 0x5d, 0x5d, 0xbc, + 0xdf, 0xc0, 0xf5, 0x57, 0x00, 0x98, 0x4e, 0xd9, 0x83, 0x95, 0x90, 0xfb, 0x02, 0xfb, 0xa4, 0xb2, + 0xdb, 0xb6, 0x70, 0x9f, 0x32, 0x43, 0x51, 0xd7, 0x0d, 0xa1, 0x31, 0x27, 0xe1, 0x31, 0x93, 0x5e, + 0x10, 0x0a, 0x52, 0x87, 0x82, 0x09, 0xaa, 0x4a, 0x0b, 0xc1, 0x80, 0xdc, 0x82, 0xba, 0xcf, 0x23, + 0xc9, 0x22, 0xd9, 0x33, 0xdd, 0xa0, 0xbb, 0xa4, 0x66, 0xa4, 0x47, 0x28, 0xc4, 0x60, 0xcc, 0x35, + 0x4c, 0x58, 0x11, 0x0d, 0x54, 0x8c, 0x4c, 0x85, 0xe3, 0xfe, 0xe3, 0xc0, 0xb5, 0x03, 0x26, 0xe7, + 0x79, 0x5e, 0x2a, 0x99, 0x6d, 0x58, 0xcf, 0xd5, 0x4c, 0xc2, 0xe8, 0x5e, 0xa1, 0xe9, 0xd0, 0xab, + 0x99, 0xca, 0x61, 0x82, 0x78, 0x40, 0x52, 0xf7, 0x07, 0x3a, 0xf8, 0x66, 0x11, 0xc9, 0xbc, 0x67, + 0xe1, 0x3e, 0xcf, 0x1b, 0x6d, 0xc8, 0x9c, 0xc4, 0x3d, 0x81, 0x8d, 0x5c, 0xb8, 0x26, 0x75, 0x1f, + 0x67, 0x52, 0xf7, 0x81, 0x85, 0xb7, 0xb9, 0x11, 0x93, 0xb8, 0x63, 0xa8, 0x51, 0xd6, 0xf7, 0x04, + 0x5b, 0x22, 0x85, 0x6e, 0x03, 0xea, 0x89, 0x51, 0x0d, 0xd4, 0xfd, 0x1c, 0x2a, 0x94, 0x73, 0xb9, + 0x4c, 0x27, 0xb7, 0xa1, 0xaa, 0x4d, 0x1a, 0x2e, 0xd4, 0x93, 0xc4, 0xb9, 0x4c, 0x77, 0xf9, 0x9a, + 0x12, 0x60, 0xc5, 0x3c, 0x81, 0x3a, 0x8e, 0x2d, 0x24, 0xfb, 0x30, 0x1a, 0xf2, 0x85, 0xf3, 0xfb, + 0x06, 0xe8, 0x9e, 0xe9, 0xf9, 0x7c, 0x16, 0xe9, 0x41, 0x50, 0xa3, 0x80, 0xa2, 0x7d, 0x25, 0x71, + 0xff, 0x2e, 0x40, 0x6d, 0x9f, 0x4f, 0x26, 0xc1, 0x32, 0x23, 0x21, 0x4d, 0x58, 0xf5, 0x67, 0x71, + 0xcc, 0x8c, 0xcb, 0x2a, 0x4d, 0x8e, 0x0a, 0x64, 0xe8, 0x09, 0x69, 0x7a, 0x00, 0xff, 0x26, 0xa7, + 0xd0, 0xd0, 0x20, 0x75, 0xd5, 0x05, 0xd1, 0x90, 0x37, 0x57, 0x30, 0xff, 0x3b, 0x16, 0xae, 0xb3, + 0x2c, 0xd0, 0xba, 0x9f, 0x65, 0xc5, 0x03, 0xe2, 0x87, 0x81, 0xea, 0x3d, 0x8c, 0x6a, 0xc8, 0xe3, + 0x89, 0x27, 0x9b, 0x75, 0x8c, 0xcc, 0xa6, 0x98, 0xf7, 0x51, 0x59, 0xc5, 0xf7, 0x14, 0x55, 0x69, + 0xc3, 0xcf, 0x49, 0xdc, 0xf7, 0xa1, 0x9e, 0x50, 0x68, 0x32, 0xd7, 0x84, 0x55, 0x31, 0xf3, 0x7d, + 0x26, 0x04, 0x72, 0xb8, 0x46, 0x93, 0xa3, 0xfb, 0xa7, 0x83, 0x73, 0x53, 0x69, 0x7f, 0xca, 0xa4, + 0x37, 0xf0, 0xa4, 0xb7, 0x4c, 0xe2, 0xff, 0x87, 0x68, 0x4f, 0x71, 0xee, 0x66, 0x03, 0x30, 0x61, + 0xdf, 0x80, 0x4a, 0xd4, 0x1f, 0xf6, 0xce, 0x58, 0x2c, 0x02, 0x1e, 0x99, 0x47, 0x0c, 0xa2, 0xfe, + 0xf0, 0x4b, 0x2d, 0xd1, 0x17, 0xc4, 0xfc, 0x42, 0x21, 0xb9, 0x20, 0xcc, 0x05, 0xf7, 0x39, 0x34, + 0xf2, 0x10, 0x96, 0x60, 0xf5, 0x14, 0x36, 0x8e, 0x82, 0xd4, 0xa3, 0xb6, 0xcc, 0xe9, 0xea, 0x9e, + 0x40, 0x6d, 0x6e, 0x18, 0x2b, 0xee, 0x3a, 0xac, 0xe2, 0xe0, 0x34, 0x46, 0xcb, 0xb4, 0xa4, 0x8e, + 0x87, 0x03, 0xf2, 0x0e, 0x40, 0x34, 0x9b, 0xf4, 0xf4, 0xe6, 0x6a, 0x7a, 0xb1, 0x1c, 0xcd, 0x26, + 0x7a, 0xcf, 0x4b, 0x9e, 0xfe, 0xe2, 0xf9, 0xd3, 0xff, 0x9b, 0x03, 0x9b, 0x79, 0xe0, 0x16, 0xb3, + 0x81, 0x7c, 0x95, 0x59, 0x12, 0xb0, 0x9f, 0xf4, 0xb2, 0x75, 0xf7, 0x32, 0xd3, 0x1b, 0xdb, 0xe9, + 0x7c, 0xad, 0x50, 0x47, 0xf7, 0x8f, 0x02, 0x5c, 0xfb, 0x64, 0x30, 0xf8, 0x4f, 0x98, 0x7c, 0x4d, + 0xf1, 0x16, 0x96, 0x58, 0xbc, 0x0b, 0x47, 0x4d, 0x71, 0x49, 0xa3, 0xc6, 0xdd, 0x81, 0x8d, 0x1c, + 0x37, 0x17, 0x8d, 0x83, 0xdd, 0x1f, 0xcb, 0xb0, 0x8e, 0x56, 0x8f, 0xd5, 0x97, 0xcc, 0xb1, 0x76, + 0x4e, 0x7e, 0x71, 0xe0, 0x6a, 0xae, 0xc7, 0xc8, 0x23, 0x0b, 0x7c, 0x8b, 0x07, 0x4b, 0xeb, 0xc3, + 0x37, 0x51, 0x35, 0xd0, 0xcf, 0xa0, 0x3c, 0xff, 0x12, 0x21, 0x36, 0x49, 0xc8, 0x7f, 0x27, 0xb5, + 0xee, 0x5f, 0x4e, 0xc9, 0xf8, 0xfd, 0x55, 0x2f, 0x44, 0xa9, 0xbd, 0x0c, 0xd7, 0x4e, 0x61, 0xcb, + 0xc3, 0x82, 0xc5, 0xd4, 0x96, 0x87, 0x85, 0x2b, 0xe5, 0xcf, 0x0e, 0x90, 0xf4, 0xc6, 0x62, 0xd0, + 0x3c, 0xb0, 0x33, 0xf9, 0xca, 0x5e, 0xd7, 0x7a, 0x78, 0x79, 0x45, 0x83, 0x64, 0xa2, 0x3e, 0x62, + 0xd5, 0x2a, 0x42, 0xee, 0x5a, 0xb5, 0x58, 0x6a, 0x15, 0x6a, 0xed, 0x5c, 0x42, 0xc3, 0xb8, 0x1b, + 0xc1, 0x8a, 0x5a, 0x4a, 0x88, 0xcd, 0x16, 0x9d, 0x5a, 0x88, 0x5a, 0x1d, 0xeb, 0xfb, 0xe7, 0x71, + 0xe9, 0x57, 0xd4, 0x2a, 0xae, 0xcc, 0xce, 0x62, 0x15, 0x57, 0xee, 0x89, 0xfe, 0xc9, 0x81, 0x7a, + 0x76, 0xb6, 0x12, 0x9b, 0x9c, 0x2c, 0x7c, 0x47, 0x5a, 0x8f, 0xde, 0x40, 0xd3, 0xe0, 0xf8, 0xc1, + 0x81, 0x5a, 0x66, 0x6a, 0x58, 0xd5, 0xd4, 0xa2, 0x19, 0x6c, 0x55, 0x53, 0x0b, 0x07, 0xd4, 0xde, + 0xc9, 0xd7, 0x2f, 0x46, 0x81, 0x1c, 0xcf, 0xfa, 0x6d, 0x9f, 0x4f, 0x3a, 0x61, 0xf0, 0x72, 0x16, + 0xa8, 0x29, 0x70, 0x27, 0x88, 0xfc, 0x0e, 0xfe, 0x14, 0x33, 0xe2, 0x9d, 0x11, 0x8b, 0x3a, 0xf8, + 0x4b, 0x4b, 0xe7, 0xc2, 0x1f, 0x67, 0x3e, 0x3a, 0x97, 0xf5, 0x4b, 0xa8, 0x73, 0xef, 0xdf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x84, 0xd0, 0x8e, 0x47, 0xd3, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/utils/copyrightshdrs/main.go b/go/utils/copyrightshdrs/main.go index 616311b7ad..d645f0c081 100644 --- a/go/utils/copyrightshdrs/main.go +++ b/go/utils/copyrightshdrs/main.go @@ -20,12 +20,13 @@ import ( "io/ioutil" "os" "path/filepath" + "regexp" "strings" ) -var ExpectedHeader = []byte(`// Copyright 2019 Liquidata, Inc. +var ExpectedHeader = regexp.MustCompile(`// Copyright (2019|2020|2019-2020) Liquidata, Inc. // -// Licensed under the Apache License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 \(the "License"\); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // @@ -396,7 +397,7 @@ func CheckGo() bool { if hasNomsHeader { passes = bytes.HasPrefix(bs, ExpectedHeaderForFileFromNoms) } else { - passes = bytes.HasPrefix(bs, ExpectedHeader) + passes = ExpectedHeader.Match(bs) } if !passes { fmt.Printf("ERROR: Wrong copyright header: %v\n", path) @@ -426,7 +427,7 @@ func CheckProto() bool { if err != nil { panic(err) } - passes := bytes.HasPrefix(bs, ExpectedHeader) + passes := ExpectedHeader.Match(bs) if !passes { fmt.Printf("ERROR: Wrong copyright header: %v\n", path) failed = true diff --git a/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto b/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto index 0dfab7e5b0..ce0c9d979d 100644 --- a/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto +++ b/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto @@ -74,6 +74,8 @@ enum ClientEventType { REMOTEAPI_COMMIT = 43; REMOTEAPI_LIST_TABLE_FILES = 44; BLAME = 45; + CREDS_CHECK = 46; + CREDS_USE = 47; } enum MetricID {