CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename target2 import alias to talias (#4482)

Browse Source
This commit is contained in:
Todd authored and GitHub committed 2024-03-05 07:41:38 -08:00
1 parent 18aa96fc61
commit f7631edcab
6 files changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/daemon/controller/controller.go
+3 -3
View File
@@ -12,7 +12,7 @@ import (
"sync/atomic"
"github.com/hashicorp/boundary/internal/alias"
target2 "github.com/hashicorp/boundary/internal/alias/target"
talias "github.com/hashicorp/boundary/internal/alias/target"
"github.com/hashicorp/boundary/internal/auth"
"github.com/hashicorp/boundary/internal/auth/ldap"
"github.com/hashicorp/boundary/internal/auth/oidc"
@@ -460,8 +460,8 @@ func New(ctx context.Context, conf *Config) (*Controller, error) {
c.AliasRepoFn = func() (*alias.Repository, error) {
return alias.NewRepository(ctx, dbase, dbase, c.kms)
}
c.TargetAliasRepoFn = func() (*target2.Repository, error) {
return target2.NewRepository(ctx, dbase, dbase, c.kms)
c.TargetAliasRepoFn = func() (*talias.Repository, error) {
return talias.NewRepository(ctx, dbase, dbase, c.kms)
}
// Check that credentials are available at startup, to avoid some harmless
internal/target/repository.go
+2 -2
View File
@@ -10,7 +10,7 @@ import (
"strings"
"time"
target2 "github.com/hashicorp/boundary/internal/alias/target"
talias "github.com/hashicorp/boundary/internal/alias/target"
"github.com/hashicorp/boundary/internal/boundary"
"github.com/hashicorp/boundary/internal/db"
"github.com/hashicorp/boundary/internal/db/timestamp"
@@ -134,7 +134,7 @@ func (r *Repository) LookupTarget(ctx context.Context, publicIdOrName string, op
var address string
var hostSources []HostSource
var credSources []CredentialSource
var aliases []*target2.Alias
var aliases []*talias.Alias
_, err := r.writer.DoTx(
ctx,
db.StdRetryCnt,
internal/target/targettest/target.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
"testing"
"github.com/hashicorp/boundary/globals"
target2 "github.com/hashicorp/boundary/internal/alias/target"
talias "github.com/hashicorp/boundary/internal/alias/target"
"github.com/hashicorp/boundary/internal/db"
"github.com/hashicorp/boundary/internal/db/timestamp"
"github.com/hashicorp/boundary/internal/errors"
@@ -35,7 +35,7 @@ type Target struct {
tableName string `gorm:"-"`
HostSource []target.HostSource `gorm:"-"`
CredentialSources []target.CredentialSource `gorm:"-"`
Aliases []*target2.Alias `gorm:"-"`
Aliases []*talias.Alias `gorm:"-"`
}
var (
@@ -141,7 +141,7 @@ func (t *Target) GetAddress() string {
return t.Address
}
func (t *Target) GetAliases() []*target2.Alias {
func (t *Target) GetAliases() []*talias.Alias {
return t.Aliases
}
@@ -237,7 +237,7 @@ func (t *Target) SetAddress(a string) {
t.Address = a
}
func (t *Target) SetAliases(aliases []*target2.Alias) {
func (t *Target) SetAliases(aliases []*talias.Alias) {
t.Aliases = aliases
}
internal/target/tcp/repository_alias_test.go
+6 -6
View File
@@ -7,7 +7,7 @@ import (
"context"
"testing"
target2 "github.com/hashicorp/boundary/internal/alias/target"
talias "github.com/hashicorp/boundary/internal/alias/target"
"github.com/hashicorp/boundary/internal/db"
"github.com/hashicorp/boundary/internal/iam"
"github.com/hashicorp/boundary/internal/kms"
@@ -40,7 +40,7 @@ func TestRepository_FetchAliases(t *testing.T) {
t.Run("target-one-alias", func(t *testing.T) {
aname := "test-alias"
tar := tcp.TestTarget(ctx, t, conn, staticProj.PublicId, "test-target-2")
al := target2.TestAlias(t, rw, aname, target2.WithDestinationId(tar.GetPublicId()))
al := talias.TestAlias(t, rw, aname, talias.WithDestinationId(tar.GetPublicId()))
tar, err := repo.LookupTarget(context.Background(), tar.GetPublicId())
require.NoError(t, err)
@@ -51,15 +51,15 @@ func TestRepository_FetchAliases(t *testing.T) {
})
t.Run("target-multiple-alias", func(t *testing.T) {
tar := tcp.TestTarget(ctx, t, conn, staticProj.PublicId, "test-target3")
aliases := make(map[string]*target2.Alias)
aliases := make(map[string]*talias.Alias)
aname1 := "test.alias.one"
aname2 := "test.alias.two"
aname3 := "test.alias.three"
al := target2.TestAlias(t, rw, aname1, target2.WithDestinationId(tar.GetPublicId()))
al := talias.TestAlias(t, rw, aname1, talias.WithDestinationId(tar.GetPublicId()))
aliases[aname1] = al
al2 := target2.TestAlias(t, rw, aname2, target2.WithDestinationId(tar.GetPublicId()))
al2 := talias.TestAlias(t, rw, aname2, talias.WithDestinationId(tar.GetPublicId()))
aliases[aname2] = al2
al3 := target2.TestAlias(t, rw, aname3, target2.WithDestinationId(tar.GetPublicId()))
al3 := talias.TestAlias(t, rw, aname3, talias.WithDestinationId(tar.GetPublicId()))
aliases[aname3] = al3
tar, err := repo.LookupTarget(context.Background(), tar.GetPublicId())
internal/target/tcp/target.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
"strings"
"github.com/hashicorp/boundary/globals"
target2 "github.com/hashicorp/boundary/internal/alias/target"
talias "github.com/hashicorp/boundary/internal/alias/target"
"github.com/hashicorp/boundary/internal/db"
"github.com/hashicorp/boundary/internal/db/timestamp"
"github.com/hashicorp/boundary/internal/errors"
@@ -37,7 +37,7 @@ type Target struct {
tableName string `gorm:"-"`
HostSource []target.HostSource `gorm:"-"`
CredentialSources []target.CredentialSource `gorm:"-"`
Aliases []*target2.Alias `gorm:"-"`
Aliases []*talias.Alias `gorm:"-"`
}
// Ensure Target implements interfaces
@@ -144,7 +144,7 @@ func (t *Target) GetAddress() string {
return t.Address
}
func (t *Target) GetAliases() []*target2.Alias {
func (t *Target) GetAliases() []*talias.Alias {
return t.Aliases
}
@@ -235,7 +235,7 @@ func (t *Target) SetAddress(address string) {
t.Address = address
}
func (t *Target) SetAliases(aliases []*target2.Alias) {
func (t *Target) SetAliases(aliases []*talias.Alias) {
t.Aliases = aliases
}
internal/target/tcp/target_test.go
+2 -2
View File
@@ -339,10 +339,10 @@ func TestTarget_Clone(t *testing.T) {
_, proj := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper))
_, proj2 := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper))
target1 := tcp.TestTarget(ctx, t, conn, proj.PublicId, tcp.TestTargetName(t, proj.PublicId))
target2 := tcp.TestTarget(ctx, t, conn, proj2.PublicId, tcp.TestTargetName(t, proj2.PublicId))
talias := tcp.TestTarget(ctx, t, conn, proj2.PublicId, tcp.TestTargetName(t, proj2.PublicId))
cp := target1.Clone()
assert.True(!proto.Equal(cp.(*tcp.Target).Target, target2.(*tcp.Target).Target))
assert.True(!proto.Equal(cp.(*tcp.Target).Target, talias.(*tcp.Target).Target))
})
}