diff --git a/api/authmethods/account_test.go b/api/authmethods/account_test.go index a29600257..9d53e353a 100644 --- a/api/authmethods/account_test.go +++ b/api/authmethods/account_test.go @@ -16,7 +16,7 @@ import ( func TestAccounts_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -78,7 +78,7 @@ func comparableSlice(in []*authmethods.Account) []authmethods.Account { func TestAccount_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -132,7 +132,7 @@ func TestAccount_Crud(t *testing.T) { func TestAccount_CustomMethods(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -169,7 +169,7 @@ func TestAccount_CustomMethods(t *testing.T) { func TestAccount_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/authmethods/authenticate_test.go b/api/authmethods/authenticate_test.go index 9332eca5d..9deccf202 100644 --- a/api/authmethods/authenticate_test.go +++ b/api/authmethods/authenticate_test.go @@ -13,7 +13,7 @@ import ( func TestAuthenticate(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/authtokens/authtoken_test.go b/api/authtokens/authtoken_test.go index 5202a71dc..0d19eab6a 100644 --- a/api/authtokens/authtoken_test.go +++ b/api/authtokens/authtoken_test.go @@ -15,7 +15,7 @@ import ( func TestAuthTokens_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -82,7 +82,7 @@ func comparableSlice(in []*authtokens.AuthToken) []authtokens.AuthToken { func TestAuthToken_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -117,7 +117,7 @@ func TestAuthToken_Crud(t *testing.T) { func TestAuthToken_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/groups/group_test.go b/api/groups/group_test.go index 1de95544b..a3f4c924d 100644 --- a/api/groups/group_test.go +++ b/api/groups/group_test.go @@ -16,7 +16,7 @@ import ( func TestGroup_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -86,7 +86,7 @@ func comparableSlice(in []*groups.Group) []groups.Group { func TestGroup_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -178,7 +178,7 @@ func TestGroup_Crud(t *testing.T) { func TestGroup_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/hosts/host_catalog_test.go b/api/hosts/host_catalog_test.go index 9c0a36ded..de1f75d55 100644 --- a/api/hosts/host_catalog_test.go +++ b/api/hosts/host_catalog_test.go @@ -16,7 +16,7 @@ import ( func TestCatalog_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -77,7 +77,7 @@ func comparableCatalogSlice(in []*hosts.HostCatalog) []hosts.HostCatalog { func TestCatalogs_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -132,7 +132,7 @@ func TestCatalogs_Crud(t *testing.T) { // TODO: Get better coverage for expected errors and error formats. func TestCatalogs_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/hosts/host_set_test.go b/api/hosts/host_set_test.go index e98a9fd0d..a6145b8a6 100644 --- a/api/hosts/host_set_test.go +++ b/api/hosts/host_set_test.go @@ -16,7 +16,7 @@ import ( func TestSet_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -83,7 +83,7 @@ func comparableSetSlice(in []*hosts.HostSet) []hosts.HostSet { func TestSet_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -143,7 +143,7 @@ func TestSet_Crud(t *testing.T) { // TODO: Get better coverage for expected errors and error formats. func TestSet_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/hosts/host_test.go b/api/hosts/host_test.go index c116c1723..234dcf058 100644 --- a/api/hosts/host_test.go +++ b/api/hosts/host_test.go @@ -16,7 +16,7 @@ import ( func TestHost_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -83,7 +83,7 @@ func comparableHostSlice(in []*hosts.Host) []hosts.Host { func TestHost_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -143,7 +143,7 @@ func TestHost_Crud(t *testing.T) { // TODO: Get better coverage for expected errors and error formats. func TestHost_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/roles/role_test.go b/api/roles/role_test.go index 764c44816..75499046f 100644 --- a/api/roles/role_test.go +++ b/api/roles/role_test.go @@ -18,7 +18,7 @@ import ( func TestCustom(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -131,7 +131,7 @@ func TestCustom(t *testing.T) { func TestRole_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -212,7 +212,7 @@ func comparableSlice(in []*roles.Role) []roles.Role { func TestRole_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -285,7 +285,7 @@ func TestRole_Crud(t *testing.T) { func TestRole_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/scopes/project_test.go b/api/scopes/project_test.go index 8ed0102ca..ae29196f9 100644 --- a/api/scopes/project_test.go +++ b/api/scopes/project_test.go @@ -15,7 +15,7 @@ import ( func TestProjects_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -64,7 +64,7 @@ func comparableSlice(in []*scopes.Scope) []scopes.Scope { func TestProjects_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -117,7 +117,7 @@ func TestProjects_Crud(t *testing.T) { // TODO: Get better coverage for expected errors and error formats. func TestProject_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/api/users/user_test.go b/api/users/user_test.go index e3a628ae6..9ceae5cdb 100644 --- a/api/users/user_test.go +++ b/api/users/user_test.go @@ -15,7 +15,7 @@ import ( func TestUsers_List(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -76,7 +76,7 @@ func comparableSlice(in []*users.User) []users.User { func TestUser_Crud(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, @@ -129,7 +129,7 @@ func TestUser_Crud(t *testing.T) { func TestUser_Errors(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" tc := controller.NewTestController(t, &controller.TestControllerOpts{ DisableAuthorizationFailures: true, DefaultAuthMethodId: amId, diff --git a/internal/auth/password/public_ids.go b/internal/auth/password/public_ids.go index 810884db9..b40c9303c 100644 --- a/internal/auth/password/public_ids.go +++ b/internal/auth/password/public_ids.go @@ -8,8 +8,8 @@ import ( // PublicId prefixes for the resources in the password package. const ( - AuthMethodPrefix = "paum" - AccountPrefix = "pacc" + AuthMethodPrefix = "ampw" + AccountPrefix = "apw" ) func newAuthMethodId() (string, error) { diff --git a/internal/auth/password/repository_account_test.go b/internal/auth/password/repository_account_test.go index a7dc5eca2..2faef0777 100644 --- a/internal/auth/password/repository_account_test.go +++ b/internal/auth/password/repository_account_test.go @@ -76,7 +76,7 @@ func TestRepository_CreateAccount(t *testing.T) { in: &Account{ Account: &store.Account{ AuthMethodId: authMethod.PublicId, - PublicId: "sthc_OOOOOOOOOO", + PublicId: "hcst_OOOOOOOOOO", }, }, wantIsErr: db.ErrInvalidParameter, diff --git a/internal/auth/password/repository_authmethod_test.go b/internal/auth/password/repository_authmethod_test.go index 2d3f4f5b4..a7648c5eb 100644 --- a/internal/auth/password/repository_authmethod_test.go +++ b/internal/auth/password/repository_authmethod_test.go @@ -56,7 +56,7 @@ func TestRepository_CreateAuthMethod(t *testing.T) { in: &AuthMethod{ AuthMethod: &store.AuthMethod{ ScopeId: org.PublicId, - PublicId: "sthc_OOOOOOOOOO", + PublicId: "hcst_OOOOOOOOOO", }, }, wantIsErr: db.ErrInvalidParameter, diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index 5ea87c8d1..e9f505adc 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -498,7 +498,7 @@ func (b *Server) CreateDevDatabase(dialect string) error { } amId := b.DevAuthMethodId if amId == "" { - amId = "paum_1234567890" + amId = "ampw_1234567890" } _, err = pwRepo.CreateAuthMethod(ctx, authMethod, password.WithPublicId(amId)) if err != nil { diff --git a/internal/cmd/commands/authenticate/password.go b/internal/cmd/commands/authenticate/password.go index 92f111db9..94e71ef62 100644 --- a/internal/cmd/commands/authenticate/password.go +++ b/internal/cmd/commands/authenticate/password.go @@ -43,7 +43,7 @@ func (c *PasswordCommand) Help() string { "", " Invoke the password auth method to authenticate the Boundary CLI:", "", - ` $ boundary authenticate password -auth-method-id paum_1234567890 -login-name foo -password "bar"`, + ` $ boundary authenticate password -auth-method-id ampw_1234567890 -login-name foo -password "bar"`, }) + c.Flags().Help() } diff --git a/internal/cmd/commands/authmethods/authmethod.go b/internal/cmd/commands/authmethods/authmethod.go index c64a9894b..0b0205ad8 100644 --- a/internal/cmd/commands/authmethods/authmethod.go +++ b/internal/cmd/commands/authmethods/authmethod.go @@ -46,7 +46,7 @@ func (c *Command) Help() string { "", " Read an auth-method:", "", - ` $ boundary auth-methods read -id paum_1234567890`, + ` $ boundary auth-methods read -id ampw_1234567890`, "", " Please see the auth-methods subcommand help for detailed usage information.", }) diff --git a/internal/cmd/commands/authmethods/password.go b/internal/cmd/commands/authmethods/password.go index 0716f2229..078654308 100644 --- a/internal/cmd/commands/authmethods/password.go +++ b/internal/cmd/commands/authmethods/password.go @@ -56,7 +56,7 @@ func (c *PasswordCommand) Help() string { "", " Update a password-type auth-method given its ID. Example:", "", - ` $ boundary auth-methods password update -id paum_1234567890 -name "devops" -description "Password auth-method for DevOps"`, + ` $ boundary auth-methods password update -id ampw_1234567890 -name "devops" -description "Password auth-method for DevOps"`, "", "", }) diff --git a/internal/host/static/example_test.go b/internal/host/static/example_test.go index 0d63d8708..804dfecdc 100644 --- a/internal/host/static/example_test.go +++ b/internal/host/static/example_test.go @@ -15,7 +15,7 @@ func ExampleNewHostCatalog() { } func ExampleNewHost() { - catalogPublicId := "sthc_1234" + catalogPublicId := "hcst_1234" host, _ := static.NewHost(catalogPublicId, static.WithAddress("127.0.0.1")) fmt.Println(host.Address) // Output: @@ -23,7 +23,7 @@ func ExampleNewHost() { } func ExampleNewHostSet() { - catalogPublicId := "sthc_1234" + catalogPublicId := "hcst_1234" set, _ := static.NewHostSet(catalogPublicId, static.WithName("my host set")) fmt.Println(set.Name) // Output: @@ -31,8 +31,8 @@ func ExampleNewHostSet() { } func ExampleNewHostSetMember() { - setPublicId := "sths_11111" - hostPublicId := "sth_22222" + setPublicId := "hsst_11111" + hostPublicId := "hst_22222" member, _ := static.NewHostSetMember(setPublicId, hostPublicId) fmt.Println(member.SetId) fmt.Println(member.HostId) diff --git a/internal/host/static/immutable_fields_test.go b/internal/host/static/immutable_fields_test.go index 6808f538c..d91d261c2 100644 --- a/internal/host/static/immutable_fields_test.go +++ b/internal/host/static/immutable_fields_test.go @@ -262,7 +262,7 @@ func TestStaticHostSetMember_ImmutableFields(t *testing.T) { name: "host_id", update: func() *HostSetMember { c := new.testCloneHostSetMember() - c.HostId = "sth_01234567890" + c.HostId = "hst_01234567890" return c }(), fieldMask: []string{"HostId"}, diff --git a/internal/host/static/public_ids.go b/internal/host/static/public_ids.go index 6372c4186..e9ffa3418 100644 --- a/internal/host/static/public_ids.go +++ b/internal/host/static/public_ids.go @@ -8,9 +8,9 @@ import ( // PublicId prefixes for the resources in the static package. const ( - HostCatalogPrefix = "sthc" - HostSetPrefix = "sths" - HostPrefix = "sth" + HostCatalogPrefix = "hcst" + HostSetPrefix = "hsst" + HostPrefix = "hst" ) func newHostCatalogId() (string, error) { diff --git a/internal/host/static/repository_host_catalog_test.go b/internal/host/static/repository_host_catalog_test.go index 74ab1122b..a45b6a71c 100644 --- a/internal/host/static/repository_host_catalog_test.go +++ b/internal/host/static/repository_host_catalog_test.go @@ -95,7 +95,7 @@ func TestRepository_CreateCatalog(t *testing.T) { assert.NoError(err) assert.Empty(tt.in.PublicId) assert.NotNil(got) - assertPublicId(t, "sthc", got.PublicId) + assertPublicId(t, "hcst", got.PublicId) assert.NotSame(tt.in, got) assert.Equal(tt.want.Name, got.Name) assert.Equal(tt.want.Description, got.Description) @@ -120,7 +120,7 @@ func TestRepository_CreateCatalog(t *testing.T) { got, err := repo.CreateCatalog(context.Background(), in) assert.NoError(err) assert.NotNil(got) - assertPublicId(t, "sthc", got.PublicId) + assertPublicId(t, "hcst", got.PublicId) assert.NotSame(in, got) assert.Equal(in.Name, got.Name) assert.Equal(in.Description, got.Description) @@ -149,7 +149,7 @@ func TestRepository_CreateCatalog(t *testing.T) { got, err := repo.CreateCatalog(context.Background(), in) assert.NoError(err) assert.NotNil(got) - assertPublicId(t, "sthc", got.PublicId) + assertPublicId(t, "hcst", got.PublicId) assert.NotSame(in, got) assert.Equal(in.Name, got.Name) assert.Equal(in.Description, got.Description) @@ -159,7 +159,7 @@ func TestRepository_CreateCatalog(t *testing.T) { got2, err := repo.CreateCatalog(context.Background(), in2) assert.NoError(err) assert.NotNil(got2) - assertPublicId(t, "sthc", got2.PublicId) + assertPublicId(t, "hcst", got2.PublicId) assert.NotSame(in2, got2) assert.Equal(in2.Name, got2.Name) assert.Equal(in2.Description, got2.Description) @@ -215,7 +215,7 @@ func TestRepository_UpdateCatalog(t *testing.T) { nonExistentPublicId := func() func(*HostCatalog) *HostCatalog { return func(c *HostCatalog) *HostCatalog { - c.PublicId = "sthc_OOOOOOOOOO" + c.PublicId = "hcst_OOOOOOOOOO" return c } } @@ -457,7 +457,7 @@ func TestRepository_UpdateCatalog(t *testing.T) { assert.NoError(err) assert.Empty(tt.orig.PublicId) assert.NotNil(got) - assertPublicId(t, "sthc", got.PublicId) + assertPublicId(t, "hcst", got.PublicId) assert.Equal(tt.wantCount, gotCount, "row count") assert.NotSame(tt.orig, got) assert.Equal(tt.orig.ScopeId, got.ScopeId) @@ -519,7 +519,7 @@ func TestRepository_UpdateCatalog(t *testing.T) { got, err := repo.CreateCatalog(context.Background(), in) assert.NoError(err) assert.NotNil(got) - assertPublicId(t, "sthc", got.PublicId) + assertPublicId(t, "hcst", got.PublicId) assert.NotSame(in, got) assert.Equal(in.Name, got.Name) assert.Equal(in.Description, got.Description) diff --git a/internal/servers/controller/handler_test.go b/internal/servers/controller/handler_test.go index 1290d96ec..0da41caee 100644 --- a/internal/servers/controller/handler_test.go +++ b/internal/servers/controller/handler_test.go @@ -21,7 +21,7 @@ func TestAuthenticationHandler(t *testing.T) { }) defer c.Shutdown() - resp, err := http.Post(fmt.Sprintf("%s/v1/scopes/%s/auth-methods/paum_1234567890:authenticate", c.ApiAddrs()[0], scope.Global.String()), "application/json", + resp, err := http.Post(fmt.Sprintf("%s/v1/scopes/%s/auth-methods/ampw_1234567890:authenticate", c.ApiAddrs()[0], scope.Global.String()), "application/json", strings.NewReader(`{"token_type": null, "credentials": {"login_name":"admin", "password": "password123"}}`)) require.NoError(t, err) assert.Equal(t, http.StatusOK, resp.StatusCode, "Got response: %v", resp) diff --git a/internal/servers/controller/handlers/host_sets/host_set_service_test.go b/internal/servers/controller/handlers/host_sets/host_set_service_test.go index 36b0a7b45..a4caa2c77 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service_test.go +++ b/internal/servers/controller/handlers/host_sets/host_set_service_test.go @@ -391,7 +391,7 @@ func TestCreate(t *testing.T) { assert.Equal(tc.errCode, status.Code(gErr), "CreateHostSet(%+v) got error %v, wanted %v", req, gErr, tc.errCode) if got != nil { assert.Contains(got.GetUri(), tc.res.GetUri()) - assert.True(strings.HasPrefix(got.GetItem().GetId(), static.HostPrefix)) + assert.True(strings.HasPrefix(got.GetItem().GetId(), static.HostSetPrefix), got.GetItem().GetId()) gotCreateTime, err := ptypes.Timestamp(got.GetItem().GetCreatedTime()) require.NoError(err, "Error converting proto to timestamp.") gotUpdateTime, err := ptypes.Timestamp(got.GetItem().GetUpdatedTime()) diff --git a/internal/servers/controller/multi_test.go b/internal/servers/controller/multi_test.go index ef2ff42ec..00196b10f 100644 --- a/internal/servers/controller/multi_test.go +++ b/internal/servers/controller/multi_test.go @@ -15,7 +15,7 @@ import ( func TestAuthenticationMulti(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" user := "user" password := "passpass" logger := hclog.New(&hclog.LoggerOptions{ diff --git a/internal/tests/cluster/multi_controller_worker_test.go b/internal/tests/cluster/multi_controller_worker_test.go index bf013fe12..12d8a49fa 100644 --- a/internal/tests/cluster/multi_controller_worker_test.go +++ b/internal/tests/cluster/multi_controller_worker_test.go @@ -13,7 +13,7 @@ import ( func TestMultiControllerMultiWorkerConnections(t *testing.T) { assert, require := assert.New(t), require.New(t) - amId := "paum_1234567890" + amId := "ampw_1234567890" user := "user" password := "passpass" logger := hclog.New(&hclog.LoggerOptions{