From 8342e74b6a3d9f8803105512a327c5c52a902331 Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Thu, 18 Apr 2024 15:29:05 +0300 Subject: [PATCH] CRD API conversion functions to convert between singleton list & embedded object API versions Signed-off-by: Alper Rifat Ulucinar --- config/provider.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/provider.go b/config/provider.go index f4dac4d..830fdbc 100644 --- a/config/provider.go +++ b/config/provider.go @@ -128,7 +128,7 @@ func bumpVersionsWithEmbeddedLists(pc *ujconfig.Provider) { for _, r := range pc.Resources { // nothing to do if no singleton list has been converted to // an embedded object - if len(r.ListConversionPaths()) == 0 { + if len(r.TFListConversionPaths()) == 0 { continue } r.Version = "v1beta2" diff --git a/go.mod b/go.mod index 33bf411..01f0816 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-20240417215530-f9c25a526a72 +replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240418122441-dd403782e619 diff --git a/go.sum b/go.sum index 47cc9fc..bb2ca43 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-20240417215530-f9c25a526a72 h1:F966gUbehd+x0JtPjfatWdAUWr5XdMplvH7xiAz5Zcg= -github.com/ulucinar/upbound-upjet v0.0.0-20240417215530-f9c25a526a72/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= +github.com/ulucinar/upbound-upjet v0.0.0-20240418122441-dd403782e619 h1:qoEC0FMZWB4ufGznaYkvVIyOxjeibddg9E2dJLG2nnw= +github.com/ulucinar/upbound-upjet v0.0.0-20240418122441-dd403782e619/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=