diff --git a/lib/autoupdate/agent/setup_test.go b/lib/autoupdate/agent/setup_test.go index 97f224c985206..a79546c104bd9 100644 --- a/lib/autoupdate/agent/setup_test.go +++ b/lib/autoupdate/agent/setup_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestNewNamespace(t *testing.T) { diff --git a/lib/autoupdate/agent/updater_test.go b/lib/autoupdate/agent/updater_test.go index c52117ea44985..d8981eb59fa17 100644 --- a/lib/autoupdate/agent/updater_test.go +++ b/lib/autoupdate/agent/updater_test.go @@ -36,7 +36,7 @@ import ( "gopkg.in/yaml.v3" "github.com/gravitational/teleport/api/client/webclient" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestUpdater_Disable(t *testing.T) { diff --git a/lib/client/db/postgres/repl/repl_test.go b/lib/client/db/postgres/repl/repl_test.go index 0aa03b84c8023..b349bbdb447c5 100644 --- a/lib/client/db/postgres/repl/repl_test.go +++ b/lib/client/db/postgres/repl/repl_test.go @@ -34,7 +34,7 @@ import ( clientproto "github.com/gravitational/teleport/api/client/proto" "github.com/gravitational/teleport/lib/client/db/postgres/repl/testdata" dbrepl "github.com/gravitational/teleport/lib/client/db/repl" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestStart(t *testing.T) { diff --git a/lib/config/openssh/openssh_test.go b/lib/config/openssh/openssh_test.go index 73eca420849d3..c040070adfa85 100644 --- a/lib/config/openssh/openssh_test.go +++ b/lib/config/openssh/openssh_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestWriteSSHConfig(t *testing.T) { diff --git a/lib/config/systemd_test.go b/lib/config/systemd_test.go index 193581512ad60..8283a861147f1 100644 --- a/lib/config/systemd_test.go +++ b/lib/config/systemd_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestWriteSystemdUnitFile(t *testing.T) { diff --git a/lib/integrations/awsoidc/access_graph_aws_sync_test.go b/lib/integrations/awsoidc/access_graph_aws_sync_test.go index 8902c4b63df29..080d1c0475f3d 100644 --- a/lib/integrations/awsoidc/access_graph_aws_sync_test.go +++ b/lib/integrations/awsoidc/access_graph_aws_sync_test.go @@ -29,7 +29,7 @@ import ( iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestAccessGraphIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/aws_app_access_iam_config_test.go b/lib/integrations/awsoidc/aws_app_access_iam_config_test.go index 9933b0d86150b..b2140be2d8bff 100644 --- a/lib/integrations/awsoidc/aws_app_access_iam_config_test.go +++ b/lib/integrations/awsoidc/aws_app_access_iam_config_test.go @@ -29,7 +29,7 @@ import ( iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestAWSAppAccessConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/deployservice_iam_config_test.go b/lib/integrations/awsoidc/deployservice_iam_config_test.go index 21ce13bb1873a..48d33af097f0c 100644 --- a/lib/integrations/awsoidc/deployservice_iam_config_test.go +++ b/lib/integrations/awsoidc/deployservice_iam_config_test.go @@ -32,7 +32,7 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport/lib/integrations/awsoidc/tags" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) var badParameterCheck = func(t require.TestingT, err error, msgAndArgs ...interface{}) { diff --git a/lib/integrations/awsoidc/ec2_ssm_iam_config_test.go b/lib/integrations/awsoidc/ec2_ssm_iam_config_test.go index 7b08c4e45dbec..2dd1612992a48 100644 --- a/lib/integrations/awsoidc/ec2_ssm_iam_config_test.go +++ b/lib/integrations/awsoidc/ec2_ssm_iam_config_test.go @@ -32,7 +32,7 @@ import ( ssmtypes "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestEC2SSMIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/eice_iam_config_test.go b/lib/integrations/awsoidc/eice_iam_config_test.go index 71efcf6dc03fc..db7bc840f7e5d 100644 --- a/lib/integrations/awsoidc/eice_iam_config_test.go +++ b/lib/integrations/awsoidc/eice_iam_config_test.go @@ -29,7 +29,7 @@ import ( iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestEICEIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/eks_iam_config_test.go b/lib/integrations/awsoidc/eks_iam_config_test.go index c0e6a7022eb50..83b2063ef4eef 100644 --- a/lib/integrations/awsoidc/eks_iam_config_test.go +++ b/lib/integrations/awsoidc/eks_iam_config_test.go @@ -29,7 +29,7 @@ import ( iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestEKSIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/idp_iam_config_test.go b/lib/integrations/awsoidc/idp_iam_config_test.go index 7961fc8255232..50057b2bff77f 100644 --- a/lib/integrations/awsoidc/idp_iam_config_test.go +++ b/lib/integrations/awsoidc/idp_iam_config_test.go @@ -37,7 +37,7 @@ import ( "github.com/gravitational/teleport/lib" awslib "github.com/gravitational/teleport/lib/cloud/aws" "github.com/gravitational/teleport/lib/integrations/awsoidc/tags" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestIdPIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/integrations/awsoidc/listdatabases_iam_config_test.go b/lib/integrations/awsoidc/listdatabases_iam_config_test.go index 08585451fa8a8..602584b43f08e 100644 --- a/lib/integrations/awsoidc/listdatabases_iam_config_test.go +++ b/lib/integrations/awsoidc/listdatabases_iam_config_test.go @@ -29,7 +29,7 @@ import ( iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestListDatabasesIAMConfigReqDefaults(t *testing.T) { diff --git a/lib/tbot/config/config_test.go b/lib/tbot/config/config_test.go index 9769b89253005..20d8449a997d4 100644 --- a/lib/tbot/config/config_test.go +++ b/lib/tbot/config/config_test.go @@ -32,7 +32,7 @@ import ( "github.com/gravitational/teleport/lib/tbot/bot" "github.com/gravitational/teleport/lib/tbot/botfs" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestConfigFile(t *testing.T) { diff --git a/lib/tbot/service_identity_output_test.go b/lib/tbot/service_identity_output_test.go index 00b490ea6caad..cf49af30b73ac 100644 --- a/lib/tbot/service_identity_output_test.go +++ b/lib/tbot/service_identity_output_test.go @@ -37,7 +37,7 @@ import ( "github.com/gravitational/teleport/lib/tbot/config" "github.com/gravitational/teleport/lib/tbot/ssh" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) const ( diff --git a/lib/tbot/service_kubernetes_output_test.go b/lib/tbot/service_kubernetes_output_test.go index 4d490359811e4..36ce0b15327b8 100644 --- a/lib/tbot/service_kubernetes_output_test.go +++ b/lib/tbot/service_kubernetes_output_test.go @@ -36,7 +36,7 @@ import ( "github.com/gravitational/teleport/lib/tbot/config" "github.com/gravitational/teleport/lib/tbot/identity" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) // Fairly ugly hardcoded certs to use in the generation so that the tests are diff --git a/lib/tbot/service_spiffe_workload_api_sds_test.go b/lib/tbot/service_spiffe_workload_api_sds_test.go index bbe6d2af32edb..7c59b5e09b949 100644 --- a/lib/tbot/service_spiffe_workload_api_sds_test.go +++ b/lib/tbot/service_spiffe_workload_api_sds_test.go @@ -53,7 +53,7 @@ import ( "github.com/gravitational/teleport/lib/tbot/spiffe" "github.com/gravitational/teleport/lib/tbot/spiffe/workloadattest" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" "github.com/gravitational/teleport/tool/teleport/testenv" ) diff --git a/lib/tpm/tpm_test.go b/lib/tpm/tpm_test.go index e95ea18612518..8ff04b701409d 100644 --- a/lib/tpm/tpm_test.go +++ b/lib/tpm/tpm_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/gravitational/teleport/lib/tpm" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestPrintQuery(t *testing.T) { diff --git a/lib/utils/golden/golden.go b/lib/utils/testutils/golden/golden.go similarity index 100% rename from lib/utils/golden/golden.go rename to lib/utils/testutils/golden/golden.go diff --git a/tool/tbot/main_test.go b/tool/tbot/main_test.go index d45118d95c298..2d00c6ec7c804 100644 --- a/tool/tbot/main_test.go +++ b/tool/tbot/main_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestRun_Configure(t *testing.T) { diff --git a/tool/tbot/systemd_test.go b/tool/tbot/systemd_test.go index 10705aeaa44df..248a696636a8f 100644 --- a/tool/tbot/systemd_test.go +++ b/tool/tbot/systemd_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" ) func TestInstallSystemdCmd(t *testing.T) { diff --git a/tool/tctl/common/workload_identity_test.go b/tool/tctl/common/workload_identity_test.go index 818ec2cb1d8f4..92c8c9006ba24 100644 --- a/tool/tctl/common/workload_identity_test.go +++ b/tool/tctl/common/workload_identity_test.go @@ -34,7 +34,7 @@ import ( "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/authclient" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/golden" + "github.com/gravitational/teleport/lib/utils/testutils/golden" "github.com/gravitational/teleport/tool/teleport/testenv" )