diff --git a/testing/internal/e2e/boundary/credential.go b/testing/internal/e2e/boundary/credential.go index 5bcd8b3a68..24ebe8746e 100644 --- a/testing/internal/e2e/boundary/credential.go +++ b/testing/internal/e2e/boundary/credential.go @@ -202,10 +202,10 @@ func CreateStaticCredentialPrivateKeyCli(t testing.TB, ctx context.Context, cred return credentialId, nil } -// CreateStaticCredentialPasswordCli uses the cli to create a new password credential in the +// CreateStaticCredentialUsernamePasswordCli uses the cli to create a new password credential in the // provided static credential store. // Returns the id of the new credential -func CreateStaticCredentialPasswordCli(t testing.TB, ctx context.Context, credentialStoreId string, user string, password string) (string, error) { +func CreateStaticCredentialUsernamePasswordCli(t testing.TB, ctx context.Context, credentialStoreId string, user string, password string) (string, error) { name, err := base62.Random(16) if err != nil { return "", err @@ -238,10 +238,10 @@ func CreateStaticCredentialPasswordCli(t testing.TB, ctx context.Context, creden return credentialId, nil } -// CreateStaticCredentialPasswordDomainCli uses the cli to create a new username password domain credential in the +// CreateStaticCredentialUsernamePasswordDomainCli uses the cli to create a new username password domain credential in the // provided static credential store. // Returns the id of the new credential -func CreateStaticCredentialPasswordDomainCli(t testing.TB, ctx context.Context, credentialStoreId string, user string, password string, domain string) (string, error) { +func CreateStaticCredentialUsernamePasswordDomainCli(t testing.TB, ctx context.Context, credentialStoreId string, user string, password string, domain string) (string, error) { name, err := base62.Random(16) if err != nil { return "", err diff --git a/testing/internal/e2e/tests/base/credential_store_test.go b/testing/internal/e2e/tests/base/credential_store_test.go index 70cf4fec8c..ed3e841fe8 100644 --- a/testing/internal/e2e/tests/base/credential_store_test.go +++ b/testing/internal/e2e/tests/base/credential_store_test.go @@ -77,11 +77,11 @@ func TestCliStaticCredentialStore(t *testing.T) { require.NoError(t, err) privateKeyCredentialsId, err := boundary.CreateStaticCredentialPrivateKeyCli(t, ctx, storeId, c.TargetSshUser, testPemFile) require.NoError(t, err) - pwCredentialId, err := boundary.CreateStaticCredentialPasswordCli(t, ctx, storeId, c.TargetSshUser, testPassword) + pwCredentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli(t, ctx, storeId, c.TargetSshUser, testPassword) require.NoError(t, err) jsonCredentialId, err := boundary.CreateStaticCredentialJsonCli(t, ctx, storeId, testCredentialsFile) require.NoError(t, err) - updCredentialId, err := boundary.CreateStaticCredentialPasswordDomainCli(t, ctx, storeId, c.TargetSshUser, testPassword, testDomain) + updCredentialId, err := boundary.CreateStaticCredentialUsernamePasswordDomainCli(t, ctx, storeId, c.TargetSshUser, testPassword, testDomain) require.NoError(t, err) // Get credentials for target (expect empty) diff --git a/testing/internal/e2e/tests/base/paginate_credential_test.go b/testing/internal/e2e/tests/base/paginate_credential_test.go index c97fb0bfc0..bcc9875dfb 100644 --- a/testing/internal/e2e/tests/base/paginate_credential_test.go +++ b/testing/internal/e2e/tests/base/paginate_credential_test.go @@ -88,7 +88,7 @@ func TestCliPaginateCredentials(t *testing.T) { assert.Empty(t, initialCredentials.ListToken) // Create a new credential and destroy one of the other credentials - credentialId, err := boundary.CreateStaticCredentialPasswordCli(t, ctx, storeId, "user", "password") + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli(t, ctx, storeId, "user", "password") require.NoError(t, err) output = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_cassandra_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_cassandra_test.go index 9fd07626a5..5951624ff0 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_cassandra_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_cassandra_test.go @@ -82,7 +82,7 @@ func TestCliTcpTargetConnectCassandra(t *testing.T) { storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - credentialId, err := boundary.CreateStaticCredentialPasswordCli( + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli( t, ctx, storeId, diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_mongo_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_mongo_test.go index fd999df502..1492dc4128 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_mongo_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_mongo_test.go @@ -83,7 +83,7 @@ func TestCliTcpTargetConnectMongo(t *testing.T) { storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - credentialId, err := boundary.CreateStaticCredentialPasswordCli( + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli( t, ctx, storeId, diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go index 6b306fd233..475ad5ad3b 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go @@ -82,7 +82,7 @@ func TestCliTcpTargetConnectMysql(t *testing.T) { storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - credentialId, err := boundary.CreateStaticCredentialPasswordCli( + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli( t, ctx, storeId, diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_redis_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_redis_test.go index bc07eed55b..6455e6c639 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_redis_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_redis_test.go @@ -84,7 +84,7 @@ func TestCliTcpTargetConnectRedis(t *testing.T) { storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - credentialId, err := boundary.CreateStaticCredentialPasswordCli( + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli( t, ctx, storeId, diff --git a/testing/internal/e2e/tests/base_plus/target_tcp_connect_postgres_test.go b/testing/internal/e2e/tests/base_plus/target_tcp_connect_postgres_test.go index b3679ad66b..04d5e7c96e 100644 --- a/testing/internal/e2e/tests/base_plus/target_tcp_connect_postgres_test.go +++ b/testing/internal/e2e/tests/base_plus/target_tcp_connect_postgres_test.go @@ -47,7 +47,7 @@ func TestCliTcpTargetConnectPostgres(t *testing.T) { require.NoError(t, err) storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - credentialId, err := boundary.CreateStaticCredentialPasswordCli( + credentialId, err := boundary.CreateStaticCredentialUsernamePasswordCli( t, ctx, storeId, diff --git a/testing/internal/e2e/tests/database/migration_test.go b/testing/internal/e2e/tests/database/migration_test.go index 447b34a20d..cf1746993d 100644 --- a/testing/internal/e2e/tests/database/migration_test.go +++ b/testing/internal/e2e/tests/database/migration_test.go @@ -268,7 +268,7 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T // Create static credentials storeId, err := boundary.CreateCredentialStoreStaticCli(t, ctx, projectId) require.NoError(t, err) - _, err = boundary.CreateStaticCredentialPasswordCli(t, ctx, storeId, c.TargetSshUser, "password") + _, err = boundary.CreateStaticCredentialUsernamePasswordCli(t, ctx, storeId, c.TargetSshUser, "password") require.NoError(t, err) _, err = boundary.CreateStaticCredentialJsonCli(t, ctx, storeId, "testdata/credential.json") require.NoError(t, err)