Skip to content

feat: Capability to diff changes in chart hooks #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2018
Merged

feat: Capability to diff changes in chart hooks #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/revision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ func (d *revision) differentiate() error {
}

diff.DiffManifests(
manifest.Parse(revisionResponse.Release.Manifest, revisionResponse.Release.Namespace),
manifest.Parse(releaseResponse.Release.Manifest, releaseResponse.Release.Namespace),
manifest.ParseRelease(revisionResponse.Release),
manifest.ParseRelease(releaseResponse.Release),
d.suppressedKinds,
d.outputContext,
os.Stdout)
Expand All @@ -116,8 +116,8 @@ func (d *revision) differentiate() error {
}

diff.DiffManifests(
manifest.Parse(revisionResponse1.Release.Manifest, revisionResponse1.Release.Namespace),
manifest.Parse(revisionResponse2.Release.Manifest, revisionResponse2.Release.Namespace),
manifest.ParseRelease(revisionResponse1.Release),
manifest.ParseRelease(revisionResponse2.Release),
d.suppressedKinds,
d.outputContext,
os.Stdout)
Expand Down
4 changes: 2 additions & 2 deletions cmd/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ func (d *rollback) backcast() error {

// create a diff between the current manifest and the version of the manifest that a user is intended to rollback
diff.DiffManifests(
manifest.Parse(releaseResponse.Release.Manifest, releaseResponse.Release.Namespace),
manifest.Parse(revisionResponse.Release.Manifest, revisionResponse.Release.Namespace),
manifest.ParseRelease(releaseResponse.Release),
manifest.ParseRelease(revisionResponse.Release),
d.suppressedKinds,
d.outputContext,
os.Stdout)
Expand Down
4 changes: 2 additions & 2 deletions cmd/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ func (d *diffCmd) run() error {
return prettyError(err)
}

currentSpecs = manifest.Parse(releaseResponse.Release.Manifest, releaseResponse.Release.Namespace)
newSpecs = manifest.Parse(upgradeResponse.Release.Manifest, upgradeResponse.Release.Namespace)
currentSpecs = manifest.ParseRelease(releaseResponse.Release)
newSpecs = manifest.ParseRelease(upgradeResponse.Release)
}

diff.DiffManifests(currentSpecs, newSpecs, d.suppressedKinds, d.outputContext, os.Stdout)
Expand Down
11 changes: 11 additions & 0 deletions manifest/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"

"gopkg.in/yaml.v2"
"k8s.io/helm/pkg/proto/hapi/release"
)

var yamlSeperator = []byte("\n---\n")
Expand Down Expand Up @@ -54,6 +55,16 @@ func splitSpec(token string) (string, string) {
return "", ""
}

func ParseRelease(release *release.Release) map[string]*MappingResult {
manifest := release.Manifest
for _, hook := range release.Hooks {
manifest += "\n---\n"
manifest += fmt.Sprintf("# Source: %s\n", hook.Path)
manifest += hook.Manifest
}
return Parse(manifest, release.Namespace)
}

func Parse(manifest string, defaultNamespace string) map[string]*MappingResult {
scanner := bufio.NewScanner(strings.NewReader(manifest))
scanner.Split(scanYamlSpecs)
Expand Down