github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-05-06 01:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor pkg/appfile (#1447)

Browse Source 
Signed-off-by: roy wang <seiwy2010@gmail.com>
This commit is contained in:
Yue Wang
2021-04-11 15:10:16 +09:00
committed by GitHub
parent c619b7b290
commit 2d6f2083db
16 changed files with 1191 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go
View File

@@ -114,7 +114,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
appParser := appfile.NewApplicationParser(r.Client, r.dm, r.pd)
ctx = oamutil.SetNamespaceInCtx(ctx, app.Namespace)
generatedAppfile, err := appParser.GenerateAppFile(ctx, app.Name, app)
generatedAppfile, err := appParser.GenerateAppFile(ctx, app)
if err != nil {
applog.Error(err, "[Handle Parse]")
app.Status.SetConditions(errorCondition("Parsed", err))
@@ -135,7 +135,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
applog.Info("build template")
// build template to applicationconfig & component
ac, comps, err := appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err := generatedAppfile.GenerateApplicationConfiguration()
if err != nil {
applog.Error(err, "[Handle GenerateApplicationConfiguration]")
app.Status.SetConditions(errorCondition("Built", err))

20
pkg/controller/core.oam.dev/v1alpha2/application/revision_test.go
View File

@@ -224,9 +224,9 @@ var _ = Describe("test generate revision ", func() {
ctx = util.SetNamespaceInCtx(ctx, app.Namespace)
annoKey1 := "testKey1"
app.SetAnnotations(map[string]string{annoKey1: "true"})
generatedAppfile, err := appParser.GenerateAppFile(ctx, app.Name, &app)
generatedAppfile, err := appParser.GenerateAppFile(ctx, &app)
Expect(err).Should(Succeed())
ac, comps, err = appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err = generatedAppfile.GenerateApplicationConfiguration()
Expect(err).Should(Succeed())
handler.appfile = generatedAppfile
Expect(ac.Namespace).Should(Equal(app.Namespace))
@@ -320,9 +320,9 @@ var _ = Describe("test generate revision ", func() {
}
// persist the app
Expect(k8sClient.Update(ctx, &app)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
generatedAppfile, err = appParser.GenerateAppFile(ctx, app.Name, &app)
generatedAppfile, err = appParser.GenerateAppFile(ctx, &app)
Expect(err).Should(Succeed())
ac, comps, err = appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err = generatedAppfile.GenerateApplicationConfiguration()
Expect(err).Should(Succeed())
handler.appfile = generatedAppfile
handler.app = &app
@@ -372,9 +372,9 @@ var _ = Describe("test generate revision ", func() {
ctx = util.SetNamespaceInCtx(ctx, app.Namespace)
// mark the app as rollout
app.SetAnnotations(map[string]string{oam.AnnotationAppRollout: strconv.FormatBool(true)})
generatedAppfile, err := appParser.GenerateAppFile(ctx, app.Name, &app)
generatedAppfile, err := appParser.GenerateAppFile(ctx, &app)
Expect(err).Should(Succeed())
ac, comps, err = appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err = generatedAppfile.GenerateApplicationConfiguration()
Expect(err).Should(Succeed())
handler.appfile = generatedAppfile
Expect(ac.Namespace).Should(Equal(app.Namespace))
@@ -467,9 +467,9 @@ var _ = Describe("test generate revision ", func() {
}
// persist the app
Expect(k8sClient.Update(ctx, &app)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
generatedAppfile, err = appParser.GenerateAppFile(ctx, app.Name, &app)
generatedAppfile, err = appParser.GenerateAppFile(ctx, &app)
Expect(err).Should(Succeed())
ac, comps, err = appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err = generatedAppfile.GenerateApplicationConfiguration()
Expect(err).Should(Succeed())
handler.appfile = generatedAppfile
handler.app = &app
@@ -520,9 +520,9 @@ var _ = Describe("test generate revision ", func() {
app.SetLabels(map[string]string{labelKey1: "true"})
annoKey1 := "annoKey1"
app.SetAnnotations(map[string]string{annoKey1: "true"})
generatedAppfile, err := appParser.GenerateAppFile(ctx, app.Name, &app)
generatedAppfile, err := appParser.GenerateAppFile(ctx, &app)
Expect(err).Should(Succeed())
ac, comps, err = appParser.GenerateApplicationConfiguration(generatedAppfile, app.Namespace)
ac, comps, err = generatedAppfile.GenerateApplicationConfiguration()
Expect(err).Should(Succeed())
handler.appfile = generatedAppfile
Expect(ac.Namespace).Should(Equal(app.Namespace))