Skip to content

Strip out kubectl warnings #31

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
Feb 19, 2021
Merged

Strip out kubectl warnings #31

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: 8 additions & 0 deletions pkg/cluster/kube_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cluster

import (
"bytes"
"context"
"encoding/json"
"fmt"
Expand Down Expand Up @@ -238,6 +239,13 @@ func (cc *KubeClusterClient) DiffStructured(
)
}

// Strip everything before the initial "{"; kubectl can insert arbitrary warnings, etc.
// that can cause the result to not be valid JSON.
jsonStart := bytes.Index(rawResults, []byte("{"))
if jsonStart > 0 {
rawResults = rawResults[jsonStart:]
}

results := diff.Results{}
if err := json.Unmarshal(rawResults, &results); err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package version

// Version stores the current kubeapply version.
const Version = "0.0.26"
const Version = "0.0.27"