Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add resource info to output message when saving spec file (#1414)

Browse Source
This commit is contained in:
Ta-Ching Chen
2019-11-18 12:35:14 +08:00
committed by GitHub
parent 66b9dfa8e9
commit 81ece23bfe
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/spec/spec.go
+20 -10
View File
@@ -165,7 +165,8 @@ func save(data []byte, specDir string, specFile string) error {
// called from `fission * create --spec` // called from `fission * create --spec`
func SpecSave(resource interface{}, specFile string) error { func SpecSave(resource interface{}, specFile string) error {
var meta metav1.ObjectMeta var meta metav1.ObjectMeta
specDir := "specs" var kind string
var specDir = "specs"
// make sure we're writing a known type // make sure we're writing a known type
var data []byte var data []byte
@@ -173,45 +174,53 @@ func SpecSave(resource interface{}, specFile string) error {
switch typedres := resource.(type) { switch typedres := resource.(type) {
case types.ArchiveUploadSpec: case types.ArchiveUploadSpec:
typedres.Kind = "ArchiveUploadSpec" typedres.Kind = "ArchiveUploadSpec"
data, err = yaml.Marshal(typedres)
meta = metav1.ObjectMeta{ meta = metav1.ObjectMeta{
Name: typedres.Name, Name: typedres.Name,
} }
kind = typedres.Kind
data, err = yaml.Marshal(typedres)
case fv1.Package: case fv1.Package:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "Package" typedres.TypeMeta.Kind = "Package"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.Function: case fv1.Function:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "Function" typedres.TypeMeta.Kind = "Function"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.Environment: case fv1.Environment:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "Environment" typedres.TypeMeta.Kind = "Environment"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.HTTPTrigger: case fv1.HTTPTrigger:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "HTTPTrigger" typedres.TypeMeta.Kind = "HTTPTrigger"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.KubernetesWatchTrigger: case fv1.KubernetesWatchTrigger:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "KubernetesWatchTrigger" typedres.TypeMeta.Kind = "KubernetesWatchTrigger"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.MessageQueueTrigger: case fv1.MessageQueueTrigger:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "MessageQueueTrigger" typedres.TypeMeta.Kind = "MessageQueueTrigger"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
case fv1.TimeTrigger: case fv1.TimeTrigger:
typedres.TypeMeta.APIVersion = fv1.CRD_VERSION typedres.TypeMeta.APIVersion = fv1.CRD_VERSION
typedres.TypeMeta.Kind = "TimeTrigger" typedres.TypeMeta.Kind = "TimeTrigger"
data, err = yaml.Marshal(typedres)
meta = typedres.Metadata meta = typedres.Metadata
kind = typedres.TypeMeta.Kind
data, err = yaml.Marshal(typedres)
default: default:
return fmt.Errorf("can't save resource %#v", resource) return fmt.Errorf("can't save resource %#v", resource)
} }
@@ -238,7 +247,8 @@ func SpecSave(resource interface{}, specFile string) error {
return err return err
} }
console.Info(fmt.Sprintf("Saving %v/%v to %v", meta.Namespace, meta.Name, specFile)) console.Info(fmt.Sprintf("Saving %v '%v/%v' to '%v/%v'",
kind, meta.Namespace, meta.Name, specDir, specFile))
return nil return nil
} }