From d3c803e3f4639b6fad821380b9e082be6a5b8cb8 Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Fri, 19 Apr 2024 09:17:39 +0300 Subject: [PATCH] Disable import tests in non-storage (v1beta2) versions of {Location,AccessPolicy}.conditionalaccess example manifests. Signed-off-by: Alper Rifat Ulucinar --- examples/conditionalaccess/v1beta2/accesspolicy.yaml | 1 + examples/conditionalaccess/v1beta2/location.yaml | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/conditionalaccess/v1beta2/accesspolicy.yaml b/examples/conditionalaccess/v1beta2/accesspolicy.yaml index 4cea3a9..7b34ca9 100644 --- a/examples/conditionalaccess/v1beta2/accesspolicy.yaml +++ b/examples/conditionalaccess/v1beta2/accesspolicy.yaml @@ -6,6 +6,7 @@ apiVersion: conditionalaccess.azuread.upbound.io/v1beta2 kind: AccessPolicy metadata: annotations: + uptest.upbound.io/disable-import: "true" meta.upbound.io/example-id: conditionalaccess/v1beta1/accesspolicy labels: testing.upbound.io/example-name: example diff --git a/examples/conditionalaccess/v1beta2/location.yaml b/examples/conditionalaccess/v1beta2/location.yaml index 61dcd12..2f3d9be 100644 --- a/examples/conditionalaccess/v1beta2/location.yaml +++ b/examples/conditionalaccess/v1beta2/location.yaml @@ -6,6 +6,7 @@ apiVersion: conditionalaccess.azuread.upbound.io/v1beta2 kind: Location metadata: annotations: + uptest.upbound.io/disable-import: "true" meta.upbound.io/example-id: conditionalaccess/v1beta1/location labels: testing.upbound.io/example-name: example-ip diff --git a/go.mod b/go.mod index 707ff73..4d31f3f 100644 --- a/go.mod +++ b/go.mod @@ -151,4 +151,4 @@ replace github.com/hashicorp/terraform-provider-azuread => github.com/upbound/te replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 -replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240419053705-66007071bfaa +replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240419064735-9a128e98383d diff --git a/go.sum b/go.sum index 3ecb30d..8e8d23d 100644 --- a/go.sum +++ b/go.sum @@ -1178,8 +1178,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= -github.com/ulucinar/upbound-upjet v0.0.0-20240419053705-66007071bfaa h1:igwpWGAwx/39QS/ALZDa7/8rHn1YaWYmpT5rNZoarJA= -github.com/ulucinar/upbound-upjet v0.0.0-20240419053705-66007071bfaa/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= +github.com/ulucinar/upbound-upjet v0.0.0-20240419064735-9a128e98383d h1:WOw/5vF9l5y34YMvCm30qsfuNwPaCgkE6OsagqQw50o= +github.com/ulucinar/upbound-upjet v0.0.0-20240419064735-9a128e98383d/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= github.com/upbound/terraform-provider-azuread v0.0.0-20240311141618-ce1f46c21020 h1:BP26QEhnXcWxbJpbOT+e4bP+c9FTvqhGbtnkwXerOhA= github.com/upbound/terraform-provider-azuread v0.0.0-20240311141618-ce1f46c21020/go.mod h1:iVryf2s08Hi6HLHh4W40fudtInXuK5Y1cWVOM/3szT8= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=