diff --git a/go.mod b/go.mod index 2549cdcb1a..4e0d52b21d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/getkin/kin-openapi v0.111.0 github.com/google/go-cmp v0.6.0 github.com/hashicorp/go-hclog v1.5.0 - github.com/hashicorp/go-plugin v1.5.2 + github.com/hashicorp/go-plugin v1.6.0 github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/hc-install v0.6.0 github.com/hashicorp/hcl/v2 v2.18.0 @@ -14,8 +14,9 @@ require ( github.com/hashicorp/terraform-plugin-codegen-spec v0.1.0 github.com/hashicorp/terraform-plugin-docs v0.16.0 github.com/hashicorp/terraform-plugin-framework v1.4.2 - github.com/hashicorp/terraform-plugin-go v0.19.1 + github.com/hashicorp/terraform-plugin-go v0.20.0 github.com/hashicorp/terraform-plugin-log v0.9.0 + github.com/hashicorp/terraform-plugin-mux v0.13.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 github.com/jinzhu/copier v0.3.5 github.com/lmittmann/tint v1.0.3 @@ -59,7 +60,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect ) require ( @@ -125,13 +126,13 @@ require ( go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.11.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/grpc v1.59.0 + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/grpc v1.60.0 google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index eb597322f6..0d091d17b7 100644 --- a/go.sum +++ b/go.sum @@ -179,6 +179,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= +github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= +github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -202,8 +204,12 @@ github.com/hashicorp/terraform-plugin-framework v1.4.2 h1:P7a7VP1GZbjc4rv921Xy5O github.com/hashicorp/terraform-plugin-framework v1.4.2/go.mod h1:GWl3InPFZi2wVQmdVnINPKys09s9mLmTZr95/ngLnbY= github.com/hashicorp/terraform-plugin-go v0.19.1 h1:lf/jTGTeELcz5IIbn/94mJdmnTjRYm6S6ct/JqCSr50= github.com/hashicorp/terraform-plugin-go v0.19.1/go.mod h1:5NMIS+DXkfacX6o5HCpswda5yjkSYfKzn1Nfl9l+qRs= +github.com/hashicorp/terraform-plugin-go v0.20.0 h1:oqvoUlL+2EUbKNsJbIt3zqqZ7wi6lzn4ufkn/UA51xQ= +github.com/hashicorp/terraform-plugin-go v0.20.0/go.mod h1:Rr8LBdMlY53a3Z/HpP+ZU3/xCDqtKNCkeI9qOyT10QE= 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-mux v0.13.0 h1:79U401/3nd8CWwDGtTHc8F3miSCAS9XGtVarxSTDgwA= +github.com/hashicorp/terraform-plugin-mux v0.13.0/go.mod h1:Ndv0FtwDG2ogzH59y64f2NYimFJ6I0smRgFUKfm6dyQ= github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 h1:wcOKYwPI9IorAJEBLzgclh3xVolO7ZorYd6U1vnok14= github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0/go.mod h1:qH/34G25Ugdj5FcM95cSoXzUgIbgfhVLXCcEcYaMwq8= github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= @@ -429,6 +435,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -504,6 +512,8 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -511,6 +521,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -520,6 +532,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= +google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/internal/framework/codegen/tools/generator/examples/generate_configmap.hcl b/internal/framework/codegen/tools/generator/examples/generate_configmap.hcl index 6d847a60db..4065be0e70 100644 --- a/internal/framework/codegen/tools/generator/examples/generate_configmap.hcl +++ b/internal/framework/codegen/tools/generator/examples/generate_configmap.hcl @@ -9,9 +9,8 @@ resource "kubernetes_config_map_v1" { output_filename_prefix = "config_map" - tfplugingen_openapi { - openapi_spec_filename = "./codegen/data/kubernetes-v1.28.3/api/openapi-spec/v3/api__v1_openapi.json" - + openapi { + filename = "./codegen/data/kubernetes-v1.28.3/api/openapi-spec/v3/api__v1_openapi.json" create_path = "/api/v1/namespaces/{namespace}/configmaps" read_path = "/api/v1/namespaces/{namespace}/configmaps/{name}" } diff --git a/internal/framework/codegen/tools/generator/templates/resource.go.tpl b/internal/framework/codegen/tools/generator/templates/resource.go.tpl index 191e00d46a..c52f270b1d 100644 --- a/internal/framework/codegen/tools/generator/templates/resource.go.tpl +++ b/internal/framework/codegen/tools/generator/templates/resource.go.tpl @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-provider-kubernetes/framework/provider/client" + "github.com/hashicorp/terraform-provider-kubernetes/internal/framework/provider/client" ) // Ensure provider defined types fully satisfy framework interfaces. diff --git a/internal/framework/codegen/tools/generator/templates/resource_autocrud.go.tpl b/internal/framework/codegen/tools/generator/templates/resource_autocrud.go.tpl index 7e974be0f9..9231237c2c 100644 --- a/internal/framework/codegen/tools/generator/templates/resource_autocrud.go.tpl +++ b/internal/framework/codegen/tools/generator/templates/resource_autocrud.go.tpl @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-provider-kubernetes/framework/provider/autocrud" + "github.com/hashicorp/terraform-provider-kubernetes/internal/framework/provider/autocrud" ) func (r *{{ .ResourceConfig.Kind }}) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { diff --git a/internal/framework/codegen/tools/generator/templates/resources_list.go.tpl b/internal/framework/codegen/tools/generator/templates/resources_list.go.tpl index 896d253aab..e3c88f4ce8 100644 --- a/internal/framework/codegen/tools/generator/templates/resources_list.go.tpl +++ b/internal/framework/codegen/tools/generator/templates/resources_list.go.tpl @@ -1,4 +1,4 @@ -// Code generated by codegen/tools/generator; DO NOT EDIT +// Code generated by internal/framework/codegen; DO NOT EDIT // // This file contains the list of constructors for resources that have been autogenerated. // @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" {{ range $val := .Packages }} - "github.com/hashicorp/terraform-provider-kubernetes/framework/provider/{{ $val }}" + "github.com/hashicorp/terraform-provider-kubernetes/internal/framework/provider/{{ $val }}" {{- end }} ) diff --git a/internal/framework/provider/provider_configure.go b/internal/framework/provider/provider_configure.go index 25ec5f79cc..073d092360 100644 --- a/internal/framework/provider/provider_configure.go +++ b/internal/framework/provider/provider_configure.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/provider" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-provider-kubernetes/framework/provider/client" + "github.com/hashicorp/terraform-provider-kubernetes/internal/framework/provider/client" "github.com/hashicorp/terraform-plugin-log/tflog" diff --git a/internal/framework/provider/resources_list_gen.go b/internal/framework/provider/resources_list_gen.go index e427253e09..bcebf4bc3b 100755 --- a/internal/framework/provider/resources_list_gen.go +++ b/internal/framework/provider/resources_list_gen.go @@ -1,8 +1,8 @@ -// Code generated by tools/gen/schema_openapi_v3.go; DO NOT EDIT +// Code generated by internal/framework/codegen; DO NOT EDIT // // This file contains the list of constructors for resources that have been autogenerated. // -// This code was written by a robot on Nov 29, 2023 21:21:28 UTC. +// This code was written by a robot on Jan 09, 2024 13:07:02 UTC. package provider @@ -10,4 +10,5 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" ) -var generatedResources = []func() resource.Resource{} +var generatedResources = []func() resource.Resource{ +}