feat!: drop support for cypress v1alpha (#925)

saucelabs · Jul 15, 2024 · 9b173b0 · 9b173b0
1 parent e3a6079
commit 9b173b0
Show file tree

Hide file tree

Showing 9 changed files with 328 additions and 2,054 deletions.
diff --git a/api/global.schema.json b/api/global.schema.json
@@ -19,21 +19,6 @@
     }
   },
   "allOf": [
-    {
-      "if": {
-        "properties": {
-          "kind": {
-            "const": "cypress"
-          },
-          "apiVersion": {
-            "const": "v1alpha"
-          }
-        }
-      },
-      "then": {
-        "$ref": "v1alpha/framework/cypress.schema.json"
-      }
-    },
     {
       "if": {
         "properties": {

diff --git a/api/saucectl.schema.json b/api/saucectl.schema.json
diff --git a/api/v1alpha/framework/cypress.schema.json b/api/v1alpha/framework/cypress.schema.json
diff --git a/internal/cmd/ini/cypress.go b/internal/cmd/ini/cypress.go
@@ -5,15 +5,12 @@ import (
 	_ "embed"
 	"fmt"
 	"os"
-	"strconv"
-	"strings"
 
 	"github.com/rs/zerolog/log"
 	cmds "github.com/saucelabs/saucectl/internal/cmd"
 	"github.com/saucelabs/saucectl/internal/config"
 	"github.com/saucelabs/saucectl/internal/cypress"
 	v1 "github.com/saucelabs/saucectl/internal/cypress/v1"
-	"github.com/saucelabs/saucectl/internal/cypress/v1alpha"
 	"github.com/saucelabs/saucectl/internal/segment"
 	"github.com/saucelabs/saucectl/internal/usage"
 	"github.com/spf13/cobra"
@@ -59,47 +56,6 @@ func CypressCmd() *cobra.Command {
 }
 
 func configureCypress(cfg *initConfig) interface{} {
-	versions := strings.Split(cfg.frameworkVersion, ".")
-	version, err := strconv.Atoi(versions[0])
-	if err != nil {
-		log.Err(err).Msg("failed to parse framework version")
-	}
-	if version < 10 {
-		return v1alpha.Project{
-			TypeDef: config.TypeDef{
-				APIVersion: v1alpha.APIVersion,
-				Kind:       cypress.Kind,
-			},
-			Sauce: config.SauceConfig{
-				Region:      cfg.region,
-				Sauceignore: ".sauceignore",
-				Concurrency: cfg.concurrency,
-			},
-			RootDir: ".",
-			Cypress: v1alpha.Cypress{
-				Version:    cfg.frameworkVersion,
-				ConfigFile: cfg.cypressConfigFile,
-			},
-			Suites: []v1alpha.Suite{
-				{
-					Name:         fmt.Sprintf("cypress - %s - %s", cfg.platformName, cfg.browserName),
-					PlatformName: cfg.platformName,
-					Browser:      cfg.browserName,
-					Config: v1alpha.SuiteConfig{
-						TestFiles: []string{"**/*.*"},
-					},
-				},
-			},
-			Artifacts: config.Artifacts{
-				Download: config.ArtifactDownload{
-					When:      cfg.artifactWhen,
-					Directory: "./artifacts",
-					Match:     []string{"*"},
-				},
-			},
-		}
-	}
-
 	return v1.Project{
 		TypeDef: config.TypeDef{
 			APIVersion: v1.APIVersion,

diff --git a/internal/cypress/config.go b/internal/cypress/config.go
@@ -1,10 +1,11 @@
 package cypress
 
 import (
+	"errors"
+
 	"github.com/saucelabs/saucectl/internal/config"
 	"github.com/saucelabs/saucectl/internal/cypress/suite"
 	v1 "github.com/saucelabs/saucectl/internal/cypress/v1"
-	"github.com/saucelabs/saucectl/internal/cypress/v1alpha"
 	"github.com/saucelabs/saucectl/internal/saucereport"
 )
 
@@ -67,8 +68,8 @@ func FromFile(cfgPath string) (Project, error) {
 	if err != nil {
 		return nil, err
 	}
-	if version == v1alpha.APIVersion {
-		return v1alpha.FromFile(cfgPath)
+	if version == "v1alpha" {
+		return nil, errors.New("cypress v1alpha is no longer supported")
 	}
 	return v1.FromFile(cfgPath)
 }