Merge branch 'main' into plugin-hostcatalogs
This commit is contained in:
commit
0fd906d964
146 files changed
+5532
-3412
No files matched your search
@@ -13,6 +13,7 @@ import (
|
||||
hostplugin "github.com/hashicorp/boundary/internal/plugin/host"
|
||||
"github.com/hashicorp/boundary/internal/servers/controller/auth"
|
||||
"github.com/hashicorp/boundary/internal/target"
|
||||
"github.com/hashicorp/boundary/internal/target/tcp"
|
||||
"github.com/hashicorp/boundary/internal/types/scope"
|
||||
plgpb "github.com/hashicorp/boundary/sdk/pbs/plugin"
|
||||
"github.com/hashicorp/go-secure-stdlib/base62"
|
||||
@@ -497,7 +498,7 @@ func (b *Server) CreateInitialTarget(ctx context.Context) (target.Target, error)
|
||||
|
||||
// Host Catalog
|
||||
if b.DevTargetId == "" {
|
||||
b.DevTargetId, err = db.NewPublicId(target.TcpTargetPrefix)
|
||||
b.DevTargetId, err = db.NewPublicId(tcp.TargetPrefix)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error generating initial target id: %w", err)
|
||||
}
|
||||
@@ -514,11 +515,11 @@ func (b *Server) CreateInitialTarget(ctx context.Context) (target.Target, error)
|
||||
target.WithSessionConnectionLimit(int32(b.DevTargetSessionConnectionLimit)),
|
||||
target.WithPublicId(b.DevTargetId),
|
||||
}
|
||||
t, err := target.NewTcpTarget(b.DevProjectId, opts...)
|
||||
t, err := tcp.New(b.DevProjectId, opts...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error creating in memory target: %w", err)
|
||||
}
|
||||
tt, _, _, err := targetRepo.CreateTcpTarget(cancelCtx, t, opts...)
|
||||
tt, _, _, err := targetRepo.CreateTarget(cancelCtx, t, opts...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error saving target to the db: %w", err)
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"github.com/hashicorp/boundary/internal/servers/controller"
|
||||
"github.com/hashicorp/boundary/internal/servers/controller/handlers"
|
||||
"github.com/hashicorp/boundary/internal/servers/worker"
|
||||
"github.com/hashicorp/boundary/internal/target"
|
||||
"github.com/hashicorp/boundary/internal/target/tcp"
|
||||
"github.com/hashicorp/boundary/internal/types/scope"
|
||||
"github.com/hashicorp/go-secure-stdlib/parseutil"
|
||||
"github.com/hashicorp/go-secure-stdlib/strutil"
|
||||
@@ -397,7 +397,7 @@ func (c *Command) Run(args []string) int {
|
||||
c.DevHostCatalogId = fmt.Sprintf("%s_%s", static.HostCatalogPrefix, c.flagIdSuffix)
|
||||
c.DevHostSetId = fmt.Sprintf("%s_%s", static.HostSetPrefix, c.flagIdSuffix)
|
||||
c.DevHostId = fmt.Sprintf("%s_%s", static.HostPrefix, c.flagIdSuffix)
|
||||
c.DevTargetId = fmt.Sprintf("%s_%s", target.TcpTargetPrefix, c.flagIdSuffix)
|
||||
c.DevTargetId = fmt.Sprintf("%s_%s", tcp.TargetPrefix, c.flagIdSuffix)
|
||||
}
|
||||
|
||||
host, port, err := net.SplitHostPort(c.flagHostAddress)
|
||||
|
||||
@@ -301,7 +301,7 @@ func HandleAttributeFlags(c *base.Command, suffix, fullField string, sepFields [
|
||||
case strings.HasPrefix(field.Value, `"`): // explicitly quoted string
|
||||
val = strings.Trim(field.Value, `"`)
|
||||
|
||||
case jsonNumberRegex.Match([]byte(strings.Trim(field.Value, `"`))): // number
|
||||
case jsonNumberRegex.MatchString(strings.Trim(field.Value, `"`)): // number
|
||||
// Same logic as above
|
||||
if strings.Contains(field.Value, ".") {
|
||||
val, err = strconv.ParseFloat(field.Value, 64)
|
||||
|
||||
Reference in new issue
Block a user