feat: move test to rawconfig

Signed-off-by: Meng JiaFeng <[email protected]>

Author: steinliber

internal/pkg/configmanager/app.go

@@ -35,7 +35,7 @@ func (a *app) getTools(vars map[string]any, templateMap map[string]string) (Tool
 
 	// get ci/cd pipelineTemplates
 	appVars := a.Spec.merge(vars)
-	tools, err := a.generateCICDToolsFromAppConfig(templateMap, appVars)
+	tools, err := a.generateCICDTools(templateMap, appVars)
 	if err != nil {
 		return nil, fmt.Errorf("app[%s] get pipeline tools failed: %w", a.Name, err)
 	}
@@ -49,7 +49,7 @@ func (a *app) getTools(vars map[string]any, templateMap map[string]string) (Tool
 }
 
 // getAppPipelineTool generate ci/cd tools from app config
-func (a *app) generateCICDToolsFromAppConfig(templateMap map[string]string, appVars map[string]any) (Tools, error) {
+func (a *app) generateCICDTools(templateMap map[string]string, appVars map[string]any) (Tools, error) {
 	allPipelineRaw := append(a.CIRawConfigs, a.CDRawConfigs...)
 	var tools Tools
 	for _, p := range allPipelineRaw {

internal/pkg/configmanager/app_test.go

@@ -53,4 +53,31 @@ var _ = Describe("app struct", func() {
 			})
 		})
 	})
+
+	Context("generateCICDTools method", func() {
+		When("template type not exist", func() {
+			BeforeEach(func() {
+				a = &app{
+					Repo: &scm.SCMInfo{
+						CloneURL: "http://test.com/test/test_app",
+					},
+					CIRawConfigs: []pipelineRaw{
+						{
+							Type:         "template",
+							TemplateName: "not_valid",
+						},
+					},
+				}
+			})
+			It("should return error", func() {
+				templateMap = map[string]string{
+					"not_valid": `
+name: not_valid,
+type: not_valid`}
+				_, err := a.generateCICDTools(templateMap, vars)
+				Expect(err).Should(HaveOccurred())
+				Expect(err.Error()).Should(ContainSubstring("pipeline type [not_valid] not supported for now"))
+			})
+		})
+	})
 })

internal/pkg/configmanager/rawconfig_test.go

@@ -196,4 +196,22 @@ var _ = Describe("rawConfig struct", func() {
 			})
 		})
 	})
+
+	Context("getVars method", func() {
+		BeforeEach(func() {
+			r = &rawConfig{
+				vars: []byte(`---
+foo1: bar1
+foo2: 123
+foo3: bar3`)}
+		})
+		It("should works fine", func() {
+			varMap, err := r.getVars()
+			Expect(err).NotTo(HaveOccurred())
+			Expect(varMap).NotTo(BeNil())
+			Expect(len(varMap)).To(Equal(3))
+			Expect(varMap["foo1"]).To(Equal(interface{}("bar1")))
+			Expect(varMap["foo2"]).To(Equal(interface{}(123)))
+		})
+	})
 })

internal/pkg/configmanager/variables_test.go

@@ -24,23 +24,3 @@ var _ = Describe("renderConfigWithVariables", func() {
 		})
 	})
 })
-
-// var _ = Describe("getVarsFromConfigFile", func() {
-// const configFile = `---
-// foo: bar
-// vars:
-// foo1: bar1
-// foo2: 123
-// foo3: bar3
-// `
-// When("get vars from config file", func() {
-// It("should works fine", func() {
-// varMap, err := getVarsFromConfigFile([]byte(configFile))
-// Expect(err).NotTo(HaveOccurred())
-// Expect(varMap).NotTo(BeNil())
-// Expect(len(varMap)).To(Equal(2))
-// Expect(varMap["foo1"]).To(Equal(interface{}("bar1")))
-// Expect(varMap["foo2"]).To(Equal(interface{}(123)))
-// })
-// })
-// })