From 29ba92e453245d4a2b6bfd952955f858ab1e9a7b Mon Sep 17 00:00:00 2001 From: Tony <52470376+wongtonyb@users.noreply.github.com> Date: Tue, 6 Jan 2026 17:05:30 -0500 Subject: [PATCH] chore(e2e): update e2e tests to use t.Context() (#6316) --- .../dynamichostcatalog_host_set_empty_test.go | 2 +- .../aws/dynamichostcatalog_host_set_test.go | 5 +++-- testing/internal/e2e/tests/aws/worker_test.go | 2 +- testing/internal/e2e/tests/base/alias_test.go | 6 +++++- .../tests/base/auth_method_password_test.go | 6 +++--- .../e2e/tests/base/auth_token_delete_test.go | 10 +++++---- .../tests/base/auth_unauthenticated_test.go | 3 +-- .../tests/base/authenticate_primary_test.go | 3 +-- .../tests/base/bytes_up_down_empty_test.go | 2 +- .../e2e/tests/base/bytes_up_down_test.go | 2 +- .../e2e/tests/base/credential_store_test.go | 5 +++-- .../e2e/tests/base/paginate_account_test.go | 4 ++-- .../tests/base/paginate_auth_token_test.go | 4 ++-- .../base/paginate_credential_store_test.go | 4 ++-- .../tests/base/paginate_credential_test.go | 4 ++-- .../e2e/tests/base/paginate_group_test.go | 4 ++-- .../tests/base/paginate_host_catalog_test.go | 4 ++-- .../e2e/tests/base/paginate_host_set_test.go | 4 ++-- .../e2e/tests/base/paginate_host_test.go | 4 ++-- .../tests/base/paginate_managed_group_test.go | 4 ++-- .../e2e/tests/base/paginate_role_test.go | 4 ++-- .../e2e/tests/base/paginate_scope_test.go | 4 ++-- .../e2e/tests/base/paginate_session_test.go | 4 ++-- .../e2e/tests/base/paginate_target_test.go | 4 ++-- .../e2e/tests/base/paginate_user_test.go | 4 ++-- .../base/role_multi_scope_grants_test.go | 5 ++++- .../e2e/tests/base/scope_permissions_test.go | 6 +++++- .../internal/e2e/tests/base/search_test.go | 3 ++- .../tests/base/session_cancel_admin_test.go | 2 +- .../tests/base/session_cancel_group_test.go | 13 ++++++++---- .../tests/base/session_cancel_user_test.go | 13 ++++++++---- .../base/session_end_delete_host_set_test.go | 8 ++++--- .../base/session_end_delete_host_test.go | 8 ++++--- .../base/session_end_delete_project_test.go | 8 ++++--- .../base/session_end_delete_target_test.go | 8 ++++--- .../base/session_end_delete_user_test.go | 8 ++++--- .../e2e/tests/base/target_tcp_address_test.go | 6 +++--- .../target_tcp_connect_authz_token_test.go | 2 +- .../base/target_tcp_connect_cassandra_test.go | 2 +- ...rget_tcp_connect_connection_limits_test.go | 2 +- ...et_tcp_connect_default_client_port_test.go | 2 +- ...p_connect_exec_long_lasting_script_test.go | 2 +- .../base/target_tcp_connect_go_ssh_test.go | 2 +- .../base/target_tcp_connect_http_test.go | 3 ++- .../target_tcp_connect_listen_port_test.go | 4 ++-- .../base/target_tcp_connect_localhost_test.go | 2 +- .../base/target_tcp_connect_mongo_test.go | 2 +- .../base/target_tcp_connect_mysql_test.go | 2 +- .../target_tcp_connect_redis_password_test.go | 2 +- ...cp_connect_redis_username_password_test.go | 2 +- .../tests/base/target_tcp_connect_scp_test.go | 2 +- ...et_tcp_connect_session_max_seconds_test.go | 4 ++-- .../tests/base/target_tcp_connect_ssh_test.go | 2 +- .../e2e/tests/base/target_tcp_connect_test.go | 4 ++-- .../internal/e2e/tests/base/version_test.go | 3 +-- .../tests/base_plus/auth_method_ldap_test.go | 2 +- .../base_plus/authenticate_no_keyring_test.go | 3 +-- .../tests/base_plus/key_destruction_test.go | 6 ++++-- .../e2e/tests/base_plus/rate_limit_test.go | 16 ++++++++------ .../target_tcp_connect_postgres_test.go | 2 +- .../auth_method_oidc_vault_test.go | 4 +++- .../credential_library_vault_ldap_test.go | 21 ++++++++++++------- .../base_with_vault/credential_store_test.go | 14 +++++++++++-- .../paginate_credential_library_test.go | 10 +++++++-- ..._vault_generic_connect_authz_token_test.go | 5 ++++- ...rget_tcp_vault_generic_connect_ssh_test.go | 5 ++++- .../target_tcp_vault_generic_connect_test.go | 5 ++++- .../target_tcp_worker_connect_ssh_test.go | 8 ++++++- .../e2e/tests/database/migration_test.go | 4 +++- .../dynamichostcatalog_host_set_empty_test.go | 2 +- .../gcp/dynamichostcatalog_host_set_test.go | 5 +++-- 71 files changed, 213 insertions(+), 133 deletions(-) diff --git a/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_empty_test.go b/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_empty_test.go index 716c6d947..208590e42 100644 --- a/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_empty_test.go +++ b/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_empty_test.go @@ -26,7 +26,7 @@ func TestCliCreateAwsDynamicHostCatalogWithEmptyHostSet(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_test.go b/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_test.go index c131391d7..8b8d86da7 100644 --- a/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_test.go +++ b/testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_test.go @@ -36,7 +36,7 @@ func TestCliCreateAwsDynamicHostCatalogWithHostSet(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -189,11 +189,12 @@ func TestApiCreateAwsDynamicHostCatalog(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/aws/worker_test.go b/testing/internal/e2e/tests/aws/worker_test.go index 70ba3db52..87476f623 100644 --- a/testing/internal/e2e/tests/aws/worker_test.go +++ b/testing/internal/e2e/tests/aws/worker_test.go @@ -20,7 +20,7 @@ func TestCliWorker(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/alias_test.go b/testing/internal/e2e/tests/base/alias_test.go index 3e15e587d..0332cd10a 100644 --- a/testing/internal/e2e/tests/base/alias_test.go +++ b/testing/internal/e2e/tests/base/alias_test.go @@ -25,7 +25,7 @@ func TestCliAlias(t *testing.T) { require.NoError(t, err) // Set up the test - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -64,6 +64,8 @@ func TestCliAlias(t *testing.T) { require.NoError(t, err) aliasTargetAddressId := newAliasResult.Item.Id t.Cleanup(func() { + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("aliases", "delete", "-id", aliasTargetAddressId)) require.NoError(t, output.Err, string(output.Stderr)) }) @@ -148,6 +150,8 @@ func TestCliAlias(t *testing.T) { require.NoError(t, err) aliasTargetHostId := newAliasResult.Item.Id t.Cleanup(func() { + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("aliases", "delete", "-id", aliasTargetHostId)) require.NoError(t, output.Err, string(output.Stderr)) }) diff --git a/testing/internal/e2e/tests/base/auth_method_password_test.go b/testing/internal/e2e/tests/base/auth_method_password_test.go index 13715be64..060839330 100644 --- a/testing/internal/e2e/tests/base/auth_method_password_test.go +++ b/testing/internal/e2e/tests/base/auth_method_password_test.go @@ -26,7 +26,7 @@ import ( func TestCliAuthMethodPassword(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -153,7 +153,7 @@ func TestCliPaginateAuthMethods(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) client, err := boundary.NewApiClient() require.NoError(t, err) @@ -246,7 +246,7 @@ func TestApiPaginateAuthMethods(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) adminToken := client.Token() - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) amClient := authmethods.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/auth_token_delete_test.go b/testing/internal/e2e/tests/base/auth_token_delete_test.go index feb37f7e4..8a0d37437 100644 --- a/testing/internal/e2e/tests/base/auth_token_delete_test.go +++ b/testing/internal/e2e/tests/base/auth_token_delete_test.go @@ -26,12 +26,13 @@ func TestUserIsLoggedOutWhenAuthTokenIsDeletedCli(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) accountid, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, testAccountName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountid), ) @@ -40,7 +41,8 @@ func TestUserIsLoggedOutWhenAuthTokenIsDeletedCli(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) @@ -50,7 +52,7 @@ func TestUserIsLoggedOutWhenAuthTokenIsDeletedCli(t *testing.T) { require.NoError(t, err) // Authenticate user and assign a name to its auth token - boundary.AuthenticateCli(t, context.Background(), bc.AuthMethodId, testAccountName, acctPassword, + boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, testAccountName, acctPassword, e2e.WithArgs("-token-name", testAccountName), ) diff --git a/testing/internal/e2e/tests/base/auth_unauthenticated_test.go b/testing/internal/e2e/tests/base/auth_unauthenticated_test.go index 0259d6658..49ea0d511 100644 --- a/testing/internal/e2e/tests/base/auth_unauthenticated_test.go +++ b/testing/internal/e2e/tests/base/auth_unauthenticated_test.go @@ -4,7 +4,6 @@ package base_test import ( - "context" "encoding/json" "net/http" "strings" @@ -20,7 +19,7 @@ import ( func TestCliUnauthenticatedUserAccess(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) // Check one authenticated request diff --git a/testing/internal/e2e/tests/base/authenticate_primary_test.go b/testing/internal/e2e/tests/base/authenticate_primary_test.go index 92c9f7d6d..c39f6f926 100644 --- a/testing/internal/e2e/tests/base/authenticate_primary_test.go +++ b/testing/internal/e2e/tests/base/authenticate_primary_test.go @@ -5,7 +5,6 @@ package base_test import ( "bytes" - "context" "encoding/json" "io" "net/http" @@ -29,7 +28,7 @@ func TestCliAuthenticatePrimary(t *testing.T) { require.NoError(t, err) var cmd *exec.Cmd - ctx := context.Background() + ctx := t.Context() cmd = exec.CommandContext(ctx, "boundary", "authenticate", "-addr", bc.Address, "-format", "json") f, err := pty.Start(cmd) diff --git a/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go b/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go index e094bd1f1..b1a15fd34 100644 --- a/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go +++ b/testing/internal/e2e/tests/base/bytes_up_down_empty_test.go @@ -27,7 +27,7 @@ func TestCliBytesUpDownEmpty(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/bytes_up_down_test.go b/testing/internal/e2e/tests/base/bytes_up_down_test.go index 40972a222..c8cdcd11b 100644 --- a/testing/internal/e2e/tests/base/bytes_up_down_test.go +++ b/testing/internal/e2e/tests/base/bytes_up_down_test.go @@ -28,7 +28,7 @@ func TestCliBytesUpDownTransferData(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/credential_store_test.go b/testing/internal/e2e/tests/base/credential_store_test.go index 9ec9015ec..ba7b66b4f 100644 --- a/testing/internal/e2e/tests/base/credential_store_test.go +++ b/testing/internal/e2e/tests/base/credential_store_test.go @@ -40,7 +40,7 @@ func TestCliStaticCredentialStore(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -202,7 +202,7 @@ func TestApiStaticCredentialStore(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() targetPort, err := strconv.ParseUint(c.TargetPort, 10, 32) require.NoError(t, err) @@ -210,6 +210,7 @@ func TestApiStaticCredentialStore(t *testing.T) { orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/paginate_account_test.go b/testing/internal/e2e/tests/base/paginate_account_test.go index 172321869..af189f890 100644 --- a/testing/internal/e2e/tests/base/paginate_account_test.go +++ b/testing/internal/e2e/tests/base/paginate_account_test.go @@ -29,7 +29,7 @@ func TestCliPaginateAccounts(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) client, err := boundary.NewApiClient() require.NoError(t, err) @@ -133,7 +133,7 @@ func TestApiPaginateAccounts(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) adminToken := client.Token() - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) amClient := authmethods.NewClient(client) acClient := accounts.NewClient(client) diff --git a/testing/internal/e2e/tests/base/paginate_auth_token_test.go b/testing/internal/e2e/tests/base/paginate_auth_token_test.go index 5690b344c..17a22b31d 100644 --- a/testing/internal/e2e/tests/base/paginate_auth_token_test.go +++ b/testing/internal/e2e/tests/base/paginate_auth_token_test.go @@ -29,7 +29,7 @@ func TestCliPaginateAuthTokens(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) client, err := boundary.NewApiClient() require.NoError(t, err) @@ -142,7 +142,7 @@ func TestApiPaginateAuthTokens(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) adminToken := client.Token() - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) amClient := authmethods.NewClient(client) atClient := authtokens.NewClient(client) diff --git a/testing/internal/e2e/tests/base/paginate_credential_store_test.go b/testing/internal/e2e/tests/base/paginate_credential_store_test.go index 0758b404a..ed3ee29e8 100644 --- a/testing/internal/e2e/tests/base/paginate_credential_store_test.go +++ b/testing/internal/e2e/tests/base/paginate_credential_store_test.go @@ -27,7 +27,7 @@ func TestCliPaginateCredentialStores(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -124,7 +124,7 @@ func TestApiPaginateCredentialStores(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) cClient := credentialstores.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_credential_test.go b/testing/internal/e2e/tests/base/paginate_credential_test.go index bcc9875df..fb506432a 100644 --- a/testing/internal/e2e/tests/base/paginate_credential_test.go +++ b/testing/internal/e2e/tests/base/paginate_credential_test.go @@ -27,7 +27,7 @@ func TestCliPaginateCredentials(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -136,7 +136,7 @@ func TestApiPaginateCredentials(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) cClient := credentials.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_group_test.go b/testing/internal/e2e/tests/base/paginate_group_test.go index ccd2aadbb..70f6049a8 100644 --- a/testing/internal/e2e/tests/base/paginate_group_test.go +++ b/testing/internal/e2e/tests/base/paginate_group_test.go @@ -27,7 +27,7 @@ func TestCliPaginateGroups(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -122,7 +122,7 @@ func TestApiPaginateGroups(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) uClient := groups.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_host_catalog_test.go b/testing/internal/e2e/tests/base/paginate_host_catalog_test.go index 483cdb360..0993d7ad4 100644 --- a/testing/internal/e2e/tests/base/paginate_host_catalog_test.go +++ b/testing/internal/e2e/tests/base/paginate_host_catalog_test.go @@ -27,7 +27,7 @@ func TestCliPaginateHostCatalogs(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -124,7 +124,7 @@ func TestApiPaginateHostCatalogs(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) hcClient := hostcatalogs.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_host_set_test.go b/testing/internal/e2e/tests/base/paginate_host_set_test.go index c69dac33b..d68bd5d01 100644 --- a/testing/internal/e2e/tests/base/paginate_host_set_test.go +++ b/testing/internal/e2e/tests/base/paginate_host_set_test.go @@ -27,7 +27,7 @@ func TestCliPaginateHostSets(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -126,7 +126,7 @@ func TestApiPaginateHostSets(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) hsClient := hostsets.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_host_test.go b/testing/internal/e2e/tests/base/paginate_host_test.go index 36c4230c9..2b7d2aa39 100644 --- a/testing/internal/e2e/tests/base/paginate_host_test.go +++ b/testing/internal/e2e/tests/base/paginate_host_test.go @@ -27,7 +27,7 @@ func TestCliPaginateHosts(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -126,7 +126,7 @@ func TestApiPaginateHosts(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) hClient := hosts.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_managed_group_test.go b/testing/internal/e2e/tests/base/paginate_managed_group_test.go index d7767e120..5880664b7 100644 --- a/testing/internal/e2e/tests/base/paginate_managed_group_test.go +++ b/testing/internal/e2e/tests/base/paginate_managed_group_test.go @@ -28,7 +28,7 @@ func TestCliPaginateManagedGroups(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) client, err := boundary.NewApiClient() require.NoError(t, err) @@ -132,7 +132,7 @@ func TestApiPaginateManagedGroups(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) adminToken := client.Token() - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) amClient := authmethods.NewClient(client) mgClient := managedgroups.NewClient(client) diff --git a/testing/internal/e2e/tests/base/paginate_role_test.go b/testing/internal/e2e/tests/base/paginate_role_test.go index 77667db39..df50b83de 100644 --- a/testing/internal/e2e/tests/base/paginate_role_test.go +++ b/testing/internal/e2e/tests/base/paginate_role_test.go @@ -27,7 +27,7 @@ func TestCliPaginateRoles(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -127,7 +127,7 @@ func TestApiPaginateRoles(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) uClient := roles.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_scope_test.go b/testing/internal/e2e/tests/base/paginate_scope_test.go index c885821d0..4dca0f6e9 100644 --- a/testing/internal/e2e/tests/base/paginate_scope_test.go +++ b/testing/internal/e2e/tests/base/paginate_scope_test.go @@ -25,7 +25,7 @@ func TestCliPaginateScopes(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -120,7 +120,7 @@ func TestApiPaginateScopes(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/paginate_session_test.go b/testing/internal/e2e/tests/base/paginate_session_test.go index 750c6e7c6..1dbc8454a 100644 --- a/testing/internal/e2e/tests/base/paginate_session_test.go +++ b/testing/internal/e2e/tests/base/paginate_session_test.go @@ -27,7 +27,7 @@ func TestCliPaginateSessions(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -113,7 +113,7 @@ func TestApiPaginateSessions(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) sClient := sessions.NewClient(client) diff --git a/testing/internal/e2e/tests/base/paginate_target_test.go b/testing/internal/e2e/tests/base/paginate_target_test.go index 5d1284750..300162920 100644 --- a/testing/internal/e2e/tests/base/paginate_target_test.go +++ b/testing/internal/e2e/tests/base/paginate_target_test.go @@ -29,7 +29,7 @@ func TestCliPaginateTargets(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -134,7 +134,7 @@ func TestApiPaginateTargets(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) tClient := targets.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/paginate_user_test.go b/testing/internal/e2e/tests/base/paginate_user_test.go index e98a9b995..a56879305 100644 --- a/testing/internal/e2e/tests/base/paginate_user_test.go +++ b/testing/internal/e2e/tests/base/paginate_user_test.go @@ -27,7 +27,7 @@ func TestCliPaginateUsers(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -122,7 +122,7 @@ func TestApiPaginateUsers(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) uClient := users.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) diff --git a/testing/internal/e2e/tests/base/role_multi_scope_grants_test.go b/testing/internal/e2e/tests/base/role_multi_scope_grants_test.go index 4d8830454..00b05e440 100644 --- a/testing/internal/e2e/tests/base/role_multi_scope_grants_test.go +++ b/testing/internal/e2e/tests/base/role_multi_scope_grants_test.go @@ -18,7 +18,7 @@ func TestCliApplyGrantsForMultipleScopes(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) // Create Org and Project @@ -38,6 +38,7 @@ func TestCliApplyGrantsForMultipleScopes(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), @@ -49,6 +50,7 @@ func TestCliApplyGrantsForMultipleScopes(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), @@ -78,6 +80,7 @@ func TestCliApplyGrantsForMultipleScopes(t *testing.T) { roleId, err := boundary.CreateRoleCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("roles", "delete", "-id", roleId), diff --git a/testing/internal/e2e/tests/base/scope_permissions_test.go b/testing/internal/e2e/tests/base/scope_permissions_test.go index 9ad5f33b1..c2ea6b68f 100644 --- a/testing/internal/e2e/tests/base/scope_permissions_test.go +++ b/testing/internal/e2e/tests/base/scope_permissions_test.go @@ -24,7 +24,7 @@ func TestScopePermissions(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) // Create Org and 2 Projects @@ -46,6 +46,7 @@ func TestScopePermissions(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, testAccountName) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), @@ -57,6 +58,7 @@ func TestScopePermissions(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), @@ -108,6 +110,7 @@ func TestScopePermissions(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("roles", "remove-grants", "-id", loginGrantsRoleId, "-grant", "ids=*;type=scope;actions=list")) @@ -124,6 +127,7 @@ func TestScopePermissions(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("roles", "add-grants", "-id", authenticatedUserGrantsRoleId, "-grant", "ids=*;type=scope;actions=read"), diff --git a/testing/internal/e2e/tests/base/search_test.go b/testing/internal/e2e/tests/base/search_test.go index d5fbf0d37..06037184c 100644 --- a/testing/internal/e2e/tests/base/search_test.go +++ b/testing/internal/e2e/tests/base/search_test.go @@ -31,7 +31,7 @@ func TestCliSearch(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() // If cache is already running, stop it so that we can start it with a // shorter refresh interval @@ -50,6 +50,7 @@ func TestCliSearch(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("cache", "stop")) require.NoError(t, output.Err, string(output.Stderr)) }) diff --git a/testing/internal/e2e/tests/base/session_cancel_admin_test.go b/testing/internal/e2e/tests/base/session_cancel_admin_test.go index bdaa22a35..f567d6deb 100644 --- a/testing/internal/e2e/tests/base/session_cancel_admin_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_admin_test.go @@ -21,7 +21,7 @@ func TestCliSessionCancelAdmin(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/session_cancel_group_test.go b/testing/internal/e2e/tests/base/session_cancel_group_test.go index b49aff16b..63dfe7136 100644 --- a/testing/internal/e2e/tests/base/session_cancel_group_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_group_test.go @@ -34,7 +34,7 @@ func TestCliSessionCancelGroup(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -62,7 +62,8 @@ func TestCliSessionCancelGroup(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -71,7 +72,8 @@ func TestCliSessionCancelGroup(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) @@ -180,7 +182,7 @@ func TestApiCreateGroup(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() targetPort, err := strconv.ParseUint(c.TargetPort, 10, 32) require.NoError(t, err) @@ -188,6 +190,7 @@ func TestApiCreateGroup(t *testing.T) { orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err) @@ -211,6 +214,7 @@ func TestApiCreateGroup(t *testing.T) { accountId, _, err := boundary.CreateAccountApi(t, ctx, client, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() aClient := accounts.NewClient(client) _, err := aClient.Delete(ctx, accountId) require.NoError(t, err) @@ -218,6 +222,7 @@ func TestApiCreateGroup(t *testing.T) { userId, err := boundary.CreateUserApi(t, ctx, client, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() uClient := users.NewClient(client) _, err := uClient.Delete(ctx, userId) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/session_cancel_user_test.go b/testing/internal/e2e/tests/base/session_cancel_user_test.go index caee20f06..2316ed2e0 100644 --- a/testing/internal/e2e/tests/base/session_cancel_user_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_user_test.go @@ -33,7 +33,7 @@ func TestCliSessionCancelUser(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -61,7 +61,8 @@ func TestCliSessionCancelUser(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -70,7 +71,8 @@ func TestCliSessionCancelUser(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) @@ -173,7 +175,7 @@ func TestApiCreateUser(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() targetPort, err := strconv.ParseUint(c.TargetPort, 10, 32) require.NoError(t, err) @@ -181,6 +183,7 @@ func TestApiCreateUser(t *testing.T) { orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err) @@ -204,6 +207,7 @@ func TestApiCreateUser(t *testing.T) { accountId, _, err := boundary.CreateAccountApi(t, ctx, client, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() aClient := accounts.NewClient(client) _, err := aClient.Delete(ctx, accountId) require.NoError(t, err) @@ -211,6 +215,7 @@ func TestApiCreateUser(t *testing.T) { userId, err := boundary.CreateUserApi(t, ctx, client, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() uClient := users.NewClient(client) _, err := uClient.Delete(ctx, userId) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go index d0b796bdc..c713f787f 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go @@ -24,7 +24,7 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -52,7 +52,8 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -61,7 +62,8 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) diff --git a/testing/internal/e2e/tests/base/session_end_delete_host_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_test.go index 392edb5d3..9e2c1d486 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_host_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_host_test.go @@ -24,7 +24,7 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -52,7 +52,8 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -61,7 +62,8 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) diff --git a/testing/internal/e2e/tests/base/session_end_delete_project_test.go b/testing/internal/e2e/tests/base/session_end_delete_project_test.go index be21ff9d4..a4b4286a9 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_project_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_project_test.go @@ -25,7 +25,7 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -43,7 +43,8 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -52,7 +53,8 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) diff --git a/testing/internal/e2e/tests/base/session_end_delete_target_test.go b/testing/internal/e2e/tests/base/session_end_delete_target_test.go index 6546cf848..07573095d 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_target_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_target_test.go @@ -24,7 +24,7 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -52,7 +52,8 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -61,7 +62,8 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) diff --git a/testing/internal/e2e/tests/base/session_end_delete_user_test.go b/testing/internal/e2e/tests/base/session_end_delete_user_test.go index 92874d1b1..1fbfdfa99 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_user_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_user_test.go @@ -26,7 +26,7 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -54,7 +54,8 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -63,9 +64,10 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() if !userIsDeleted { t.Log("Deleting user...") - boundary.AuthenticateAdminCli(t, context.Background()) + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) diff --git a/testing/internal/e2e/tests/base/target_tcp_address_test.go b/testing/internal/e2e/tests/base/target_tcp_address_test.go index 34dfac187..e710f93b8 100644 --- a/testing/internal/e2e/tests/base/target_tcp_address_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_address_test.go @@ -23,7 +23,7 @@ func TestCliCreateUpdateTargetAddress(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -141,7 +141,7 @@ func TestCliTargetAddressToHostSource(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -267,7 +267,7 @@ func TestCliTargetHostSourceToAddress(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go index 29e299850..0d5f4b79b 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_authz_token_test.go @@ -27,7 +27,7 @@ func TestCliTcpTargetConnectTargetWithAuthzToken(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) 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 0575b207a..499ea2368 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 @@ -32,7 +32,7 @@ func TestCliTcpTargetConnectCassandra(t *testing.T) { // Increase timeout to accommodate Cassandra's longer startup duration due to gossip needing to settle pool.MaxWait = 90 * time.Second - ctx := context.Background() + ctx := t.Context() // e2e_cluster network is created by the e2e infra setup network, err := pool.NetworksByName("e2e_cluster") diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_connection_limits_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_connection_limits_test.go index 417953c7b..7a167d0c3 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_connection_limits_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_connection_limits_test.go @@ -25,7 +25,7 @@ func TestCliTcpTargetConnectTargetWithConnectionLimits(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_default_client_port_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_default_client_port_test.go index 4f8cf086f..1982d7c3e 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_default_client_port_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_default_client_port_test.go @@ -22,7 +22,7 @@ func TestCliTcpTargetConnectTargetWithTargetClientPort(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_exec_long_lasting_script_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_exec_long_lasting_script_test.go index e5f1d9a28..5c922ab1e 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_exec_long_lasting_script_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_exec_long_lasting_script_test.go @@ -24,7 +24,7 @@ func TestCliTcpTargetConnectExecLongLastingScript(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) // Create test organization diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_go_ssh_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_go_ssh_test.go index fb260b087..f304b9d3d 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_go_ssh_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_go_ssh_test.go @@ -23,7 +23,7 @@ func TestCliTcpTargetConnectGoSsh(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_http_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_http_test.go index 38b442dc0..d970658b0 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_http_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_http_test.go @@ -26,11 +26,12 @@ func TestCliTcpTargetConnectHttp(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("scopes", "delete", "-id", orgId)) require.NoError(t, output.Err, string(output.Stderr)) }) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_listen_port_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_listen_port_test.go index 05dc66b53..2664db8a1 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_listen_port_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_listen_port_test.go @@ -23,7 +23,7 @@ func TestCliTcpTargetConnectListenPort(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -84,7 +84,7 @@ func TestCliTcpTargetConnectDefaultClientPort(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_localhost_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_localhost_test.go index 7b26deab9..5c8137518 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_localhost_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_localhost_test.go @@ -23,7 +23,7 @@ func TestCliTcpTargetConnectTargetWithLocalhost(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) 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 d87e85d6d..25dcab6b4 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 @@ -24,7 +24,7 @@ import ( // target using `connect mongo` func TestCliTcpTargetConnectMongo(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() pool, err := dockertest.NewPool("") require.NoError(t, err) 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 9df285e33..a1bb36107 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 @@ -24,7 +24,7 @@ import ( // target using `connect mysql` func TestCliTcpTargetConnectMysql(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() pool, err := dockertest.NewPool("") require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_redis_password_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_redis_password_test.go index 03f56971c..e7d598f6b 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_redis_password_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_redis_password_test.go @@ -22,7 +22,7 @@ func TestCliTcpTargetConnectRedisPassword(t *testing.T) { e2e.MaybeSkipTest(t) // Setup - ctx := context.Background() + ctx := t.Context() redisInfo := infra.SetupRedisContainer(t) boundary.AuthenticateAdminCli(t, ctx) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_redis_username_password_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_redis_username_password_test.go index b76275b9b..c8ca3c9a2 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_redis_username_password_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_redis_username_password_test.go @@ -22,7 +22,7 @@ func TestCliTcpTargetConnectRedisUsernamePassword(t *testing.T) { e2e.MaybeSkipTest(t) // Setup - ctx := context.Background() + ctx := t.Context() redisInfo := infra.SetupRedisContainer(t) boundary.AuthenticateAdminCli(t, ctx) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_scp_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_scp_test.go index 2e3ec4e28..af7502893 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_scp_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_scp_test.go @@ -26,7 +26,7 @@ func TestCliTcpTargetConnectTargetAndScp(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_session_max_seconds_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_session_max_seconds_test.go index 7fb60168b..8f31faf2d 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_session_max_seconds_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_session_max_seconds_test.go @@ -23,7 +23,7 @@ func TestCliTcpTargetConnectTargetWithSessionMaxSecondsTearDown(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -97,7 +97,7 @@ func TestCliTcpTargetConnectTargetWithSessionMaxSecondsRejectNew(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go index 0ac14c41b..b7a4ecff0 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_ssh_test.go @@ -24,7 +24,7 @@ func TestCliTcpTargetConnectTargetWithSsh(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_test.go index b5a9af4fa..a8cf811d3 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_test.go @@ -23,7 +23,7 @@ func TestCliTcpTargetConnectTargetBasic(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -81,7 +81,7 @@ func TestCliTcpTargetConnectTargetViaTargetAndScopeNames(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/version_test.go b/testing/internal/e2e/tests/base/version_test.go index 75f577fa8..71e2bba1e 100644 --- a/testing/internal/e2e/tests/base/version_test.go +++ b/testing/internal/e2e/tests/base/version_test.go @@ -4,7 +4,6 @@ package base_test import ( - "context" "encoding/json" "strconv" "strings" @@ -20,7 +19,7 @@ import ( func TestCliVersion(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("version", "-format", "json")) require.NoError(t, output.Err, string(output.Stderr)) diff --git a/testing/internal/e2e/tests/base_plus/auth_method_ldap_test.go b/testing/internal/e2e/tests/base_plus/auth_method_ldap_test.go index 40fb20454..589dbe213 100644 --- a/testing/internal/e2e/tests/base_plus/auth_method_ldap_test.go +++ b/testing/internal/e2e/tests/base_plus/auth_method_ldap_test.go @@ -26,7 +26,7 @@ func TestCliLdap(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base_plus/authenticate_no_keyring_test.go b/testing/internal/e2e/tests/base_plus/authenticate_no_keyring_test.go index ff9b1085a..e4e9f0fb1 100644 --- a/testing/internal/e2e/tests/base_plus/authenticate_no_keyring_test.go +++ b/testing/internal/e2e/tests/base_plus/authenticate_no_keyring_test.go @@ -5,7 +5,6 @@ package base_plus_test import ( "bytes" - "context" "encoding/json" "fmt" "io" @@ -27,7 +26,7 @@ import ( // daemon tried to access the keyring when there wasn't one on the system. func TestCliAuthenticateNoKeyring(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() bc, err := boundary.LoadConfig() require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base_plus/key_destruction_test.go b/testing/internal/e2e/tests/base_plus/key_destruction_test.go index deff204cb..4e676d543 100644 --- a/testing/internal/e2e/tests/base_plus/key_destruction_test.go +++ b/testing/internal/e2e/tests/base_plus/key_destruction_test.go @@ -22,7 +22,7 @@ import ( func TestCliKeyDestruction(t *testing.T) { e2e.MaybeSkipTest(t) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) t.Log("Creating scope...") @@ -38,6 +38,7 @@ func TestCliKeyDestruction(t *testing.T) { var scopeReply scopes.ScopeCreateResult require.NoError(t, json.Unmarshal(output.Stdout, &scopeReply)) t.Cleanup(func() { + ctx := context.Background() output = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( "scopes", "delete", @@ -81,6 +82,7 @@ func TestCliKeyDestruction(t *testing.T) { var amReply authmethods.AuthMethodCreateResult require.NoError(t, json.Unmarshal(output.Stdout, &amReply)) t.Cleanup(func() { + ctx := context.Background() output = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( "auth-methods", "delete", @@ -244,7 +246,7 @@ func TestApiKeyDestruction(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sc := scopes.NewClient(client) t.Log("Creating scope...") diff --git a/testing/internal/e2e/tests/base_plus/rate_limit_test.go b/testing/internal/e2e/tests/base_plus/rate_limit_test.go index 009e97ddc..5d1110288 100644 --- a/testing/internal/e2e/tests/base_plus/rate_limit_test.go +++ b/testing/internal/e2e/tests/base_plus/rate_limit_test.go @@ -31,7 +31,7 @@ func TestHttpRateLimit(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -168,7 +168,8 @@ func TestHttpRateLimit(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -177,7 +178,8 @@ func TestHttpRateLimit(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) @@ -303,7 +305,7 @@ func TestCliRateLimit(t *testing.T) { bc, err := boundary.LoadConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) @@ -326,7 +328,8 @@ func TestCliRateLimit(t *testing.T) { accountId, acctPassword, err := boundary.CreateAccountCli(t, ctx, bc.AuthMethodId, acctName) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("accounts", "delete", "-id", accountId), ) @@ -335,7 +338,8 @@ func TestCliRateLimit(t *testing.T) { userId, err := boundary.CreateUserCli(t, ctx, "global") require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", userId), ) 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 79b34b09c..f89d6b7ba 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 @@ -25,7 +25,7 @@ func TestCliTcpTargetConnectPostgres(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base_with_vault/auth_method_oidc_vault_test.go b/testing/internal/e2e/tests/base_with_vault/auth_method_oidc_vault_test.go index cb17b1d81..66a18b605 100644 --- a/testing/internal/e2e/tests/base_with_vault/auth_method_oidc_vault_test.go +++ b/testing/internal/e2e/tests/base_with_vault/auth_method_oidc_vault_test.go @@ -31,7 +31,7 @@ func TestAuthMethodOidcVault(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() t.Log("Setting up Vault OIDC provider...") // Configure vault authentication: Enable the userpass auth method at the @@ -39,6 +39,7 @@ func TestAuthMethodOidcVault(t *testing.T) { output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("auth", "enable", "userpass")) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("auth", "disable", "userpass")) require.NoError(t, output.Err, string(output.Stderr)) }) @@ -56,6 +57,7 @@ func TestAuthMethodOidcVault(t *testing.T) { require.NoError(t, err) authPolicyName := vault.WritePolicy(t, ctx, authPolicyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", authPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_vault/credential_library_vault_ldap_test.go b/testing/internal/e2e/tests/base_with_vault/credential_library_vault_ldap_test.go index 205e4bec4..c993ad6a7 100644 --- a/testing/internal/e2e/tests/base_with_vault/credential_library_vault_ldap_test.go +++ b/testing/internal/e2e/tests/base_with_vault/credential_library_vault_ldap_test.go @@ -67,7 +67,8 @@ func TestApiVaultLdapCredentialLibrary(t *testing.T) { // Configure Vault for LDAP. boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { - output := e2e.RunCommand(context.Background(), "vault", + ctx := context.Background() + output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) require.NoError(t, output.Err, string(output.Stderr)) @@ -78,13 +79,14 @@ func TestApiVaultLdapCredentialLibrary(t *testing.T) { c.LdapDomainDn, c.LdapUserName, c.LdapGroupName, ) t.Cleanup(func() { + ctx := context.Background() // Destroy LDAP secrets engine and LDAP policy. - output := e2e.RunCommand(context.Background(), "vault", + output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultLdapPath), ) require.NoError(t, output.Err, string(output.Stderr)) - output = e2e.RunCommand(context.Background(), "vault", + output = e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", ldapPolicyName), ) require.NoError(t, output.Err, string(output.Stderr)) @@ -215,8 +217,9 @@ func TestCliVaultLdapCredentialLibrary(t *testing.T) { orgId, err := boundary.CreateOrgCli(t, t.Context()) require.NoError(t, err) t.Cleanup(func() { - boundary.AuthenticateAdminCli(t, context.Background()) - output := e2e.RunCommand(context.Background(), "boundary", e2e.WithArgs("scopes", "delete", "-id", orgId)) + ctx := context.Background() + boundary.AuthenticateAdminCli(t, ctx) + output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("scopes", "delete", "-id", orgId)) require.NoError(t, output.Err, string(output.Stderr)) }) @@ -238,7 +241,8 @@ func TestCliVaultLdapCredentialLibrary(t *testing.T) { // Configure Vault for LDAP. boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { - output := e2e.RunCommand(context.Background(), "vault", + ctx := context.Background() + output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) require.NoError(t, output.Err, string(output.Stderr)) @@ -249,13 +253,14 @@ func TestCliVaultLdapCredentialLibrary(t *testing.T) { c.LdapDomainDn, c.LdapUserName, c.LdapGroupName, ) t.Cleanup(func() { + ctx := context.Background() // Destroy LDAP secrets engine and LDAP policy. - output := e2e.RunCommand(context.Background(), "vault", + output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultLdapPath), ) require.NoError(t, output.Err, string(output.Stderr)) - output = e2e.RunCommand(context.Background(), "vault", + output = e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", ldapPolicyName), ) require.NoError(t, output.Err, string(output.Stderr)) diff --git a/testing/internal/e2e/tests/base_with_vault/credential_store_test.go b/testing/internal/e2e/tests/base_with_vault/credential_store_test.go index dd934b350..9018fbbbb 100644 --- a/testing/internal/e2e/tests/base_with_vault/credential_store_test.go +++ b/testing/internal/e2e/tests/base_with_vault/credential_store_test.go @@ -29,7 +29,7 @@ func TestCliVaultCredentialStore(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -57,6 +57,7 @@ func TestCliVaultCredentialStore(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -68,6 +69,7 @@ func TestCliVaultCredentialStore(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -77,6 +79,7 @@ func TestCliVaultCredentialStore(t *testing.T) { // Create credentials in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) @@ -85,6 +88,7 @@ func TestCliVaultCredentialStore(t *testing.T) { passwordSecretName, passwordPolicyName, password := vault.CreateKvPasswordCredential(t, c.VaultSecretPath, c.TargetSshUser) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", passwordPolicyName), ) @@ -93,6 +97,7 @@ func TestCliVaultCredentialStore(t *testing.T) { domainSecretName, domainPolicyName, domainPassword := vault.CreateKvPasswordDomainCredential(t, c.VaultSecretPath, c.TargetSshUser, "domain.com") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", domainPolicyName), ) @@ -230,7 +235,7 @@ func TestApiVaultCredentialStore(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() targetPort, err := strconv.ParseUint(c.TargetPort, 10, 32) require.NoError(t, err) @@ -238,6 +243,7 @@ func TestApiVaultCredentialStore(t *testing.T) { orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err) @@ -264,6 +270,7 @@ func TestApiVaultCredentialStore(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -273,6 +280,7 @@ func TestApiVaultCredentialStore(t *testing.T) { // Create credentials in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) @@ -281,6 +289,7 @@ func TestApiVaultCredentialStore(t *testing.T) { passwordSecretName, passwordPolicyName, password := vault.CreateKvPasswordCredential(t, c.VaultSecretPath, c.TargetSshUser) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", passwordPolicyName), ) @@ -289,6 +298,7 @@ func TestApiVaultCredentialStore(t *testing.T) { domainSecretName, domainPolicyName, domainPassword := vault.CreateKvPasswordDomainCredential(t, c.VaultSecretPath, c.TargetSshUser, "domain.com") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", domainPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_vault/paginate_credential_library_test.go b/testing/internal/e2e/tests/base_with_vault/paginate_credential_library_test.go index 600c07f6f..27698bdad 100644 --- a/testing/internal/e2e/tests/base_with_vault/paginate_credential_library_test.go +++ b/testing/internal/e2e/tests/base_with_vault/paginate_credential_library_test.go @@ -27,7 +27,7 @@ func TestCliPaginateCredentialLibraries(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -43,6 +43,7 @@ func TestCliPaginateCredentialLibraries(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -54,6 +55,7 @@ func TestCliPaginateCredentialLibraries(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -63,6 +65,7 @@ func TestCliPaginateCredentialLibraries(t *testing.T) { // Create credentials in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) @@ -179,7 +182,7 @@ func TestApiPaginateCredentialLibraries(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() sClient := scopes.NewClient(client) cClient := credentiallibraries.NewClient(client) orgId, err := boundary.CreateOrgApi(t, ctx, client) @@ -195,6 +198,7 @@ func TestApiPaginateCredentialLibraries(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -206,6 +210,7 @@ func TestApiPaginateCredentialLibraries(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -215,6 +220,7 @@ func TestApiPaginateCredentialLibraries(t *testing.T) { // Create credentials in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_authz_token_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_authz_token_test.go index a2fa24d57..f920ca8e5 100644 --- a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_authz_token_test.go +++ b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_authz_token_test.go @@ -27,7 +27,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithAuthzToken(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -55,6 +55,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithAuthzToken(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -66,6 +67,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithAuthzToken(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -75,6 +77,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithAuthzToken(t *testing.T) { // Create credential in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_ssh_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_ssh_test.go index becbef74f..65eb2b7b6 100644 --- a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_ssh_test.go +++ b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_ssh_test.go @@ -27,7 +27,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithSsh(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -55,6 +55,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithSsh(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -66,6 +67,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithSsh(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -75,6 +77,7 @@ func TestCliTcpTargetVaultGenericConnectTargetWithSsh(t *testing.T) { // Create credential in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_test.go b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_test.go index 62a828d75..a67ba8601 100644 --- a/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_test.go +++ b/testing/internal/e2e/tests/base_with_vault/target_tcp_vault_generic_connect_test.go @@ -28,7 +28,7 @@ func TestCliTcpTargetVaultGenericConnectTarget(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -56,6 +56,7 @@ func TestCliTcpTargetVaultGenericConnectTarget(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -67,6 +68,7 @@ func TestCliTcpTargetVaultGenericConnectTarget(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -76,6 +78,7 @@ func TestCliTcpTargetVaultGenericConnectTarget(t *testing.T) { // Create credential in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) diff --git a/testing/internal/e2e/tests/base_with_worker/target_tcp_worker_connect_ssh_test.go b/testing/internal/e2e/tests/base_with_worker/target_tcp_worker_connect_ssh_test.go index 2c3e04d09..e061e34bc 100644 --- a/testing/internal/e2e/tests/base_with_worker/target_tcp_worker_connect_ssh_test.go +++ b/testing/internal/e2e/tests/base_with_worker/target_tcp_worker_connect_ssh_test.go @@ -35,7 +35,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -51,6 +51,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { // Configure vault boundaryPolicyName := vault.SetupForBoundaryController(t, "testdata/boundary-controller-policy.hcl") t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", boundaryPolicyName), ) @@ -62,6 +63,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("secrets", "disable", c.VaultSecretPath), ) @@ -71,6 +73,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { // Create credential in vault privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) @@ -221,6 +224,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() _ = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( "workers", "remove-worker-tags", @@ -276,6 +280,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() _ = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( "workers", "remove-worker-tags", @@ -373,6 +378,7 @@ func TestCliTcpTargetWorkerConnectTarget(t *testing.T) { ) require.NoError(t, output.Err, string(output.Stderr)) t.Cleanup(func() { + ctx := context.Background() _ = e2e.RunCommand(ctx, "boundary", e2e.WithArgs( "workers", "remove-worker-tags", diff --git a/testing/internal/e2e/tests/database/migration_test.go b/testing/internal/e2e/tests/database/migration_test.go index 7bb131943..34a725c7a 100644 --- a/testing/internal/e2e/tests/database/migration_test.go +++ b/testing/internal/e2e/tests/database/migration_test.go @@ -45,7 +45,7 @@ func TestDatabaseMigration(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundaryRepo := "hashicorp/boundary" boundaryTag := "latest" @@ -291,6 +291,7 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T privateKeySecretName, privateKeyPolicyName := vault.CreateKvPrivateKeyCredential(t, c.VaultSecretPath, c.TargetSshUser, c.TargetSshKeyPath) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", privateKeyPolicyName), ) @@ -299,6 +300,7 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T passwordSecretName, passwordPolicyName, _ := vault.CreateKvPasswordCredential(t, c.VaultSecretPath, c.TargetSshUser) t.Cleanup(func() { + ctx := context.Background() output := e2e.RunCommand(ctx, "vault", e2e.WithArgs("policy", "delete", passwordPolicyName), ) diff --git a/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_empty_test.go b/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_empty_test.go index 500e9811c..f488e5521 100644 --- a/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_empty_test.go +++ b/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_empty_test.go @@ -27,7 +27,7 @@ func TestCliCreateGcpDynamicHostCatalogWithEmptyHostSet(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_test.go b/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_test.go index b2e1f4257..a584184b6 100644 --- a/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_test.go +++ b/testing/internal/e2e/tests/gcp/dynamichostcatalog_host_set_test.go @@ -32,7 +32,7 @@ func TestCliCreateGcpDynamicHostCatalogWithHostSet(t *testing.T) { c, err := loadTestConfig() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() boundary.AuthenticateAdminCli(t, ctx) orgId, err := boundary.CreateOrgCli(t, ctx) require.NoError(t, err) @@ -178,11 +178,12 @@ func TestApiCreateGCPDynamicHostCatalog(t *testing.T) { client, err := boundary.NewApiClient() require.NoError(t, err) - ctx := context.Background() + ctx := t.Context() orgId, err := boundary.CreateOrgApi(t, ctx, client) require.NoError(t, err) t.Cleanup(func() { + ctx := context.Background() scopeClient := scopes.NewClient(client) _, err := scopeClient.Delete(ctx, orgId) require.NoError(t, err)