Skip to content
Snippets Groups Projects
Commit 56befd0f authored by Alex Clemmer's avatar Alex Clemmer
Browse files

De/serialize specification objects with YAML

Fixes #48.

Currently the structs `app.Spec`, `registry.Spec`, and `parts.Spec` are
all serialized and deserialized using JSON instead of YAML.

This commit will resolve this issue.
parent 02b62066
No related branches found
No related tags found
No related merge requests found
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
package app package app
import ( import (
"encoding/json"
"fmt" "fmt"
"github.com/ghodss/yaml"
) )
const ( const (
DefaultAPIVersion = "0.1" DefaultAPIVersion = "0.0.1"
Kind = "ksonnet.io/app" Kind = "ksonnet.io/app"
DefaultVersion = "0.0.1" DefaultVersion = "0.0.1"
) )
...@@ -46,7 +47,7 @@ type Spec struct { ...@@ -46,7 +47,7 @@ type Spec struct {
} }
func (s *Spec) Marshal() ([]byte, error) { func (s *Spec) Marshal() ([]byte, error) {
return json.MarshalIndent(s, "", " ") return yaml.Marshal(s)
} }
func (s *Spec) GetRegistryRef(name string) (*RegistryRefSpec, bool) { func (s *Spec) GetRegistryRef(name string) (*RegistryRefSpec, bool) {
...@@ -79,7 +80,7 @@ type RepositorySpec struct { ...@@ -79,7 +80,7 @@ type RepositorySpec struct {
} }
type RegistryRefSpec struct { type RegistryRefSpec struct {
Name string Name string `json:"-"`
Protocol string `json:"protocol"` Protocol string `json:"protocol"`
URI string `json:"uri"` URI string `json:"uri"`
GitVersion *GitVersionSpec `json:"gitVersion"` GitVersion *GitVersionSpec `json:"gitVersion"`
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package metadata package metadata
import ( import (
"encoding/json"
"fmt" "fmt"
"os" "os"
"os/user" "os/user"
...@@ -24,6 +23,7 @@ import ( ...@@ -24,6 +23,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/ghodss/yaml"
"github.com/ksonnet/ksonnet/metadata/app" "github.com/ksonnet/ksonnet/metadata/app"
param "github.com/ksonnet/ksonnet/metadata/params" param "github.com/ksonnet/ksonnet/metadata/params"
"github.com/ksonnet/ksonnet/metadata/registry" "github.com/ksonnet/ksonnet/metadata/registry"
...@@ -299,7 +299,7 @@ func (m *manager) AppSpec() (*app.Spec, error) { ...@@ -299,7 +299,7 @@ func (m *manager) AppSpec() (*app.Spec, error) {
} }
schema := app.Spec{} schema := app.Spec{}
err = json.Unmarshal(bytes, &schema) err = yaml.Unmarshal(bytes, &schema)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
package parts package parts
import "encoding/json" import (
"github.com/ghodss/yaml"
)
const ( const (
DefaultApiVersion = "0.1" DefaultApiVersion = "0.1"
...@@ -40,7 +42,7 @@ type Spec struct { ...@@ -40,7 +42,7 @@ type Spec struct {
} }
func (s *Spec) Marshal() ([]byte, error) { func (s *Spec) Marshal() ([]byte, error) {
return json.MarshalIndent(s, "", " ") return yaml.Marshal(s)
} }
type ContributorSpec struct { type ContributorSpec struct {
......
package metadata package metadata
import ( import (
"encoding/json"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"github.com/ghodss/yaml"
"github.com/ksonnet/ksonnet/metadata/app" "github.com/ksonnet/ksonnet/metadata/app"
"github.com/ksonnet/ksonnet/metadata/parts" "github.com/ksonnet/ksonnet/metadata/parts"
"github.com/ksonnet/ksonnet/metadata/registry" "github.com/ksonnet/ksonnet/metadata/registry"
...@@ -254,7 +254,7 @@ func (m *manager) registrySpecFromFile(path AbsPath) (*registry.Spec, bool, erro ...@@ -254,7 +254,7 @@ func (m *manager) registrySpecFromFile(path AbsPath) (*registry.Spec, bool, erro
} }
registrySpec := registry.Spec{} registrySpec := registry.Spec{}
err = json.Unmarshal(registrySpecBytes, &registrySpec) err = yaml.Unmarshal(registrySpecBytes, &registrySpec)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
package registry package registry
import ( import (
"encoding/json" "github.com/ghodss/yaml"
"github.com/ksonnet/ksonnet/metadata/app" "github.com/ksonnet/ksonnet/metadata/app"
) )
...@@ -34,7 +33,7 @@ type Spec struct { ...@@ -34,7 +33,7 @@ type Spec struct {
} }
func (s *Spec) Marshal() ([]byte, error) { func (s *Spec) Marshal() ([]byte, error) {
return json.MarshalIndent(s, "", " ") return yaml.Marshal(s)
} }
type Specs []*Spec type Specs []*Spec
......
...@@ -2,12 +2,12 @@ package metadata ...@@ -2,12 +2,12 @@ package metadata
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"net/url" "net/url"
"path" "path"
"strings" "strings"
"github.com/ghodss/yaml"
"github.com/google/go-github/github" "github.com/google/go-github/github"
"github.com/ksonnet/ksonnet/metadata/app" "github.com/ksonnet/ksonnet/metadata/app"
"github.com/ksonnet/ksonnet/metadata/parts" "github.com/ksonnet/ksonnet/metadata/parts"
...@@ -99,7 +99,7 @@ func (gh *gitHubRegistryManager) FetchRegistrySpec() (*registry.Spec, error) { ...@@ -99,7 +99,7 @@ func (gh *gitHubRegistryManager) FetchRegistrySpec() (*registry.Spec, error) {
// Deserialize, return. // Deserialize, return.
registrySpec := registry.Spec{} registrySpec := registry.Spec{}
err = json.Unmarshal([]byte(registrySpecText), &registrySpec) err = yaml.Unmarshal([]byte(registrySpecText), &registrySpec)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -150,7 +150,7 @@ func (gh *gitHubRegistryManager) ResolveLibrary(libID, libAlias, libRefSpec stri ...@@ -150,7 +150,7 @@ func (gh *gitHubRegistryManager) ResolveLibrary(libID, libAlias, libRefSpec stri
} }
parts := parts.Spec{} parts := parts.Spec{}
json.Unmarshal([]byte(partsSpecText), &parts) yaml.Unmarshal([]byte(partsSpecText), &parts)
refSpec := app.LibraryRefSpec{ refSpec := app.LibraryRefSpec{
Name: libAlias, Name: libAlias,
......
package prototype package prototype
import "encoding/json" import "github.com/ghodss/yaml"
// Unmarshal takes the bytes of a JSON-encoded prototype specification, and // Unmarshal takes the bytes of a JSON-encoded prototype specification, and
// deserializes them to a `SpecificationSchema`. // deserializes them to a `SpecificationSchema`.
func Unmarshal(bytes []byte) (*SpecificationSchema, error) { func Unmarshal(bytes []byte) (*SpecificationSchema, error) {
var p SpecificationSchema var p SpecificationSchema
err := json.Unmarshal(bytes, &p) err := yaml.Unmarshal(bytes, &p)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment