Remove duplicate imports (#27886)

gravitational · Jun 29, 2023 · 587046c · 587046c
1 parent a622f83
commit 587046c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/integrations/operator/controllers/resources/testlib/env.go b/integrations/operator/controllers/resources/testlib/env.go
@@ -28,7 +28,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	core "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apiruntime "k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -55,7 +54,7 @@ import (
 var scheme = apiruntime.NewScheme()
 
 func init() {
-	utilruntime.Must(v1.AddToScheme(scheme))
+	utilruntime.Must(core.AddToScheme(scheme))
 	utilruntime.Must(resourcesv1.AddToScheme(scheme))
 	utilruntime.Must(resourcesv2.AddToScheme(scheme))
 	utilruntime.Must(resourcesv3.AddToScheme(scheme))

diff --git a/lib/assist/assist.go b/lib/assist/assist.go
@@ -31,7 +31,6 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/gravitational/teleport/api/gen/proto/go/assist/v1"
-	assistpb "github.com/gravitational/teleport/api/gen/proto/go/assist/v1"
 	pluginsv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/plugins/v1"
 	"github.com/gravitational/teleport/lib/ai"
 	"github.com/gravitational/teleport/lib/ai/model"
@@ -123,7 +122,7 @@ func (a *Assist) GenerateSummary(ctx context.Context, message string) (string, e
 // loadMessages loads the messages from the database.
 func (c *Chat) loadMessages(ctx context.Context) error {
 	// existing conversation, retrieve old messages
-	messages, err := c.authClient.GetAssistantMessages(ctx, &assistpb.GetAssistantMessagesRequest{
+	messages, err := c.authClient.GetAssistantMessages(ctx, &assist.GetAssistantMessagesRequest{
 		ConversationId: c.ConversationID,
 		Username:       c.Username,
 	})
@@ -196,8 +195,8 @@ func (c *Chat) ProcessComplete(ctx context.Context,
 
 	// write the user message to persistent storage and the chat structure
 	c.chat.Insert(openai.ChatMessageRoleUser, userInput)
-	if err := c.authClient.CreateAssistantMessage(ctx, &assistpb.CreateAssistantMessageRequest{
-		Message: &assistpb.AssistantMessage{
+	if err := c.authClient.CreateAssistantMessage(ctx, &assist.CreateAssistantMessageRequest{
+		Message: &assist.AssistantMessage{
 			Type:        string(MessageKindUserMessage),
 			Payload:     userInput, // TODO(jakule): Sanitize the payload
 			CreatedTime: timestamppb.New(c.assist.clock.Now().UTC()),