Merge pull request #59 from keybase/david/update-go-bot-types

Update go-keybase-chat-bot dependency to include generated types

Author: ddworken

.pre-commit-config.yaml

@@ -14,7 +14,3 @@ repos:
     rev: f16f18866390cba642e8af6073ed59504aeada5c
     hooks:
     -   id: go-mod-tidy
--   repo: https://github.com/golangci/golangci-lint
-    rev: v1.17.1
-    hooks:
-    -   id: golangci-lint

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/google/uuid v1.1.1
-	github.com/keybase/go-keybase-chat-bot v0.0.0-20190812134859-bc54fd9cf83b
+	github.com/keybase/go-keybase-chat-bot v0.0.0-20190903135515-79c56220e558
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.3.0
 	github.com/urfave/cli v1.21.0

go.sum

@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/keybase/go-keybase-chat-bot v0.0.0-20190812134859-bc54fd9cf83b h1:7Te2f9LQ/rd6XSzpntz6BaCBgglZ0uiCdv3/GdhX9VA=
-github.com/keybase/go-keybase-chat-bot v0.0.0-20190812134859-bc54fd9cf83b/go.mod h1:vNc28YFzigVJod0j5EbuTtRIe7swx8vodh2yA4jZ2s8=
+github.com/keybase/go-keybase-chat-bot v0.0.0-20190903135515-79c56220e558 h1:iZ1RdFAAftDrkcuYWWNOJt+LBUo8tefd0GywewLuTqE=
+github.com/keybase/go-keybase-chat-bot v0.0.0-20190903135515-79c56220e558/go.mod h1:vNc28YFzigVJod0j5EbuTtRIe7swx8vodh2yA4jZ2s8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

src/keybaseca/bot/bot.go

@@ -55,7 +55,7 @@ func StartBot(conf config.Config) error {
 			return fmt.Errorf("failed to read message: %v", err)
 		}
 
-		if msg.Message.Content.Type != "text" {
+		if msg.Message.Content.TypeName != "text" {
 			continue
 		}
 
@@ -83,7 +83,7 @@ func StartBot(conf config.Config) error {
 		if shared.IsAckRequest(messageBody) {
 			log.Debug("Responding to AckMessage")
 			// Ack any AckRequests so that kssh can determine whether it has fully connected
-			_, err = kbc.SendMessageByConvID(msg.Message.ConversationID, shared.GenerateAckResponse(messageBody))
+			_, err = kbc.SendMessageByConvID(msg.Message.ConvID, shared.GenerateAckResponse(messageBody))
 			if err != nil {
 				LogError(conf, kbc, msg, err)
 				continue
@@ -108,7 +108,7 @@ func StartBot(conf config.Config) error {
 				LogError(conf, kbc, msg, err)
 				continue
 			}
-			_, err = kbc.SendMessageByConvID(msg.Message.ConversationID, shared.SignatureResponsePreamble+string(response))
+			_, err = kbc.SendMessageByConvID(msg.Message.ConvID, shared.SignatureResponsePreamble+string(response))
 			if err != nil {
 				LogError(conf, kbc, msg, err)
 				continue
@@ -122,9 +122,9 @@ func StartBot(conf config.Config) error {
 // Log the given error to Keybase chat and to the configured log file. Used so that the chatbot does not crash
 // due to an error caused by a malformed message.
 func LogError(conf config.Config, kbc *kbchat.API, msg kbchat.SubscriptionMessage, err error) {
-	message := fmt.Sprintf("Encountered error while processing message from %s (messageID:%d): %v", msg.Message.Sender.Username, msg.Message.MsgID, err)
+	message := fmt.Sprintf("Encountered error while processing message from %s (messageID:%d): %v", msg.Message.Sender.Username, msg.Message.Id, err)
 	auditlog.Log(conf, message)
-	_, e := kbc.SendMessageByConvID(msg.Message.ConversationID, message)
+	_, e := kbc.SendMessageByConvID(msg.Message.ConvID, message)
 	if e != nil {
 		auditlog.Log(conf, fmt.Sprintf("failed to log an error to chat (something is probably very wrong): %v", err))
 	}

src/keybaseca/config/config.go

@@ -75,7 +75,7 @@ func ValidateConfig(conf EnvConfig, offline bool) error {
 			}
 		}
 	}
-  log.Debugf("Validated config: %s", conf.DebugString())
+	log.Debugf("Validated config: %s", conf.DebugString())
 	return nil
 }
 

src/keybaseca/sshutils/sshutils.go

@@ -170,7 +170,7 @@ func getPrincipals(conf config.Config, sr shared.SignatureRequest) (string, erro
 	for _, result := range results {
 		if result.Role != 0 {
 			// result.Role == 0 means they are an impicit admin in the team and are not actually a member
-			teamToMembership[result.TeamName] = true
+			teamToMembership[result.FqName] = true
 		}
 	}
 

src/kssh/bot.go

@@ -62,7 +62,7 @@ func GetSignedKey(config ConfigFile, request shared.SignatureRequest) (shared.Si
 			return empty, fmt.Errorf("failed to read message: %v", err)
 		}
 
-		if msg.Message.Content.Type != "text" {
+		if msg.Message.Content.TypeName != "text" {
 			continue
 		}