Merge pull request #435 from captainroy-hy/cap-template-URI

fix getting CUE template from remote
This commit is contained in:
Jianbo Sun
2020-10-26 12:33:04 +08:00
committed by GitHub
2 changed files with 7 additions and 0 deletions
+1
View File
@@ -132,6 +132,7 @@ func HandleTemplate(in *runtime.RawExtension, name, syncDir string) (types.Capab
return types.Capability{}, err
}
cueTemplate = string(b)
tmp.CueTemplate = cueTemplate
} else {
if tmp.CueTemplate == "" {
return types.Capability{}, errors.New("template not exist in definition")
+6
View File
@@ -107,6 +107,9 @@ var _ = Describe("DefinitionFiles", func() {
Expect(err).Should(BeNil())
logf.Log.Info(fmt.Sprintf("Getting trait definitions %v", traitDefs))
for i := range traitDefs {
// CueTemplate should always be fulfilled, even those whose CueTemplateURI is assigend,
By("check CueTemplate is fulfilled")
Expect(traitDefs[i].CueTemplate).ShouldNot(BeEmpty())
traitDefs[i].CueTemplate = ""
traitDefs[i].DefinitionPath = ""
}
@@ -120,6 +123,9 @@ var _ = Describe("DefinitionFiles", func() {
Expect(err).Should(BeNil())
logf.Log.Info(fmt.Sprintf("Getting workload definitions %v", workloadDefs))
for i := range workloadDefs {
// CueTemplate should always be fulfilled, even those whose CueTemplateURI is assigend,
By("check CueTemplate is fulfilled")
Expect(workloadDefs[i].CueTemplate).ShouldNot(BeEmpty())
workloadDefs[i].CueTemplate = ""
workloadDefs[i].DefinitionPath = ""
}