fix after comments

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>

Author: flacatus

tests/check_rhtap_nightly.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -x
+
+samplesFile="$(pwd)/extraDevfileEntries.yaml"
+
+ginkgo run --procs 2 \
+  --timeout 2h \
+  tests/rhtap -- -samplesFile "$samplesFile"

tests/rhtap/check_nightly.sh

@@ -5,7 +5,9 @@ go 1.18
 require (
 	github.com/onsi/ginkgo/v2 v2.9.2
 	github.com/onsi/gomega v1.27.6
+	github.com/redhat-appstudio/application-api v0.0.0-20230509152222-ef5c4dcebc94
 	github.com/redhat-appstudio/e2e-tests v0.0.0-20230628083559-110126807738
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 replace (
@@ -127,7 +129,6 @@ require (
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/prometheus/statsd_exporter v0.23.0 // indirect
-	github.com/redhat-appstudio/application-api v0.0.0-20230509152222-ef5c4dcebc94 // indirect
 	github.com/redhat-appstudio/build-service v0.0.0-20230113121706-a9f10055dbc4 // indirect
 	github.com/redhat-appstudio/image-controller v0.0.0-20230606065013-5c7c65e0db05 // indirect
 	github.com/redhat-appstudio/integration-service v0.0.0-20230427084439-306b4611389b // indirect
@@ -170,7 +171,6 @@ require (
 	google.golang.org/grpc v1.54.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.27.0 // indirect
 	k8s.io/apiextensions-apiserver v0.27.0 // indirect

tests/rhtap/go.mod

@@ -14,12 +14,12 @@ import (
 	"github.com/redhat-appstudio/e2e-tests/pkg/utils"
 )
 
-var stacksPath string
+var samplesFile string
 var namespace string
 
 func init() {
 	rand.Seed(time.Now().UnixNano())
-	flag.StringVar(&stacksPath, "stacksPath", "../../extraDevfileEntries.yaml", "Parent stack file")
+	flag.StringVar(&samplesFile, "samplesFile", "../../extraDevfileEntries.yaml", "Parent stack file")
 	flag.StringVar(&namespace, "namespace", "", "Namespace where create and build stack samples")
 }
 
@@ -30,19 +30,19 @@ func TestRhtap(t *testing.T) {
 
 }
 
-var _ = Describe("RHTAP parent stacks checks", Ordered, Label("nightly"), func() {
+var _ = Describe("RHTAP sample checks", Ordered, Label("nightly"), func() {
 	var fw *testHub.ControllerHub
 	var testNamespace string
 	component := &appservice.Component{}
 	cdq := &appservice.ComponentDetectionQuery{}
 
-	stacks, err := LoadTestGeneratorConfig(stacksPath)
+	entries, err := LoadExtraDevfileEntries(samplesFile)
 	Expect(err).NotTo(HaveOccurred())
 
-	for _, stack := range stacks.Samples {
-		stack := stack
+	for _, sampleEntry := range entries.Samples {
+		sampleEntry := sampleEntry
 
-		Describe(stack.Name, func() {
+		Describe(sampleEntry.Name, func() {
 			BeforeAll(func() {
 				kubeClient, err := e2eKube.NewAdminKubernetesClient()
 				Expect(err).NotTo(HaveOccurred())
@@ -68,29 +68,29 @@ var _ = Describe("RHTAP parent stacks checks", Ordered, Label("nightly"), func()
 			// Create an application in a specific namespace
 			It("creates an application", func() {
 				GinkgoWriter.Printf("Parallel process %d\n", GinkgoParallelProcess())
-				createdApplication, err := fw.HasController.CreateApplication(stack.Name, testNamespace)
+				createdApplication, err := fw.HasController.CreateApplication(sampleEntry.Name, testNamespace)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(createdApplication.Namespace).To(Equal(testNamespace))
 			})
 
 			// Check the application health and check if a devfile was generated in the status
 			It("checks if application is healthy", func() {
 				Eventually(func() string {
-					application, err := fw.HasController.GetApplication(stack.Name, testNamespace)
+					application, err := fw.HasController.GetApplication(sampleEntry.Name, testNamespace)
 					Expect(err).NotTo(HaveOccurred())
 
 					return application.Status.Devfile
 				}, 3*time.Minute, 100*time.Millisecond).Should(Not(BeEmpty()), "Error creating gitOps repository")
 			})
 
 			It("creates componentdetectionquery", func() {
-				cdq, err = fw.HasController.CreateComponentDetectionQuery(stack.Name, testNamespace, stack.Git.Remotes.Origin, "", "", "", false)
+				cdq, err = fw.HasController.CreateComponentDetectionQuery(sampleEntry.Name, testNamespace, sampleEntry.Git.Remotes.Origin, "", "", "", false)
 				Expect(err).NotTo(HaveOccurred())
 			})
 
 			It("creates component", func() {
 				for _, compDetected := range cdq.Status.ComponentDetected {
-					component, err = fw.HasController.CreateComponent(compDetected.ComponentStub, testNamespace, "", "", stack.Name, true, map[string]string{})
+					component, err = fw.HasController.CreateComponent(compDetected.ComponentStub, testNamespace, "", "", sampleEntry.Name, true, map[string]string{})
 					Expect(err).NotTo(HaveOccurred())
 				}
 			})

tests/rhtap/rhtap_test.go

@@ -15,21 +15,21 @@ type Git struct {
 	Remotes Remotes `yaml:"remotes"`
 }
 
-type Samples struct {
+type SampleEntry struct {
 	Name        string `yaml:"name"`
 	DisplayName string `yaml:"displayName"`
 	Language    string `yaml:"language"`
 	ProjectType string `yaml:"projectType"`
 	Git         Git    `yaml:"git"`
 }
 
-type Stacks struct {
-	SchemaVersion string    `yaml:"schemaVersion"`
-	Samples       []Samples `yaml:"samples"`
+type ExtraDevfileEntries struct {
+	SchemaVersion string        `yaml:"schemaVersion"`
+	Samples       []SampleEntry `yaml:"samples"`
 }
 
-func LoadTestGeneratorConfig(configPath string) (Stacks, error) {
-	s := Stacks{}
+func LoadExtraDevfileEntries(configPath string) (ExtraDevfileEntries, error) {
+	s := ExtraDevfileEntries{}
 	// Open config file
 	file, err := os.Open(filepath.Clean(configPath))
 	if err != nil {