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

Break circular dependency between provider/tests #3385

Merged
merged 2 commits into from
Dec 20, 2024
Merged

Break circular dependency between provider/tests #3385

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
9c69314
Break circular dependency between provider/tests
blampe Dec 19, 2024
a7e5af4
Merge branch 'master' into blampe/test-module
blampe Dec 20, 2024
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: 3 additions & 5 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ go 1.23.0

toolchain go1.23.3

replace (
github.com/pulumi/pulumi-kubernetes/sdk/v4 => ../sdk
github.com/pulumi/pulumi-kubernetes/tests/v4 => ../tests
)
replace github.com/pulumi/pulumi-kubernetes/sdk/v4 => ../sdk

require (
github.com/evanphx/json-patch v5.7.0+incompatible
Expand All @@ -22,7 +19,6 @@ require (
github.com/pkg/errors v0.9.1
github.com/pulumi/cloud-ready-checks v1.2.0
github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0
github.com/pulumi/pulumi-kubernetes/tests/v4 v4.0.0-20241219025154-c17b3653a081
github.com/pulumi/pulumi/pkg/v3 v3.143.0
github.com/pulumi/pulumi/sdk/v3 v3.143.0
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -101,6 +97,7 @@ require (
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
Expand Down Expand Up @@ -217,6 +214,7 @@ require (
github.com/zclconf/go-cty v1.13.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
Expand Down
0 tests/gomega/kube.go → provider/pkg/gomega/kube.go
View file
Open in desktop
File renamed without changes.
0 tests/gomega/matchers.go → provider/pkg/gomega/matchers.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/pkg/provider/helm/v4/chart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
. "github.com/onsi/gomega" //nolint:golint // dot-imports
. "github.com/onsi/gomega/gstruct" //nolint:golint // dot-imports
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients/fake"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
kubehelm "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/helm"
providerresource "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/provider/resource"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
pulumiprovider "github.com/pulumi/pulumi/sdk/v3/go/pulumi/provider"
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/kustomize/v2/directory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
. "github.com/onsi/gomega" //nolint:golint // dot-imports
. "github.com/onsi/gomega/gstruct" //nolint:golint // dot-imports
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients/fake"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
providerresource "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/provider/resource"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
pulumiprovider "github.com/pulumi/pulumi/sdk/v3/go/pulumi/provider"
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/yaml/v2/configfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients/fake"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
providerresource "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/provider/resource"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
pulumiprovider "github.com/pulumi/pulumi/sdk/v3/go/pulumi/provider"
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/yaml/v2/configgroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients/fake"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
providerresource "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/provider/resource"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
pulumiprovider "github.com/pulumi/pulumi/sdk/v3/go/pulumi/provider"
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/yaml/v2/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
gomegatypes "github.com/onsi/gomega/types"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/clients/fake"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi/internals"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/dotnet/dotnet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/format"
. "github.com/onsi/gomega/gstruct"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/openapi"
"github.com/pulumi/pulumi-kubernetes/tests/v4"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
pulumirpctesting "github.com/pulumi/pulumi-kubernetes/tests/v4/pulumirpc"
"github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/go/go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/format"
. "github.com/onsi/gomega/gstruct"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/openapi"
"github.com/pulumi/pulumi-kubernetes/tests/v4"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
pulumirpctesting "github.com/pulumi/pulumi-kubernetes/tests/v4/pulumirpc"
"github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/gomega/gstruct"
"github.com/pulumi/providertest/grpclog"
"github.com/pulumi/providertest/pulumitest"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi/sdk/v3/go/auto"
"github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
Expand Down
2 changes: 1 addition & 1 deletion tests/sdk/nodejs/nodejs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/format"
. "github.com/onsi/gomega/gstruct"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/openapi"
"github.com/pulumi/pulumi-kubernetes/tests/v4"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
pulumirpctesting "github.com/pulumi/pulumi-kubernetes/tests/v4/pulumirpc"
"github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v3/resource/deploy/providers"
Expand Down
8 changes: 4 additions & 4 deletions tests/sdk/python/python_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/format"
. "github.com/onsi/gomega/gstruct"
. "github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/gomega"
"github.com/pulumi/pulumi-kubernetes/provider/v4/pkg/openapi"
"github.com/pulumi/pulumi-kubernetes/tests/v4"
. "github.com/pulumi/pulumi-kubernetes/tests/v4/gomega"
pulumirpctesting "github.com/pulumi/pulumi-kubernetes/tests/v4/pulumirpc"
"github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v3/resource/deploy/providers"
Expand Down Expand Up @@ -970,9 +970,9 @@ func TestOptionPropagation(t *testing.T) {
// quirk: Python SDK applies resource_prefix ("chart-options") to the component itself.
MatchFields(IgnoreExtras, Fields{
"Request": MatchFields(IgnoreExtras, Fields{
"Aliases": ConsistOf(
Alias("chart-options-old"),
Alias("chart-options-chart-options-aliased"),
"Aliases": ConsistOf(
Alias("chart-options-old"),
Alias("chart-options-chart-options-aliased"),
Alias(tokens.Type("kubernetes:helm.sh/v2:Chart"))),
"Protect": BeTrue(),
"Dependencies": ConsistOf(string(sleep.URN)),
Expand Down
Loading