diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d4b4531b4..dd9e520cca 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -336,7 +336,6 @@ jobs: INTEGRATION_TEST_USERNAME: ${{ secrets.INTEGRATION_TEST_USERNAME }} INTEGRATION_TEST_PASSWORD: ${{ secrets.INTEGRATION_TEST_PASSWORD }} INTEGRATION_TEST_TOKEN: ${{ secrets.INTEGRATION_TEST_TOKEN }} - PLATFORM_API_TOKEN: ${{ secrets.PLATFORM_API_TOKEN }} - # === Check if Unit Tests Failed === name: Check if Unit Tests Failed diff --git a/internal/testhelpers/e2e/clean.go b/internal/testhelpers/e2e/clean.go index 7a8cd9246f..273f6d50eb 100644 --- a/internal/testhelpers/e2e/clean.go +++ b/internal/testhelpers/e2e/clean.go @@ -1,31 +1,12 @@ package e2e import ( - "testing" - "github.com/ActiveState/cli/internal/errs" "github.com/ActiveState/cli/pkg/platform/api/mono/mono_client/projects" - "github.com/ActiveState/cli/pkg/platform/api/mono/mono_client/users" "github.com/ActiveState/cli/pkg/platform/api/mono/mono_models" "github.com/ActiveState/cli/pkg/platform/authentication" - "github.com/ActiveState/cli/pkg/platform/model" ) -func cleanUser(t *testing.T, username string, auth *authentication.Auth) error { - projects, err := getProjects(username, auth) - if err != nil { - return err - } - for _, proj := range projects { - err = model.DeleteProject(username, proj.Name, auth) - if err != nil { - return err - } - } - - return deleteUser(username, auth) -} - func getProjects(org string, auth *authentication.Auth) ([]*mono_models.Project, error) { authClient, err := auth.Client() if err != nil { @@ -40,20 +21,3 @@ func getProjects(org string, auth *authentication.Auth) ([]*mono_models.Project, return listProjectsOK.Payload, nil } - -func deleteUser(name string, auth *authentication.Auth) error { - authClient, err := auth.Client() - if err != nil { - return errs.Wrap(err, "Could not get auth client") - } - - params := users.NewDeleteUserParams() - params.SetUsername(name) - - _, err = authClient.Users.DeleteUser(params, auth.ClientAuth()) - if err != nil { - return err - } - - return nil -} diff --git a/internal/testhelpers/e2e/session.go b/internal/testhelpers/e2e/session.go index 56ddc8647e..5fd76e798f 100644 --- a/internal/testhelpers/e2e/session.go +++ b/internal/testhelpers/e2e/session.go @@ -56,8 +56,6 @@ type Session struct { Env []string retainDirs bool createdProjects []*project.Namespaced - // users created during session - users []string T *testing.T Exe string SvcExe string @@ -542,11 +540,6 @@ func (s *Session) Close() error { s.spawned = []*SpawnedCmd{} - if os.Getenv("PLATFORM_API_TOKEN") == "" { - s.T.Log("PLATFORM_API_TOKEN env var not set, not running suite tear down") - return nil - } - auth := authentication.New(cfg) if os.Getenv(constants.APIHostEnvVarName) == "" { @@ -560,9 +553,11 @@ func (s *Session) Close() error { } err = auth.AuthenticateWithModel(&mono_models.Credentials{ - Token: os.Getenv("PLATFORM_API_TOKEN"), + Username: PersistentUsername, + Password: PersistentPassword, }) if err != nil { + s.T.Errorf("Could not login: %v", errs.JoinMessage(err)) return err } @@ -586,14 +581,7 @@ func (s *Session) Close() error { for _, proj := range s.createdProjects { err := model.DeleteProject(proj.Owner, proj.Project, auth) if err != nil { - s.T.Errorf("Could not delete project %s: %v", proj.Project, errs.JoinMessage(err)) - } - } - - for _, user := range s.users { - err := cleanUser(s.T, user, auth) - if err != nil { - s.T.Errorf("Could not delete user %s: %v", user, errs.JoinMessage(err)) + s.T.Errorf("Could not delete project %s/%s: %v", proj.Owner, proj.Project, errs.JoinMessage(err)) } }