Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Commit

Permalink
deffile2
Browse files Browse the repository at this point in the history
  • Loading branch information
dacleyra committed Jun 5, 2020
1 parent a950e37 commit a23b6f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
11 changes: 2 additions & 9 deletions pkg/controller/serving/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package serving
import (
//"encoding/json"
//"flag"
// "fmt"
//"fmt"
"io/ioutil"
// "log"
//"log"
"path/filepath"

"github.com/elsony/devfile2-registry/tools/types"
Expand All @@ -15,7 +15,6 @@ import (
// genIndex generate new index from meta.yaml files in dir.
// meta.yaml file is expected to be in dir/<stack>/<version>/meta.yaml
func genIndex(dir string) ([]types.MetaIndex, error) {
reqLogger := log.WithValues("Request.Namespace", "", "Request.Name", "")

var index []types.MetaIndex

Expand All @@ -33,26 +32,20 @@ func genIndex(dir string) ([]types.MetaIndex, error) {
for _, versiondir := range versiondirs {
var meta types.Meta
metaFile, err := ioutil.ReadFile(filepath.Join(dir, stackdir.Name(), versiondir.Name(), "meta.yaml"))
reqLogger.Info(filepath.Join(dir, stackdir.Name(), versiondir.Name(), "meta.yaml"))
reqLogger.Info(string(metaFile))
if err != nil {
return nil, err
}
err = yaml.Unmarshal(metaFile, &meta)
if err != nil {
return nil, err
}
reqLogger.Info(fmt.Sprintf("%v", meta)

self := filepath.Join(stackdir.Name(), versiondir.Name(), "devfile.yaml")

metaIndex := types.MetaIndex{
Meta: meta,
Links: types.Links{
Self: self,
},
}
reqLogger.Info(fmt.Sprintf("%v", metaIndex)
index = append(index, metaIndex)
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/serving/serving_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (r *ReconcileStack) Reconcile(request reconcile.Request) (reconcile.Result,
reqLogger.Error(err, fmt.Sprintf("Error creating metafile %v", metafile))
}
defer f.Close()
_, err = f.WriteString(version.Devfile)
_, err = f.WriteString(version.Metafile)
if err != nil {
reqLogger.Error(err, fmt.Sprintf("Error writing metafile %v", metafile))
}
Expand Down

0 comments on commit a23b6f8

Please sign in to comment.