rename _script to _test part2

cmd/kubectl-testkube/commands/scripts/common.go

@@ -122,15 +122,15 @@ func newContentFromFlags(cmd *cobra.Command) (content *testkube.TestContent, err
 	// detect content type (git-file need to be everrided manually as we don't)
 	// TODO handle git-file somehow
 	if gitUri != "" && scriptContentType == "" {
-		scriptContentType = string(testkube.ScriptContentTypeGitDir)
+		scriptContentType = string(testkube.TestContentTypeGitDir)
 	}
 
 	if uri != "" && scriptContentType == "" {
-		scriptContentType = string(testkube.ScriptContentTypeFileURI)
+		scriptContentType = string(testkube.TestContentTypeFileURI)
 	}
 
 	if len(fileContent) > 0 {
-		scriptContentType = string(testkube.ScriptContentTypeString)
+		scriptContentType = string(testkube.TestContentTypeString)
 	}
 
 	var repository *testkube.Repository

pkg/api/v1/client/direct_test.go

@@ -93,7 +93,7 @@ func TestScriptsAPI(t *testing.T) {
 
 		// when
 		response, err := client.CreateScript(UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent("{}"),
+			Content: testkube.NewStringTestContent("{}"),
 			Name:    "t1",
 			Type_:   "postman/collection",
 		})

pkg/api/v1/testkube/model_test_content_extended.go

@@ -3,34 +3,34 @@ package testkube
 
 import "fmt"
 
-type ScriptContentType string
+type TestContentType string
 
 const (
-	ScriptContentTypeString  ScriptContentType = "string"
-	ScriptContentTypeFileURI ScriptContentType = "file-uri"
-	ScriptContentTypeGitFile ScriptContentType = "git-file"
-	ScriptContentTypeGitDir  ScriptContentType = "git-dir"
+	TestContentTypeString  TestContentType = "string"
+	TestContentTypeFileURI TestContentType = "file-uri"
+	TestContentTypeGitFile TestContentType = "git-file"
+	TestContentTypeGitDir  TestContentType = "git-dir"
 )
 
-var ErrScriptContentTypeNotFile = fmt.Errorf("unsupported content type use one of: file-uri, git-file, string")
-var ErrScriptContentTypeNotDir = fmt.Errorf("unsupported content type use one of: git-dir")
+var ErrTestContentTypeNotFile = fmt.Errorf("unsupported content type use one of: file-uri, git-file, string")
+var ErrTestContentTypeNotDir = fmt.Errorf("unsupported content type use one of: git-dir")
 
-func NewStringScriptContent(str string) *TestContent {
+func NewStringTestContent(str string) *TestContent {
 	return &TestContent{
-		Type_: string(ScriptContentTypeString),
+		Type_: string(TestContentTypeString),
 		Data:  str,
 	}
 }
 
 // IsDir - for content fetched as dir
 func (c *TestContent) IsDir() bool {
-	return ScriptContentType(c.Type_) == ScriptContentTypeGitDir
+	return TestContentType(c.Type_) == TestContentTypeGitDir
 
 }
 
 // IsFile - for content fetched as file
 func (c *TestContent) IsFile() bool {
-	return ScriptContentType(c.Type_) == ScriptContentTypeGitFile ||
-		ScriptContentType(c.Type_) == ScriptContentTypeFileURI ||
-		ScriptContentType(c.Type_) == ScriptContentTypeString
+	return TestContentType(c.Type_) == TestContentTypeGitFile ||
+		TestContentType(c.Type_) == TestContentTypeFileURI ||
+		TestContentType(c.Type_) == TestContentTypeString
 }

pkg/executor/content/fetcher.go

@@ -24,14 +24,14 @@ func (f Fetcher) Fetch(content *testkube.TestContent) (path string, err error) {
 	if content == nil {
 		return "", fmt.Errorf("fetch - empty content, make sure script content has valid data structure and is not nil")
 	}
-	switch testkube.ScriptContentType(content.Type_) {
-	case testkube.ScriptContentTypeFileURI:
+	switch testkube.TestContentType(content.Type_) {
+	case testkube.TestContentTypeFileURI:
 		return f.FetchURI(content.Uri)
-	case testkube.ScriptContentTypeString:
+	case testkube.TestContentTypeString:
 		return f.FetchString(content.Data)
-	case testkube.ScriptContentTypeGitFile:
+	case testkube.TestContentTypeGitFile:
 		return f.FetchGitFile(content.Repository)
-	case testkube.ScriptContentTypeGitDir:
+	case testkube.TestContentTypeGitDir:
 		return f.FetchGitDir(content.Repository)
 	default:
 		return path, fmt.Errorf("unhandled content type: '%s'", content.Type_)

pkg/mapper/executions/sumary_test.go

@@ -33,7 +33,7 @@ func getExecutions() testkube.Executions {
 		"script1",
 		"execution1",
 		"test/test",
-		testkube.NewStringScriptContent(""),
+		testkube.NewStringTestContent(""),
 		*ex1,
 		map[string]string{"p": "v1"},
 		nil,
@@ -46,7 +46,7 @@ func getExecutions() testkube.Executions {
 		"script1",
 		"execution2",
 		"test/test",
-		testkube.NewStringScriptContent(""),
+		testkube.NewStringTestContent(""),
 		*ex2,
 		map[string]string{"p": "v2"},
 		nil,

pkg/test/script/detector/curltest_test.go

@@ -19,7 +19,7 @@ func TestCurlTestAdapter(t *testing.T) {
 	t.Run("Is return true when valid content", func(t *testing.T) {
 		detector := CurlTestAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(curlValidContent),
+			Content: testkube.NewStringTestContent(curlValidContent),
 		})
 
 		assert.True(t, is, "content should be of curl/test type")
@@ -29,7 +29,7 @@ func TestCurlTestAdapter(t *testing.T) {
 	t.Run("Is return false in case of invalid JSON content", func(t *testing.T) {
 		detector := CurlTestAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(curlInvalidContent),
+			Content: testkube.NewStringTestContent(curlInvalidContent),
 		})
 
 		assert.Empty(t, name)
@@ -40,7 +40,7 @@ func TestCurlTestAdapter(t *testing.T) {
 	t.Run("Is return false in case of content which is not JSON ", func(t *testing.T) {
 		detector := CurlTestAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(curlInvalidJSONContent),
+			Content: testkube.NewStringTestContent(curlInvalidJSONContent),
 		})
 
 		assert.Empty(t, name)

pkg/test/script/detector/detector_test.go

@@ -17,7 +17,7 @@ func TestDetector(t *testing.T) {
 		detector.Add(PostmanCollectionAdapter{})
 
 		name, found := detector.Detect(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(exampleValidContent),
+			Content: testkube.NewStringTestContent(exampleValidContent),
 		})
 
 		assert.True(t, found, "detector should find postman/collection")

pkg/test/script/detector/postmancollection_test.go

@@ -19,7 +19,7 @@ func TestPostmanCollectionAdapter(t *testing.T) {
 	t.Run("Is return true when valid content", func(t *testing.T) {
 		detector := PostmanCollectionAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(exampleValidContent),
+			Content: testkube.NewStringTestContent(exampleValidContent),
 		})
 
 		assert.Equal(t, "postman/collection", name)
@@ -29,7 +29,7 @@ func TestPostmanCollectionAdapter(t *testing.T) {
 	t.Run("Is return false in case of invalid JSON content", func(t *testing.T) {
 		detector := PostmanCollectionAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(exampleInvalidContent),
+			Content: testkube.NewStringTestContent(exampleInvalidContent),
 		})
 
 		assert.Empty(t, name)
@@ -40,7 +40,7 @@ func TestPostmanCollectionAdapter(t *testing.T) {
 	t.Run("Is return false in case of content which is not JSON ", func(t *testing.T) {
 		detector := PostmanCollectionAdapter{}
 		name, is := detector.Is(client.UpsertScriptOptions{
-			Content: testkube.NewStringScriptContent(exampleInvalidJSONContent),
+			Content: testkube.NewStringTestContent(exampleInvalidJSONContent),
 		})
 
 		assert.Empty(t, name)