diff --git a/crossplane/apiextensions_test.go b/crossplane/apiextensions_test.go index cfcb696..9f375a1 100644 --- a/crossplane/apiextensions_test.go +++ b/crossplane/apiextensions_test.go @@ -453,13 +453,11 @@ func TestCompositeResource(t *testing.T) { t.Fatalf("Create client: %v", err) } - // TODO(negz): Use the other provider-nop from contrib once it's ready. - // https://github.com/crossplane-contrib/provider-nop prv := &pkgv1.Provider{ ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, Spec: pkgv1.ProviderSpec{ PackageSpec: pkgv1.PackageSpec{ - Package: "negz/provider-nop:v0.1.0", + Package: "crossplane/provider-nop:main", IgnoreCrossplaneConstraints: pointer.BoolPtr(true), }, }, @@ -686,6 +684,20 @@ func TestCompositeResource(t *testing.T) { "apiVersion": "nop.crossplane.io/v1alpha1", "kind": "NopResource", "spec": { + "forProvider": { + "conditionAfter": [ + { + "conditionType": "Ready", + "conditionStatus": "True", + "time": "0s" + }, + { + "conditionType": "Synced", + "conditionStatus": "True", + "time": "0s" + } + ] + }, "writeConnectionSecretToRef": { "namespace": "%s" } diff --git a/crossplane/configuration_test.go b/crossplane/configuration_test.go index 93c6c74..89c5fc6 100644 --- a/crossplane/configuration_test.go +++ b/crossplane/configuration_test.go @@ -54,8 +54,7 @@ func TestConfiguration(t *testing.T) { }, } - // The crossplane-conformance provider depends on negz/provider-nop. - prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "negz-provider-nop"}} + prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-provider-nop"}} if err := kube.Create(ctx, cfg); err != nil { t.Fatalf("Create configuration %q: %v", cfg.GetName(), err) diff --git a/crossplane/provider_test.go b/crossplane/provider_test.go index 8623ad0..ad3f27b 100644 --- a/crossplane/provider_test.go +++ b/crossplane/provider_test.go @@ -42,13 +42,11 @@ func TestProvider(t *testing.T) { t.Fatalf("Create client: %v", err) } - // TODO(negz): Use the other provider-nop from contrib once it's ready. - // https://github.com/crossplane-contrib/provider-nop prv := &pkgv1.Provider{ ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, Spec: pkgv1.ProviderSpec{ PackageSpec: pkgv1.PackageSpec{ - Package: "negz/provider-nop:v0.1.0", + Package: "crossplane/provider-nop:main", IgnoreCrossplaneConstraints: pointer.BoolPtr(true), }, }, diff --git a/testdata/configuration/crossplane.yaml b/testdata/configuration/crossplane.yaml index e1042ef..63c4440 100644 --- a/testdata/configuration/crossplane.yaml +++ b/testdata/configuration/crossplane.yaml @@ -8,5 +8,5 @@ spec: crossplane: version: ">=v1.1.0" dependsOn: - - provider: negz/provider-nop - version: "v0.1.0" + - provider: crossplane/provider-nop + version: "main"