Skip to content
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

Jump to bottom

Update json-patch mod to fix hangs on pulumi update #1223

Merged
merged 2 commits into from
Aug 1, 2020
Merged

Update json-patch mod to fix hangs on pulumi update #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eb3d34
Update json-patch mod to fix hangs on pulumi update
lblackstone Jul 27, 2020
a862fc2
gofmt
lblackstone Jul 31, 2020
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

### Bug Fixes

- Fix server-side diff when immutable fields change. (https://github.com/pulumi/pulumi-kubernetes/pull/1223)
- Fix server-side diff when immutable fields change. (https://github.com/pulumi/pulumi-kubernetes/pull/988)
- Update json-patch mod to fix hangs on pulumi update. (https://github.com/pulumi/pulumi-kubernetes/pull/1223)

## 2.4.1 (July 24, 2020)

Expand Down
2 changes: 1 addition & 1 deletion provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.14

require (
github.com/ahmetb/go-linq v3.0.0+incompatible
github.com/evanphx/json-patch v4.5.0+incompatible
github.com/golang/protobuf v1.3.5
github.com/googleapis/gnostic v0.2.0
github.com/imdario/mergo v0.3.8
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pulumi/json-patch v0.0.0-20200731230438-50deba092bc7
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200702193010-d611740ab0fa
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200626210151-8961f5b0caae
github.com/stretchr/testify v1.6.1
Expand Down
2 changes: 2 additions & 0 deletions provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/json-patch v0.0.0-20200731230438-50deba092bc7 h1:8qUt+Rx/e2r8ulfqTnTIEllY7qBXub0lg9yDEAaBRnM=
github.com/pulumi/json-patch v0.0.0-20200731230438-50deba092bc7/go.mod h1:lHHSztMWUwjDNAtnPNx1/z24Cqx0E9rPhCemR+RL/As=
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200702193010-d611740ab0fa h1:iqnQ3kfZbK+KUXw+fqquS51xSjkJjh83u/COzQXGjjw=
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200702193010-d611740ab0fa/go.mod h1:zfUm4/GH2dVRlHZ3Yeb9bRweCQM7icVBdplu6MUDRrQ=
github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/openapi/match.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strings"

jsonpatch "github.com/evanphx/json-patch"
jsonpatch "github.com/pulumi/json-patch"
"k8s.io/client-go/util/jsonpath"
)

Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/json"
"testing"

jsonpatch "github.com/evanphx/json-patch"
jsonpatch "github.com/pulumi/json-patch"
pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"strings"
"sync"

jsonpatch "github.com/evanphx/json-patch"
pbempty "github.com/golang/protobuf/ptypes/empty"
structpb "github.com/golang/protobuf/ptypes/struct"
pkgerrors "github.com/pkg/errors"
jsonpatch "github.com/pulumi/json-patch"
"github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/await"
"github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/clients"
"github.com/pulumi/pulumi-kubernetes/provider/v2/pkg/cluster"
Expand Down
2 changes: 2 additions & 0 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/json-patch v0.0.0-20200731230438-50deba092bc7 h1:8qUt+Rx/e2r8ulfqTnTIEllY7qBXub0lg9yDEAaBRnM=
github.com/pulumi/json-patch v0.0.0-20200731230438-50deba092bc7/go.mod h1:lHHSztMWUwjDNAtnPNx1/z24Cqx0E9rPhCemR+RL/As=
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200702193010-d611740ab0fa h1:iqnQ3kfZbK+KUXw+fqquS51xSjkJjh83u/COzQXGjjw=
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200702193010-d611740ab0fa/go.mod h1:zfUm4/GH2dVRlHZ3Yeb9bRweCQM7icVBdplu6MUDRrQ=
github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
Expand Down