mirror of
https://github.com/gravitational/teleport.git
synced 2026-10-28 03:19:47 +08:00
Enforce using github.com/google/uuid (#20633)
This commit is contained in:
@@ -44,6 +44,8 @@ linters-settings:
|
||||
packages-with-error-message:
|
||||
- io/ioutil: 'use "io" or "os" packages instead'
|
||||
- github.com/golang/protobuf: 'use "google.golang.org/protobuf"'
|
||||
- github.com/hashicorp/go-uuid: 'use "github.com/google/uuid" instead'
|
||||
- github.com/pborman/uuid: 'use "github.com/google/uuid" instead'
|
||||
- github.com/siddontang/go-log/log: 'use "github.com/sirupsen/logrus" instead'
|
||||
- github.com/siddontang/go/log: 'use "github.com/sirupsen/logrus" instead'
|
||||
- go.uber.org/atomic: 'use "sync/atomic" instead'
|
||||
|
||||
@@ -30,9 +30,9 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/gravitational/kingpin"
|
||||
"github.com/gravitational/trace"
|
||||
"github.com/hashicorp/go-uuid"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.org/x/crypto/ssh"
|
||||
|
||||
@@ -641,8 +641,7 @@ func onJoinOpenSSH(clf config.CommandLineFlags) error {
|
||||
}
|
||||
|
||||
// TODO(amk) get uuid from a cli argument once agentless inventory management is implemented to allow tsh ssh access via uuid
|
||||
uuid, err := uuid.GenerateUUID()
|
||||
_ = err
|
||||
uuid := uuid.NewString()
|
||||
|
||||
principals := []string{uuid}
|
||||
for _, principal := range strings.Split(clf.AdditionalPrincipals, ",") {
|
||||
|
||||
Reference in New Issue
Block a user