diff --git a/akp/data_source_akp_instance.go b/akp/data_source_akp_instance.go index 89fa4ef..6fbc669 100644 --- a/akp/data_source_akp_instance.go +++ b/akp/data_source_akp_instance.go @@ -274,13 +274,12 @@ func (d *AkpInstanceDataSource) Schema(ctx context.Context, req datasource.Schem MarkdownDescription: "In case some clusters don't have network access to your private Git provider you can delegate these operations to one specific cluster.", Computed: true, Attributes: map[string]schema.Attribute{ - "control_plane": schema.SingleNestedAttribute{ - MarkdownDescription: "Redundant. Always `null`", + "control_plane": schema.BoolAttribute{ + MarkdownDescription: "Use Control Plane", Computed: true, - Attributes: map[string]schema.Attribute{}, }, "managed_cluster": schema.SingleNestedAttribute{ - MarkdownDescription: "Cluster", + MarkdownDescription: "Use Managed Cluster", Computed: true, Attributes: map[string]schema.Attribute{ "cluster_name": schema.StringAttribute{ diff --git a/akp/data_source_akp_instances.go b/akp/data_source_akp_instances.go index eb5a5dd..4193d89 100644 --- a/akp/data_source_akp_instances.go +++ b/akp/data_source_akp_instances.go @@ -285,13 +285,12 @@ func (d *AkpInstancesDataSource) Schema(ctx context.Context, req datasource.Sche MarkdownDescription: "In case some clusters don't have network access to your private Git provider you can delegate these operations to one specific cluster.", Computed: true, Attributes: map[string]schema.Attribute{ - "control_plane": schema.SingleNestedAttribute{ - MarkdownDescription: "Redundant. Always `null`", + "control_plane": schema.BoolAttribute{ + MarkdownDescription: "Use Control Plane", Computed: true, - Attributes: map[string]schema.Attribute{}, }, "managed_cluster": schema.SingleNestedAttribute{ - MarkdownDescription: "Cluster", + MarkdownDescription: "Use Managed Cluster", Computed: true, Attributes: map[string]schema.Attribute{ "cluster_name": schema.StringAttribute{ diff --git a/akp/resource_akp_instance_schema.go b/akp/resource_akp_instance_schema.go index 94bfbc6..022a4de 100644 --- a/akp/resource_akp_instance_schema.go +++ b/akp/resource_akp_instance_schema.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/types" @@ -300,15 +299,12 @@ func (r *AkpInstanceResource) Schema(ctx context.Context, req resource.SchemaReq MarkdownDescription: "In case some clusters don't have network access to your private Git provider you can delegate these operations to one specific cluster.", Optional: true, Attributes: map[string]schema.Attribute{ - "control_plane": schema.SingleNestedAttribute{ - MarkdownDescription: "Redundant. Always `null`", - Computed: true, - PlanModifiers: []planmodifier.Object{ - objectplanmodifier.UseStateForUnknown(), - }, + "control_plane": schema.BoolAttribute{ + MarkdownDescription: "Use Control Plane", + Required: true, }, "managed_cluster": schema.SingleNestedAttribute{ - MarkdownDescription: "Cluster", + MarkdownDescription: "Use Managed Cluster", Optional: true, Attributes: map[string]schema.Attribute{ "cluster_name": schema.StringAttribute{ diff --git a/akp/types/reposerver_controlplane.go b/akp/types/reposerver_controlplane.go deleted file mode 100644 index 3db29cb..0000000 --- a/akp/types/reposerver_controlplane.go +++ /dev/null @@ -1,34 +0,0 @@ -package types - -import ( - argocdv1 "github.com/akuity/api-client-go/pkg/api/gen/argocd/v1" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/diag" -) - -type AkpRepoServerDelegateControlPlane struct {} - -var ( - repoServerDelegateControlPlanerAttrTypes = map[string]attr.Type{} -) - -func MergeRepoServerDelegateControlPlane(state *AkpRepoServerDelegateControlPlane, plan *AkpRepoServerDelegateControlPlane) (*AkpRepoServerDelegateControlPlane, diag.Diagnostics) { - diags := diag.Diagnostics{} - res := &AkpRepoServerDelegateControlPlane{} - - return res, diags -} - -func (x *AkpRepoServerDelegateControlPlane) UpdateObject(p *argocdv1.RepoServerDelegateControlPlane) diag.Diagnostics { - diags := diag.Diagnostics{} - if p == nil { - diags.AddError("Conversion Error", "*argocdv1.RepoServerDelegateControlPlane is ") - } - return diags -} - -func (x *AkpRepoServerDelegateControlPlane) As(target *argocdv1.RepoServerDelegateControlPlane) diag.Diagnostics { - diags := diag.Diagnostics{} - target = nil - return diags -} diff --git a/akp/types/reposerver_delegate.go b/akp/types/reposerver_delegate.go index e17991a..27480f3 100644 --- a/akp/types/reposerver_delegate.go +++ b/akp/types/reposerver_delegate.go @@ -11,15 +11,13 @@ import ( ) type AkpRepoServerDelegate struct { - ControlPlane types.Object `tfsdk:"control_plane"` + ControlPlane types.Bool `tfsdk:"control_plane"` ManagedCluster types.Object `tfsdk:"managed_cluster"` } var ( repoServerDelegateAttrTypes = map[string]attr.Type{ - "control_plane": types.ObjectType{ - AttrTypes: repoServerDelegateControlPlanerAttrTypes, - }, + "control_plane": types.BoolType, "managed_cluster": types.ObjectType{ AttrTypes: repoServerDelegateManagedClusterAttrTypes, }, @@ -33,17 +31,9 @@ func MergeRepoServerDelegate(state *AkpRepoServerDelegate, plan *AkpRepoServerDe if plan.ControlPlane.IsUnknown() { res.ControlPlane = state.ControlPlane } else if plan.ControlPlane.IsNull() { - res.ControlPlane = types.ObjectNull(repoServerDelegateControlPlanerAttrTypes) + res.ControlPlane = types.BoolNull() } else { - var stateRepoServerDelegateCP, planRepoServerDelegateCP AkpRepoServerDelegateControlPlane - diags.Append(state.ControlPlane.As(context.Background(), &stateRepoServerDelegateCP, basetypes.ObjectAsOptions{ - UnhandledNullAsEmpty: true, - })...) - diags.Append(plan.ControlPlane.As(context.Background(), &planRepoServerDelegateCP, basetypes.ObjectAsOptions{})...) - resRepoServerDelegateCP, d := MergeRepoServerDelegateControlPlane(&stateRepoServerDelegateCP, &planRepoServerDelegateCP) - diags.Append(d...) - res.ControlPlane, d = types.ObjectValueFrom(context.Background(), repoServerDelegateControlPlanerAttrTypes, resRepoServerDelegateCP) - diags.Append(d...) + res.ControlPlane = plan.ControlPlane } if plan.ManagedCluster.IsUnknown() { @@ -72,15 +62,7 @@ func (x *AkpRepoServerDelegate) UpdateObject(p *argocdv1.RepoServerDelegate) dia diags.AddError("Conversion Error", "*argocdv1.RepoServerDelegate is ") return diags } - - if p.ControlPlane == nil || p.ControlPlane.String() == "" { - x.ControlPlane = types.ObjectNull(repoServerDelegateControlPlanerAttrTypes) - } else { - controlPlaneObject := &AkpRepoServerDelegateControlPlane{} - diags.Append(controlPlaneObject.UpdateObject(p.ControlPlane)...) - x.ControlPlane, d = types.ObjectValueFrom(context.Background(), repoServerDelegateControlPlanerAttrTypes, controlPlaneObject) - diags.Append(d...) - } + x.ControlPlane = types.BoolValue(p.ControlPlane) if p.ManagedCluster == nil || p.ManagedCluster.String() == "" { x.ManagedCluster = types.ObjectNull(repoServerDelegateManagedClusterAttrTypes) @@ -98,20 +80,16 @@ func (x *AkpRepoServerDelegate) As(target *argocdv1.RepoServerDelegate) diag.Dia diags := diag.Diagnostics{} if x.ControlPlane.IsNull() { - target.ControlPlane = nil + target.ControlPlane = false } else if !x.ControlPlane.IsUnknown() { - controlPlane := AkpRepoServerDelegateControlPlane{} - targetControlPlane := argocdv1.RepoServerDelegateControlPlane{} - diags.Append(x.ControlPlane.As(context.Background(), &controlPlane, basetypes.ObjectAsOptions{})...) - diags.Append(controlPlane.As(&targetControlPlane)...) - target.ControlPlane = &targetControlPlane + target.ControlPlane = x.ControlPlane.ValueBool() } if x.ManagedCluster.IsNull() { target.ManagedCluster = nil } else if !x.ManagedCluster.IsUnknown() { managedCluster := AkpRepoServerDelegateManagedCluster{} - targetManagedCluster := argocdv1.RepoServerDelegateManagedCluster{} + targetManagedCluster := argocdv1.ManagedCluster{} diags.Append(x.ManagedCluster.As(context.Background(), managedCluster, basetypes.ObjectAsOptions{})...) diags.Append(managedCluster.As(&targetManagedCluster)...) target.ManagedCluster = &targetManagedCluster diff --git a/akp/types/reposerver_managedcluster.go b/akp/types/reposerver_managedcluster.go index 303b039..63ad999 100644 --- a/akp/types/reposerver_managedcluster.go +++ b/akp/types/reposerver_managedcluster.go @@ -8,7 +8,7 @@ import ( ) type AkpRepoServerDelegateManagedCluster struct { - ClusterName types.String `tfsdk:"cluster_name"` + ClusterName types.String `tfsdk:"cluster_name"` } var ( @@ -32,7 +32,7 @@ func MergeRepoServerDelegateManagedCluster(state *AkpRepoServerDelegateManagedCl return res, diags } -func (x *AkpRepoServerDelegateManagedCluster) UpdateObject(p *argocdv1.RepoServerDelegateManagedCluster) diag.Diagnostics { +func (x *AkpRepoServerDelegateManagedCluster) UpdateObject(p *argocdv1.ManagedCluster) diag.Diagnostics { diags := diag.Diagnostics{} if p == nil { diags.AddError("Conversion Error", "*argocdv1.RepoServerDelegateManagedCluster is ") @@ -46,7 +46,7 @@ func (x *AkpRepoServerDelegateManagedCluster) UpdateObject(p *argocdv1.RepoServe return diags } -func (x *AkpRepoServerDelegateManagedCluster) As(target *argocdv1.RepoServerDelegateManagedCluster) diag.Diagnostics { +func (x *AkpRepoServerDelegateManagedCluster) As(target *argocdv1.ManagedCluster) diag.Diagnostics { diags := diag.Diagnostics{} target.ClusterName = x.ClusterName.ValueString() return diags diff --git a/docs/data-sources/instance.md b/docs/data-sources/instance.md index b0cb6be..189dd81 100644 --- a/docs/data-sources/instance.md +++ b/docs/data-sources/instance.md @@ -192,12 +192,8 @@ Read-Only: Read-Only: -- `control_plane` (Attributes) Redundant. Always `null` (see [below for nested schema](#nestedatt--repo_server_delegate--control_plane)) -- `managed_cluster` (Attributes) Cluster (see [below for nested schema](#nestedatt--repo_server_delegate--managed_cluster)) - - -### Nested Schema for `repo_server_delegate.control_plane` - +- `control_plane` (Boolean) Use Control Plane +- `managed_cluster` (Attributes) Use Managed Cluster (see [below for nested schema](#nestedatt--repo_server_delegate--managed_cluster)) ### Nested Schema for `repo_server_delegate.managed_cluster` diff --git a/docs/data-sources/instances.md b/docs/data-sources/instances.md index 956c13e..f308983 100644 --- a/docs/data-sources/instances.md +++ b/docs/data-sources/instances.md @@ -195,12 +195,8 @@ Read-Only: Read-Only: -- `control_plane` (Attributes) Redundant. Always `null` (see [below for nested schema](#nestedatt--instances--repo_server_delegate--control_plane)) -- `managed_cluster` (Attributes) Cluster (see [below for nested schema](#nestedatt--instances--repo_server_delegate--managed_cluster)) - - -### Nested Schema for `instances.repo_server_delegate.control_plane` - +- `control_plane` (Boolean) Use Control Plane +- `managed_cluster` (Attributes) Use Managed Cluster (see [below for nested schema](#nestedatt--instances--repo_server_delegate--managed_cluster)) ### Nested Schema for `instances.repo_server_delegate.managed_cluster` diff --git a/docs/resources/instance.md b/docs/resources/instance.md index d425784..dfb524c 100644 --- a/docs/resources/instance.md +++ b/docs/resources/instance.md @@ -233,13 +233,13 @@ Required: ### Nested Schema for `repo_server_delegate` -Optional: +Required: -- `managed_cluster` (Attributes) Cluster (see [below for nested schema](#nestedatt--repo_server_delegate--managed_cluster)) +- `control_plane` (Boolean) Use Control Plane -Read-Only: +Optional: -- `control_plane` (Attributes) Redundant. Always `null` (see [below for nested schema](#nestedatt--repo_server_delegate--control_plane)) +- `managed_cluster` (Attributes) Use Managed Cluster (see [below for nested schema](#nestedatt--repo_server_delegate--managed_cluster)) ### Nested Schema for `repo_server_delegate.managed_cluster` @@ -249,10 +249,6 @@ Required: - `cluster_name` (String) Cluster Name - -### Nested Schema for `repo_server_delegate.control_plane` - - ### Nested Schema for `resource_settings` diff --git a/go.mod b/go.mod index 6c560cb..a5d1526 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,25 @@ module github.com/akuity/terraform-provider-akp go 1.19 require ( - github.com/akuity/api-client-go v0.4.0 - github.com/hashicorp/terraform-plugin-docs v0.13.0 + github.com/akuity/api-client-go v0.5.0 + github.com/hashicorp/terraform-plugin-docs v0.14.1 github.com/hashicorp/terraform-plugin-framework v1.1.1 github.com/hashicorp/terraform-plugin-go v0.14.3 github.com/hashicorp/terraform-plugin-log v0.8.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.25.0 - k8s.io/apimachinery v0.26.1 - k8s.io/cli-runtime v0.26.1 - k8s.io/client-go v0.26.1 - k8s.io/kubectl v0.26.1 + k8s.io/apimachinery v0.26.2 + k8s.io/cli-runtime v0.26.2 + k8s.io/client-go v0.26.2 + k8s.io/kubectl v0.26.2 ) -require golang.org/x/mod v0.7.0 // indirect +require golang.org/x/mod v0.9.0 // indirect require ( github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect - github.com/emicklei/go-restful/v3 v3.10.1 // indirect + github.com/emicklei/go-restful/v3 v3.10.2 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect github.com/fatih/camelcase v1.0.0 // indirect @@ -58,8 +58,8 @@ require ( golang.org/x/time v0.3.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.26.1 // indirect - k8s.io/component-base v0.26.1 // indirect + k8s.io/api v0.26.2 // indirect + k8s.io/component-base v0.26.2 // indirect k8s.io/klog/v2 v2.80.1 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect @@ -104,7 +104,7 @@ require ( github.com/hashicorp/hc-install v0.5.0 // indirect github.com/hashicorp/hcl/v2 v2.16.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.17.3 // indirect + github.com/hashicorp/terraform-exec v0.18.1 // indirect github.com/hashicorp/terraform-json v0.15.0 // indirect github.com/hashicorp/terraform-registry-address v0.1.0 // indirect github.com/hashicorp/terraform-svchost v0.1.0 // indirect @@ -134,7 +134,7 @@ require ( github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect - github.com/zclconf/go-cty v1.12.1 // indirect + github.com/zclconf/go-cty v1.13.0 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 // indirect diff --git a/go.sum b/go.sum index c9e958d..1e0a6a3 100644 --- a/go.sum +++ b/go.sum @@ -23,10 +23,8 @@ github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/akuity/api-client-go v0.3.0 h1:w1jq4FlCuCkbq+BD00Tt2+IOQqSZB2MIuIQ6ks5hctg= -github.com/akuity/api-client-go v0.3.0/go.mod h1:r8hrBcOts2GLOZ928LQVNFQyf+0ZywPNd1QM87jxvXI= -github.com/akuity/api-client-go v0.4.0 h1:CXo3z6+IHntHXPI392QcWh+e8HW8/AGVulvLerqvk7U= -github.com/akuity/api-client-go v0.4.0/go.mod h1:r8hrBcOts2GLOZ928LQVNFQyf+0ZywPNd1QM87jxvXI= +github.com/akuity/api-client-go v0.5.0 h1:zAB9SH5lW0ntD6FEmNqCO9r/rdhQajmu3u46Ok2WK+4= +github.com/akuity/api-client-go v0.5.0/go.mod h1:r8hrBcOts2GLOZ928LQVNFQyf+0ZywPNd1QM87jxvXI= github.com/alevinval/sse v1.0.1 h1:cFubh2lMNdHT6niFLCsyTuhAgljaAWbdmceAe6qPIfo= github.com/alevinval/sse v1.0.1/go.mod h1:Bvl1EawUlmW1y1vSU5uDl03+1Zsqqz/+6D2PAUvftcw= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= @@ -64,6 +62,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= +github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -204,12 +204,12 @@ github.com/hashicorp/hcl/v2 v2.16.1 h1:BwuxEMD/tsYgbhIW7UuI3crjovf3MzuFWiVgiv57i github.com/hashicorp/hcl/v2 v2.16.1/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= 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.17.3 h1:MX14Kvnka/oWGmIkyuyvL6POx25ZmKrjlaclkx3eErU= -github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI= +github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= +github.com/hashicorp/terraform-exec v0.18.1/go.mod h1:58wg4IeuAJ6LVsLUeD2DWZZoc/bYi6dzhLHzxM41980= github.com/hashicorp/terraform-json v0.15.0 h1:/gIyNtR6SFw6h5yzlbDbACyGvIhKtQi8mTsbkNd79lE= github.com/hashicorp/terraform-json v0.15.0/go.mod h1:+L1RNzjDU5leLFZkHTFTbJXaoqUC6TqXlFgDoOXrtvk= -github.com/hashicorp/terraform-plugin-docs v0.13.0 h1:6e+VIWsVGb6jYJewfzq2ok2smPzZrt1Wlm9koLeKazY= -github.com/hashicorp/terraform-plugin-docs v0.13.0/go.mod h1:W0oCmHAjIlTHBbvtppWHe8fLfZ2BznQbuv8+UD8OucQ= +github.com/hashicorp/terraform-plugin-docs v0.14.1 h1:MikFi59KxrP/ewrZoaowrB9he5Vu4FtvhamZFustiA4= +github.com/hashicorp/terraform-plugin-docs v0.14.1/go.mod h1:k2NW8+t113jAus6bb5tQYQgEAX/KueE/u8X2Z45V1GM= github.com/hashicorp/terraform-plugin-framework v1.1.1 h1:PbnEKHsIU8KTTzoztHQGgjZUWx7Kk8uGtpGMMc1p+oI= github.com/hashicorp/terraform-plugin-framework v1.1.1/go.mod h1:DyZPxQA+4OKK5ELxFIIcqggcszqdWWUpTLPHAhS/tkY= github.com/hashicorp/terraform-plugin-go v0.14.3 h1:nlnJ1GXKdMwsC8g1Nh05tK2wsC3+3BL/DBBxFEki+j0= @@ -388,8 +388,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY= -github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA= +github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0= +github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20230128213706-3f75dec8e403 h1:jPeC7Exc+m8OBJUlWbBLh0O5UZPM7yU5W4adnhhbG4U= @@ -416,8 +416,9 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -578,22 +579,22 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= -k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= -k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= -k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= -k8s.io/cli-runtime v0.26.1 h1:f9+bRQ1V3elQsx37KmZy5fRAh56mVLbE9A7EMdlqVdI= -k8s.io/cli-runtime v0.26.1/go.mod h1:+e5Ym/ARySKscUhZ8K3hZ+ZBo/wYPIcg+7b5sFYi6Gg= -k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= -k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= -k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= -k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= +k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ= +k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= +k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ= +k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= +k8s.io/cli-runtime v0.26.2 h1:6XcIQOYW1RGNwFgRwejvyUyAojhToPmJLGr0JBMC5jw= +k8s.io/cli-runtime v0.26.2/go.mod h1:U7sIXX7n6ZB+MmYQsyJratzPeJwgITqrSlpr1a5wM5I= +k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI= +k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= +k8s.io/component-base v0.26.2 h1:IfWgCGUDzrD6wLLgXEstJKYZKAFS2kO+rBRi0p3LqcI= +k8s.io/component-base v0.26.2/go.mod h1:DxbuIe9M3IZPRxPIzhch2m1eT7uFrSBJUBuVCQEBivs= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kubectl v0.26.1 h1:K8A0Jjlwg8GqrxOXxAbjY5xtmXYeYjLU96cHp2WMQ7s= -k8s.io/kubectl v0.26.1/go.mod h1:miYFVzldVbdIiXMrHZYmL/EDWwJKM+F0sSsdxsATFPo= +k8s.io/kubectl v0.26.2 h1:SMPB4j48eVFxsYluBq3VLyqXtE6b72YnszkbTAtFye4= +k8s.io/kubectl v0.26.2/go.mod h1:KYWOXSwp2BrDn3kPeoU/uKzKtdqvhK1dgZGd0+no4cM= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=