From 28679509ad13bf86efc88f9fe95afe7ea1122aea Mon Sep 17 00:00:00 2001 From: Nicholas Wiersma Date: Wed, 19 Jun 2024 11:34:33 +0200 Subject: [PATCH] fix: issue with datasources (#27) --- ec/armada/data_source_armada.go | 4 ++- ec/armada/data_source_armada_test.go | 15 ++++++---- ec/armada/data_source_armadaset.go | 4 ++- ec/armada/data_source_armadaset_test.go | 15 ++++++---- ec/core/data_source_core_region.go | 4 ++- ec/core/data_source_core_region_test.go | 15 ++++++---- go.mod | 20 ++++++------- go.sum | 40 ++++++++++++------------- 8 files changed, 69 insertions(+), 48 deletions(-) diff --git a/ec/armada/data_source_armada.go b/ec/armada/data_source_armada.go index d0061d8..8d1a0c1 100644 --- a/ec/armada/data_source_armada.go +++ b/ec/armada/data_source_armada.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/nitrado/terraform-provider-ec/ec" ) // DataSourceArmada returns the data source resource for an Armada. @@ -18,7 +19,8 @@ func DataSourceArmada() *schema.Resource { func dataSourceArmadaRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { name := d.Get("metadata.0.name").(string) - d.SetId(name) + env := d.Get("metadata.0.environment").(string) + d.SetId(ec.ScopedName(env, name)) return resourceArmadaRead(ctx, d, m) } diff --git a/ec/armada/data_source_armada_test.go b/ec/armada/data_source_armada_test.go index 0371847..50c327f 100644 --- a/ec/armada/data_source_armada_test.go +++ b/ec/armada/data_source_armada_test.go @@ -10,6 +10,7 @@ import ( func TestDataSourceArmadas(t *testing.T) { name := "my-armada" + env := "dflt" pf, _ := providertest.SetupProviderFactories(t) resource.Test(t, resource.TestCase{ @@ -17,9 +18,10 @@ func TestDataSourceArmadas(t *testing.T) { ProviderFactories: pf, Steps: []resource.TestStep{ { - Config: testDataSourceArmadasConfigBasic(name), + Config: testDataSourceArmadasConfigBasic(name, env), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ec_armada_armada.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("ec_armada_armada.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("ec_armada_armada.test", "spec.#", "1"), resource.TestCheckResourceAttr("ec_armada_armada.test", "spec.0.description", "My Armada"), resource.TestCheckResourceAttr("ec_armada_armada.test", "spec.0.region", "eu"), @@ -35,10 +37,11 @@ func TestDataSourceArmadas(t *testing.T) { ), }, { - Config: testDataSourceArmadasConfigBasic(name) + + Config: testDataSourceArmadasConfigBasic(name, env) + testDataSourceArmadaConfigRead(), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.ec_armada_armada.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("data.ec_armada_armada.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("data.ec_armada_armada.test", "spec.#", "1"), resource.TestCheckResourceAttr("data.ec_armada_armada.test", "spec.0.description", "My Armada"), resource.TestCheckResourceAttr("data.ec_armada_armada.test", "spec.0.region", "eu"), @@ -57,10 +60,11 @@ func TestDataSourceArmadas(t *testing.T) { }) } -func testDataSourceArmadasConfigBasic(name string) string { +func testDataSourceArmadasConfigBasic(name, env string) string { return fmt.Sprintf(`resource "ec_armada_armada" "test" { metadata { name = "%s" + environment = "%s" } spec { description = "My Armada" @@ -87,13 +91,14 @@ func testDataSourceArmadasConfigBasic(name string) string { } } } -`, name) +`, name, env) } func testDataSourceArmadaConfigRead() string { return `data "ec_armada_armada" "test" { metadata { - name = "${ec_armada_armada.test.metadata.0.name}" + name = "${ec_armada_armada.test.metadata.0.name}" + environment = "${ec_armada_armada.test.metadata.0.environment}" } } ` diff --git a/ec/armada/data_source_armadaset.go b/ec/armada/data_source_armadaset.go index bb97204..589bff2 100644 --- a/ec/armada/data_source_armadaset.go +++ b/ec/armada/data_source_armadaset.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/nitrado/terraform-provider-ec/ec" ) // DataSourceArmadaSet returns the data source resource for an ArmadaSet. @@ -18,7 +19,8 @@ func DataSourceArmadaSet() *schema.Resource { func dataSourceArmadaSetRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { name := d.Get("metadata.0.name").(string) - d.SetId(name) + env := d.Get("metadata.0.environment").(string) + d.SetId(ec.ScopedName(env, name)) return resourceArmadaSetRead(ctx, d, m) } diff --git a/ec/armada/data_source_armadaset_test.go b/ec/armada/data_source_armadaset_test.go index 41f2fd6..e570e30 100644 --- a/ec/armada/data_source_armadaset_test.go +++ b/ec/armada/data_source_armadaset_test.go @@ -10,6 +10,7 @@ import ( func TestDataSourceArmadaSets(t *testing.T) { name := "my-armadaset" + env := "dflt" pf, _ := providertest.SetupProviderFactories(t) resource.Test(t, resource.TestCase{ @@ -17,9 +18,10 @@ func TestDataSourceArmadaSets(t *testing.T) { ProviderFactories: pf, Steps: []resource.TestStep{ { - Config: testDataSourceArmadaSetsConfigBasic(name), + Config: testDataSourceArmadaSetsConfigBasic(name, env), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ec_armada_armadaset.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("ec_armada_armadaset.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("ec_armada_armadaset.test", "spec.#", "1"), resource.TestCheckResourceAttr("ec_armada_armadaset.test", "spec.0.description", "My ArmadaSet"), resource.TestCheckResourceAttr("ec_armada_armadaset.test", "spec.0.armadas.0.region", "eu"), @@ -35,10 +37,11 @@ func TestDataSourceArmadaSets(t *testing.T) { ), }, { - Config: testDataSourceArmadaSetsConfigBasic(name) + + Config: testDataSourceArmadaSetsConfigBasic(name, env) + testDataSourceArmadaSetConfigRead(), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.ec_armada_armadaset.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("data.ec_armada_armadaset.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("data.ec_armada_armadaset.test", "spec.#", "1"), resource.TestCheckResourceAttr("data.ec_armada_armadaset.test", "spec.0.description", "My ArmadaSet"), resource.TestCheckResourceAttr("data.ec_armada_armadaset.test", "spec.0.armadas.0.region", "eu"), @@ -57,10 +60,11 @@ func TestDataSourceArmadaSets(t *testing.T) { }) } -func testDataSourceArmadaSetsConfigBasic(name string) string { +func testDataSourceArmadaSetsConfigBasic(name, env string) string { return fmt.Sprintf(`resource "ec_armada_armadaset" "test" { metadata { name = "%s" + environment = "%s" } spec { description = "My ArmadaSet" @@ -90,13 +94,14 @@ func testDataSourceArmadaSetsConfigBasic(name string) string { } } } -`, name) +`, name, env) } func testDataSourceArmadaSetConfigRead() string { return `data "ec_armada_armadaset" "test" { metadata { - name = "${ec_armada_armadaset.test.metadata.0.name}" + name = "${ec_armada_armadaset.test.metadata.0.name}" + environment = "${ec_armada_armadaset.test.metadata.0.environment}" } } ` diff --git a/ec/core/data_source_core_region.go b/ec/core/data_source_core_region.go index 4deee98..fa94901 100644 --- a/ec/core/data_source_core_region.go +++ b/ec/core/data_source_core_region.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/nitrado/terraform-provider-ec/ec" ) // DataSourceRegion returns the data source resource for a Region. @@ -18,7 +19,8 @@ func DataSourceRegion() *schema.Resource { func dataSourceRegionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { name := d.Get("metadata.0.name").(string) - d.SetId(name) + env := d.Get("metadata.0.environment").(string) + d.SetId(ec.ScopedName(env, name)) return resourceRegionRead(ctx, d, m) } diff --git a/ec/core/data_source_core_region_test.go b/ec/core/data_source_core_region_test.go index 4497ed6..7efc075 100644 --- a/ec/core/data_source_core_region_test.go +++ b/ec/core/data_source_core_region_test.go @@ -10,6 +10,7 @@ import ( func TestDataSourceRegions(t *testing.T) { name := "my-region" + env := "dflt" pf, _ := providertest.SetupProviderFactories(t) resource.Test(t, resource.TestCase{ @@ -17,9 +18,10 @@ func TestDataSourceRegions(t *testing.T) { ProviderFactories: pf, Steps: []resource.TestStep{ { - Config: testDataSourceRegionsConfigBasic(name), + Config: testDataSourceRegionsConfigBasic(name, env), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ec_core_region.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("ec_core_region.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("ec_core_region.test", "spec.#", "1"), resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.description", "My Region"), resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.#", "1"), @@ -30,10 +32,11 @@ func TestDataSourceRegions(t *testing.T) { ), }, { - Config: testDataSourceRegionsConfigBasic(name) + + Config: testDataSourceRegionsConfigBasic(name, env) + testDataSourceRegionConfigRead(), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("data.ec_core_region.test", "metadata.0.name", name), + resource.TestCheckResourceAttr("data.ec_core_region.test", "metadata.0.environment", env), resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.#", "1"), resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.description", "My Region"), resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.#", "1"), @@ -47,10 +50,11 @@ func TestDataSourceRegions(t *testing.T) { }) } -func testDataSourceRegionsConfigBasic(name string) string { +func testDataSourceRegionsConfigBasic(name, env string) string { return fmt.Sprintf(`resource "ec_core_region" "test" { metadata { name = "%s" + environment = "%s" } spec { description = "My Region" @@ -60,13 +64,14 @@ func testDataSourceRegionsConfigBasic(name string) string { } } } -`, name) +`, name, env) } func testDataSourceRegionConfigRead() string { return `data "ec_core_region" "test" { metadata { - name = "${ec_core_region.test.metadata.0.name}" + name = "${ec_core_region.test.metadata.0.name}" + environment = "${ec_core_region.test.metadata.0.environment}" } } ` diff --git a/go.mod b/go.mod index c1bc6ec..3c66eff 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,13 @@ toolchain go1.22.2 require ( github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 github.com/hashicorp/terraform-plugin-docs v0.19.0 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 - github.com/nitrado/tfconv v1.0.1 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 + github.com/nitrado/tfconv v1.0.2 github.com/stretchr/testify v1.9.0 gitlab.com/nitrado/b2b/ec/apicore v1.1.1-0.20240411073311-1090e61b9b5e gitlab.com/nitrado/b2b/ec/core v0.7.0 golang.org/x/oauth2 v0.19.0 - k8s.io/apimachinery v0.29.3 + k8s.io/apimachinery v0.29.5 ) require ( @@ -64,9 +64,9 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.20.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.20.0 // indirect - github.com/hashicorp/terraform-json v0.21.0 // indirect - github.com/hashicorp/terraform-plugin-go v0.22.1 // indirect + github.com/hashicorp/terraform-exec v0.21.0 // indirect + github.com/hashicorp/terraform-json v0.22.1 // indirect + github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect @@ -115,19 +115,19 @@ require ( go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.22.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.20.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 544e537..d8ff6a0 100644 --- a/go.sum +++ b/go.sum @@ -255,18 +255,18 @@ github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdx github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo= -github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw= -github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= -github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= +github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= +github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= +github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= +github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= github.com/hashicorp/terraform-plugin-docs v0.19.0 h1:ufXLte5Kx20LazYmGN2UZG2bN4aF0PmlDyuS1iKWSXo= github.com/hashicorp/terraform-plugin-docs v0.19.0/go.mod h1:NPfKCSfzTtq+YCFHr2qTAMknWUxR8C4KgTbGkHULSV8= -github.com/hashicorp/terraform-plugin-go v0.22.1 h1:iTS7WHNVrn7uhe3cojtvWWn83cm2Z6ryIUDTRO0EV7w= -github.com/hashicorp/terraform-plugin-go v0.22.1/go.mod h1:qrjnqRghvQ6KnDbB12XeZ4FluclYwptntoWCr9QaXTI= +github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co= +github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ= github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 h1:kJiWGx2kiQVo97Y5IOGR4EMcZ8DtMswHhUuFibsCQQE= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0/go.mod h1:sl/UoabMc37HA6ICVMmGO+/0wofkVIRxf+BMb/dnoIg= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= @@ -341,8 +341,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nitrado/tfconv v1.0.1 h1:rxPJhqr+FfHsd+sN5RUkBiJ27PlAO73BclXs1deN6MY= -github.com/nitrado/tfconv v1.0.1/go.mod h1:ErlN9bZwMFa3Qofjkg76blrQ2JfS+hVB6FWRFReWSsQ= +github.com/nitrado/tfconv v1.0.2 h1:iZcuOa8vuTzfPAAiwh+IcMtI+i7fibeZ7UGyZJNU4HA= +github.com/nitrado/tfconv v1.0.2/go.mod h1:SrVyNyhOJWSulv48Yhs9JspK+QNZW7k+f7nxVdLZjoU= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= @@ -453,8 +453,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -601,8 +601,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -616,8 +616,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -775,8 +775,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= +google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -806,8 +806,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= -k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= -k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/apimachinery v0.29.5 h1:Hofa2BmPfpoT+IyDTlcPdCHSnHtEQMoJYGVoQpRTfv4= +k8s.io/apimachinery v0.29.5/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=