diff --git a/assets/pango/client.go b/assets/pango/client.go index d174b8e0..d89f1c66 100644 --- a/assets/pango/client.go +++ b/assets/pango/client.go @@ -654,6 +654,58 @@ func (c *Client) RequestPasswordHash(ctx context.Context, v string) (string, err return ans.Hash, nil } +// Generate API Key for the provided username/password pair. +// +// Generation of the API Key will also invalidate the existing key for the given user. +func (c *Client) GenerateApiKey(ctx context.Context, username string, password string) (string, error) { + if username == "" || password == "" { + return "", fmt.Errorf("username and password cannot be empty") + } + + data := url.Values{} + data.Set("user", username) + data.Set("password", password) + + url := fmt.Sprintf("%s/?type=keygen", c.api_url) + request, err := http.NewRequestWithContext(ctx, "POST", url, strings.NewReader(data.Encode())) + if err != nil { + return "", err + } + + request.Header.Add("Content-Type", "application/x-www-form-urlencoded") + + resp, err := c.con.Do(request) + if err != nil { + return "", err + } + + defer resp.Body.Close() + + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + return "", err + } + + if resp.StatusCode != http.StatusOK { + err := fmt.Errorf("server returned an error when generating API Key: %s", string(bodyBytes)) + return "", err + } + + type xmlResponse struct { + XMLName xml.Name `xml:"response"` + Key string `xml:"result>key"` + } + + response := &xmlResponse{} + err = xml.Unmarshal(bodyBytes, &response) + if err != nil { + return "", err + } + + return response.Key, nil + +} + // ValidateConfig performs a commit config validation check. // // Use WaitForJob and the uint returned from this function to get the diff --git a/assets/pango/util/pangoclient.go b/assets/pango/util/pangoclient.go index f0ee26e7..627f3521 100644 --- a/assets/pango/util/pangoclient.go +++ b/assets/pango/util/pangoclient.go @@ -38,6 +38,7 @@ type PangoClient interface { ExportFile(context.Context, *xmlapi.Export, any) (string, []byte, *http.Response, error) // Operational functions in use by one or more resources / data sources / namespaces. + GenerateApiKey(context.Context, string, string) (string, error) RequestPasswordHash(context.Context, string) (string, error) GetTechSupportFile(context.Context) (string, []byte, error) } diff --git a/assets/terraform/go.mod b/assets/terraform/go.mod index 9f009a4a..93837e45 100644 --- a/assets/terraform/go.mod +++ b/assets/terraform/go.mod @@ -6,92 +6,71 @@ toolchain go1.23.3 require ( github.com/PaloAltoNetworks/pango v0.10.3-0.20240408115758-216d8509e7cf - github.com/hashicorp/terraform-plugin-framework v1.12.0 - github.com/hashicorp/terraform-plugin-framework-validators v0.14.0 - github.com/hashicorp/terraform-plugin-go v0.24.0 + github.com/hashicorp/terraform-plugin-framework v1.13.0 + github.com/hashicorp/terraform-plugin-framework-validators v0.16.0 + github.com/hashicorp/terraform-plugin-go v0.25.0 github.com/hashicorp/terraform-plugin-log v0.9.0 - github.com/hashicorp/terraform-plugin-testing v1.10.0 - github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 - golang.org/x/sync v0.9.0 + github.com/hashicorp/terraform-plugin-testing v1.11.0 + github.com/onsi/ginkgo/v2 v2.22.2 + github.com/onsi/gomega v1.36.2 + golang.org/x/sync v0.10.0 ) require ( - github.com/BurntSushi/toml v1.2.1 // indirect - github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.0 // indirect - github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/armon/go-radix v1.0.0 // indirect - github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/fatih/color v1.16.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/hashicorp/cli v1.1.6 // indirect + github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-plugin v1.6.1 // indirect + github.com/hashicorp/go-plugin v1.6.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/hashicorp/hc-install v0.9.0 // indirect - github.com/hashicorp/hcl/v2 v2.21.0 // indirect + github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/hashicorp/logutils v1.0.0 // indirect github.com/hashicorp/terraform-exec v0.21.0 // indirect github.com/hashicorp/terraform-json v0.23.0 // indirect - github.com/hashicorp/terraform-plugin-docs v0.20.1 // indirect - github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 // indirect + github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 // indirect github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect - github.com/huandu/xstrings v1.3.3 // indirect - github.com/imdario/mergo v0.3.15 // indirect - github.com/kr/text v0.2.0 // indirect + github.com/kr/pretty v0.3.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect - github.com/posener/complete v1.2.3 // indirect - github.com/shopspring/decimal v1.3.1 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/yuin/goldmark v1.7.7 // indirect - github.com/yuin/goldmark-meta v1.1.0 // indirect github.com/zclconf/go-cty v1.15.0 // indirect - go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.20.0 // indirect - golang.org/x/tools v0.22.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.28.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect - google.golang.org/grpc v1.66.2 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/grpc v1.67.1 // indirect + google.golang.org/protobuf v1.36.1 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/assets/terraform/go.sum b/assets/terraform/go.sum index 7d136fce..42402d50 100644 --- a/assets/terraform/go.sum +++ b/assets/terraform/go.sum @@ -1,15 +1,5 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Kunde21/markdownfmt/v3 v3.1.0 h1:KiZu9LKs+wFFBQKhrZJrFZwtLnCCWJahL+S+E/3VnM0= -github.com/Kunde21/markdownfmt/v3 v3.1.0/go.mod h1:tPXN1RTyOzJwhfHoon9wUr4HGYmWgVxSQN6VBJDkrVc= -github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= -github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= -github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= @@ -19,12 +9,6 @@ github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= -github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= @@ -46,8 +30,8 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= @@ -63,14 +47,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/cli v1.1.6 h1:CMOV+/LJfL1tXCOKrgAX0uRKnzjj/mpmqNXloRSy2K8= -github.com/hashicorp/cli v1.1.6/go.mod h1:MPon5QYlgjjo0BSoAiN0ESeT5fRzDjVRp+uioJ0piz4= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -83,11 +61,10 @@ github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUK github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.6.1 h1:P7MR2UP6gNKGPp+y7EZw2kOiq4IR9WiqLvp0XOsVdwI= -github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= +github.com/hashicorp/go-plugin v1.6.2 h1:zdGAEd0V1lCaU0u+MxWQhtSDQmahpkwOun8U8EiRVog= +github.com/hashicorp/go-plugin v1.6.2/go.mod h1:CkgLQ5CZqNmdL9U9JzM532t8ZiYQ35+pj3b1FD37R0Q= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -95,45 +72,34 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.8.0 h1:LdpZeXkZYMQhoKPCecJHlKvUkQFixN/nvyR1CdfOLjI= -github.com/hashicorp/hc-install v0.8.0/go.mod h1:+MwJYjDfCruSD/udvBmRB22Nlkwwkwf5sAB6uTIhSaU= github.com/hashicorp/hc-install v0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE= github.com/hashicorp/hc-install v0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg= -github.com/hashicorp/hcl/v2 v2.21.0 h1:lve4q/o/2rqwYOgUg3y3V2YPyD1/zkCLGjIV74Jit14= -github.com/hashicorp/hcl/v2 v2.21.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= +github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos= +github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= 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.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-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI= github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c= -github.com/hashicorp/terraform-plugin-docs v0.20.1 h1:Fq7E/HrU8kuZu3hNliZGwloFWSYfWEOWnylFhYQIoys= -github.com/hashicorp/terraform-plugin-docs v0.20.1/go.mod h1:Yz6HoK7/EgzSrHPB9J/lWFzwl9/xep2OPnc5jaJDV90= -github.com/hashicorp/terraform-plugin-framework v1.12.0 h1:7HKaueHPaikX5/7cbC1r9d1m12iYHY+FlNZEGxQ42CQ= -github.com/hashicorp/terraform-plugin-framework v1.12.0/go.mod h1:N/IOQ2uYjW60Jp39Cp3mw7I/OpC/GfZ0385R0YibmkE= -github.com/hashicorp/terraform-plugin-framework-validators v0.14.0 h1:3PCn9iyzdVOgHYOBmncpSSOxjQhCTYmc+PGvbdlqSaI= -github.com/hashicorp/terraform-plugin-framework-validators v0.14.0/go.mod h1:LwDKNdzxrDY/mHBrlC6aYfE2fQ3Dk3gaJD64vNiXvo4= -github.com/hashicorp/terraform-plugin-go v0.24.0 h1:2WpHhginCdVhFIrWHxDEg6RBn3YaWzR2o6qUeIEat2U= -github.com/hashicorp/terraform-plugin-go v0.24.0/go.mod h1:tUQ53lAsOyYSckFGEefGC5C8BAaO0ENqzFd3bQeuYQg= +github.com/hashicorp/terraform-plugin-framework v1.13.0 h1:8OTG4+oZUfKgnfTdPTJwZ532Bh2BobF4H+yBiYJ/scw= +github.com/hashicorp/terraform-plugin-framework v1.13.0/go.mod h1:j64rwMGpgM3NYXTKuxrCnyubQb/4VKldEKlcG8cvmjU= +github.com/hashicorp/terraform-plugin-framework-validators v0.16.0 h1:O9QqGoYDzQT7lwTXUsZEtgabeWW96zUBh47Smn2lkFA= +github.com/hashicorp/terraform-plugin-framework-validators v0.16.0/go.mod h1:Bh89/hNmqsEWug4/XWKYBwtnw3tbz5BAy1L1OgvbIaY= +github.com/hashicorp/terraform-plugin-go v0.25.0 h1:oi13cx7xXA6QciMcpcFi/rwA974rdTxjqEhXJjbAyks= +github.com/hashicorp/terraform-plugin-go v0.25.0/go.mod h1:+SYagMYadJP86Kvn+TGeV+ofr/R3g4/If0O5sO96MVw= 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.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-plugin-testing v1.10.0 h1:2+tmRNhvnfE4Bs8rB6v58S/VpqzGC6RCh9Y8ujdn+aw= -github.com/hashicorp/terraform-plugin-testing v1.10.0/go.mod h1:iWRW3+loP33WMch2P/TEyCxxct/ZEcCGMquSLSCVsrc= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 h1:wyKCCtn6pBBL46c1uIIBNUOWlNfYXfXpVo16iDyLp8Y= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0/go.mod h1:B0Al8NyYVr8Mp/KLwssKXG1RqnTk7FySqSn4fRuLNgw= +github.com/hashicorp/terraform-plugin-testing v1.11.0 h1:MeDT5W3YHbONJt2aPQyaBsgQeAIckwPX41EUHXEn29A= +github.com/hashicorp/terraform-plugin-testing v1.11.0/go.mod h1:WNAHQ3DcgV/0J+B15WTE6hDvxcUdkPPpnB1FR3M910U= 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= github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc= github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= -github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= -github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= -github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= @@ -141,8 +107,9 @@ github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gav github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -156,9 +123,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= @@ -167,35 +131,26 @@ github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= +github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= +github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= +github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= -github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -209,42 +164,28 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU= -github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= -github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ= github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= -go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= -go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -256,52 +197,44 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.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= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/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.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= 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/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= 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.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= 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= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/assets/terraform/test/ephemeral_api_key_test.go b/assets/terraform/test/ephemeral_api_key_test.go new file mode 100644 index 00000000..39052d6b --- /dev/null +++ b/assets/terraform/test/ephemeral_api_key_test.go @@ -0,0 +1,50 @@ +package provider_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" +) + +func TestEphemeralApiKey(t *testing.T) { + t.Parallel() + + resource.Test(t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_10_0), + }, + + PreCheck: func() { testAccPreCheck(t) }, + ProtoV6ProviderFactories: testAccProviders, + Steps: []resource.TestStep{ + { + Config: ephemeralApiKeyTmpl, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue( + "echo.test_api_key", + tfjsonpath.New("data"). + AtMapKey("api_key"), + knownvalue.NotNull(), + ), + }, + }, + }, + }) +} + +const ephemeralApiKeyTmpl = ` +ephemeral "panos_api_key" "apikey" { + username = "api-admin" + password = "PaloAlto123!" +} + +provider "echo" { + data = ephemeral.panos_api_key.apikey +} + +resource "echo" "test_api_key" {} +` diff --git a/assets/terraform/test/provider_test.go b/assets/terraform/test/provider_test.go index 465653eb..66936728 100644 --- a/assets/terraform/test/provider_test.go +++ b/assets/terraform/test/provider_test.go @@ -10,6 +10,7 @@ import ( "github.com/PaloAltoNetworks/terraform-provider-panos/internal/provider" "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-testing/echoprovider" ) var ( @@ -21,6 +22,7 @@ var ( testAccProviders = map[string]func() (tfprotov6.ProviderServer, error){ "panos": providerserver.NewProtocol6WithError(provider.New(version)()), + "echo": echoprovider.NewProviderServer(), } ) diff --git a/pkg/commands/codegen/codegen.go b/pkg/commands/codegen/codegen.go index 0bb316e2..9d4184ac 100644 --- a/pkg/commands/codegen/codegen.go +++ b/pkg/commands/codegen/codegen.go @@ -74,6 +74,7 @@ func (c *Command) Execute() error { } var resourceList []string var dataSourceList []string + var ephemeralResourceList []string specMetadata := make(map[string]properties.TerraformProviderSpecMetadata) for _, specPath := range c.specs { @@ -127,13 +128,14 @@ func (c *Command) Execute() error { } terraformGenerator := generate.NewCreator(config.Output.TerraformProvider, c.templatePath, spec) - dataSources, resources, partialNames, err := terraformGenerator.RenderTerraformProviderFile(spec, resourceTyp) + dataSources, resources, ephemeralResources, partialNames, err := terraformGenerator.RenderTerraformProviderFile(spec, resourceTyp) if err != nil { return fmt.Errorf("error rendering Terraform provider file for %s - %s", specPath, err) } resourceList = append(resourceList, resources...) dataSourceList = append(dataSourceList, dataSources...) + ephemeralResourceList = append(ephemeralResourceList, ephemeralResources...) for k, v := range partialNames { specMetadata[k] = v @@ -155,13 +157,14 @@ func (c *Command) Execute() error { } terraformGenerator := generate.NewCreator(config.Output.TerraformProvider, c.templatePath, spec) - dataSources, resources, partialNames, err := terraformGenerator.RenderTerraformProviderFile(spec, resourceTyp) + dataSources, resources, ephemeralResources, partialNames, err := terraformGenerator.RenderTerraformProviderFile(spec, resourceTyp) if err != nil { return fmt.Errorf("error rendering Terraform provider file for %s - %s", specPath, err) } resourceList = append(resourceList, resources...) dataSourceList = append(dataSourceList, dataSources...) + ephemeralResourceList = append(ephemeralResourceList, ephemeralResources...) for k, v := range partialNames { specMetadata[k] = v @@ -183,6 +186,7 @@ func (c *Command) Execute() error { newProviderObject := properties.NewTerraformProviderFile(providerSpec.Name) newProviderObject.DataSources = append(newProviderObject.DataSources, dataSourceList...) newProviderObject.Resources = append(newProviderObject.Resources, resourceList...) + newProviderObject.EphemeralResources = append(newProviderObject.EphemeralResources, ephemeralResourceList...) newProviderObject.SpecMetadata = specMetadata terraformGenerator := generate.NewCreator(config.Output.TerraformProvider, c.templatePath, providerSpec) diff --git a/pkg/generate/generator.go b/pkg/generate/generator.go index ae0cf689..7111eea6 100644 --- a/pkg/generate/generator.go +++ b/pkg/generate/generator.go @@ -59,7 +59,7 @@ func (c *Creator) RenderTemplate() error { } // RenderTerraformProviderFile generates a Go file for a Terraform provider based on the provided TerraformProviderFile and Normalization arguments. -func (c *Creator) RenderTerraformProviderFile(spec *properties.Normalization, typ properties.ResourceType) ([]string, []string, map[string]properties.TerraformProviderSpecMetadata, error) { +func (c *Creator) RenderTerraformProviderFile(spec *properties.Normalization, typ properties.ResourceType) ([]string, []string, []string, map[string]properties.TerraformProviderSpecMetadata, error) { var name string switch typ { case properties.ResourceUuidPlural: @@ -75,19 +75,19 @@ func (c *Creator) RenderTerraformProviderFile(spec *properties.Normalization, ty tfp := terraform_provider.GenerateTerraformProvider{} if err := tfp.GenerateTerraformDataSource(typ, spec, terraformProvider); err != nil { - return nil, nil, nil, err + return nil, nil, nil, nil, err } if err := tfp.GenerateTerraformResource(typ, spec, terraformProvider); err != nil { - return nil, nil, nil, err + return nil, nil, nil, nil, err } if err := tfp.GenerateCommonCode(typ, spec, terraformProvider); err != nil { - return nil, nil, nil, err + return nil, nil, nil, nil, err } if err := tfp.GenerateTerraformProviderFile(spec, terraformProvider); err != nil { - return nil, nil, nil, err + return nil, nil, nil, nil, err } var filePath string @@ -103,10 +103,10 @@ func (c *Creator) RenderTerraformProviderFile(spec *properties.Normalization, ty } if err := c.writeFormattedContentToFile(filePath, terraformProvider.Code.String()); err != nil { - return nil, nil, nil, err + return nil, nil, nil, nil, err } - return terraformProvider.DataSources, terraformProvider.Resources, terraformProvider.SpecMetadata, nil + return terraformProvider.DataSources, terraformProvider.Resources, terraformProvider.EphemeralResources, terraformProvider.SpecMetadata, nil } // RenderTerraformProvider generates and writes a Terraform provider file. diff --git a/pkg/properties/normalized.go b/pkg/properties/normalized.go index bcc7020c..5a3cd966 100644 --- a/pkg/properties/normalized.go +++ b/pkg/properties/normalized.go @@ -70,6 +70,7 @@ const ( type TerraformProviderConfig struct { Description string `json:"description" yaml:"description"` + Ephemeral bool `json:"ephemeral" yaml:"ephemeral"` SkipResource bool `json:"skip_resource" yaml:"skip_resource"` SkipDatasource bool `json:"skip_datasource" yaml:"skip_datasource"` SkipDatasourceListing bool `json:"skip_datasource_listing" yaml:"skip_datasource_listing"` @@ -611,6 +612,7 @@ func schemaToSpec(object object.Object) (*Normalization, error) { Name: object.DisplayName, TerraformProviderConfig: TerraformProviderConfig{ Description: object.TerraformConfig.Description, + Ephemeral: object.TerraformConfig.Epheneral, SkipResource: object.TerraformConfig.SkipResource, SkipDatasource: object.TerraformConfig.SkipDatasource, SkipDatasourceListing: object.TerraformConfig.SkipdatasourceListing, diff --git a/pkg/properties/provider_file.go b/pkg/properties/provider_file.go index 5f93ef1c..74748077 100644 --- a/pkg/properties/provider_file.go +++ b/pkg/properties/provider_file.go @@ -62,9 +62,10 @@ func NewTerraformNameProvider(spec *Normalization, resourceTyp ResourceType) *Te type TerraformSpecFlags uint const ( - TerraformSpecDatasource = 0x01 - TerraformSpecResource = 0x02 - TerraformSpecImportable = 0x04 + TerraformSpecDatasource = 0x01 + TerraformSpecResource = 0x02 + TerraformSpecEphemeralResource = 0x04 + TerraformSpecImportable = 0x08 ) type TerraformProviderSpecMetadata struct { @@ -75,11 +76,12 @@ type TerraformProviderSpecMetadata struct { // TerraformProviderFile is a Terraform provider file handler. type TerraformProviderFile struct { - Filename string - Directory []string - ImportManager *imports.Manager - DataSources []string - Resources []string - SpecMetadata map[string]TerraformProviderSpecMetadata - Code *strings.Builder + Filename string + Directory []string + ImportManager *imports.Manager + DataSources []string + Resources []string + EphemeralResources []string + SpecMetadata map[string]TerraformProviderSpecMetadata + Code *strings.Builder } diff --git a/pkg/properties/resourcetype.go b/pkg/properties/resourcetype.go index c101f50c..180df82b 100644 --- a/pkg/properties/resourcetype.go +++ b/pkg/properties/resourcetype.go @@ -14,8 +14,9 @@ const ( type SchemaType int const ( - SchemaResource SchemaType = iota - SchemaDataSource SchemaType = iota - SchemaCommon SchemaType = iota - SchemaProvider SchemaType = iota + SchemaResource SchemaType = iota + SchemaEphemeralResource SchemaType = iota + SchemaDataSource SchemaType = iota + SchemaCommon SchemaType = iota + SchemaProvider SchemaType = iota ) diff --git a/pkg/schema/object/object.go b/pkg/schema/object/object.go index f7f3a6a6..a973bdef 100644 --- a/pkg/schema/object/object.go +++ b/pkg/schema/object/object.go @@ -27,6 +27,7 @@ const ( type TerraformConfig struct { Description string `yaml:"description"` + Epheneral bool `yaml:"ephemeral"` SkipResource bool `yaml:"skip_resource"` SkipDatasource bool `yaml:"skip_datasource"` SkipdatasourceListing bool `yaml:"skip_datasource_listing"` diff --git a/pkg/translate/terraform_provider/api_key_crud.go b/pkg/translate/terraform_provider/api_key_crud.go new file mode 100644 index 00000000..2c3a7ff4 --- /dev/null +++ b/pkg/translate/terraform_provider/api_key_crud.go @@ -0,0 +1,26 @@ +package terraform_provider + +const apiKeyImports = ` +import ( + "github.com/hashicorp/terraform-plugin-framework/ephemeral" +) +` +const apiKeyOpen = ` +var data ApiKeyResourceModel +resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) +if resp.Diagnostics.HasError() { + return +} + +username := data.Username.ValueString() +password := data.Password.ValueString() + +apiKey, err := r.client.GenerateApiKey(ctx, username, password) +if err != nil { + resp.Diagnostics.AddError("failed to generate API key", err.Error()) + return +} + +data.ApiKey = types.StringValue(apiKey) +resp.Diagnostics.Append(resp.Result.Set(ctx, &data)...) +` diff --git a/pkg/translate/terraform_provider/funcs.go b/pkg/translate/terraform_provider/funcs.go index 0fb4335b..6bdd3421 100644 --- a/pkg/translate/terraform_provider/funcs.go +++ b/pkg/translate/terraform_provider/funcs.go @@ -639,6 +639,10 @@ func RenderLocationStructs(resourceTyp properties.ResourceType, names *NameProvi var locations []locationCtx + if len(spec.Locations) == 0 { + return "", nil + } + // Create the top location structure that references other locations topLocation := locationCtx{ StructName: fmt.Sprintf("%sLocation", names.StructName), @@ -825,6 +829,10 @@ type schemaCtx struct { func RenderLocationSchemaGetter(names *NameProvider, spec *properties.Normalization, manager *imports.Manager) (string, error) { var attributes []attributeCtx + if len(spec.Locations) == 0 { + return "", nil + } + var locations []string for _, loc := range spec.Locations { locations = append(locations, loc.Name.Underscore) @@ -1328,18 +1336,20 @@ func createSchemaSpecForUuidModel(resourceTyp properties.ResourceType, schemaTyp var schemas []schemaCtx var attributes []attributeCtx - location := &properties.NameVariant{ - Underscore: naming.Underscore("", "location", ""), - CamelCase: naming.CamelCase("", "location", "", true), - LowerCamelCase: naming.CamelCase("", "location", "", false), - } + if len(spec.Locations) > 0 { + location := &properties.NameVariant{ + Underscore: naming.Underscore("", "location", ""), + CamelCase: naming.CamelCase("", "location", "", true), + LowerCamelCase: naming.CamelCase("", "location", "", false), + } - attributes = append(attributes, attributeCtx{ - Package: packageName, - Name: location, - Required: true, - SchemaType: "SingleNestedAttribute", - }) + attributes = append(attributes, attributeCtx{ + Package: packageName, + Name: location, + Required: true, + SchemaType: "SingleNestedAttribute", + }) + } if resourceTyp == properties.ResourceUuidPlural { position := &properties.NameVariant{ @@ -1408,18 +1418,21 @@ func createSchemaSpecForUuidModel(resourceTyp properties.ResourceType, schemaTyp func createSchemaSpecForEntrySingularModel(resourceTyp properties.ResourceType, schemaTyp properties.SchemaType, spec *properties.Normalization, packageName string, structName string, manager *imports.Manager) []schemaCtx { var schemas []schemaCtx var attributes []attributeCtx - location := &properties.NameVariant{ - Underscore: naming.Underscore("", "location", ""), - CamelCase: naming.CamelCase("", "location", "", true), - LowerCamelCase: naming.CamelCase("", "location", "", false), - } - attributes = append(attributes, attributeCtx{ - Package: packageName, - Name: location, - Required: true, - SchemaType: "SingleNestedAttribute", - }) + if len(spec.Locations) > 0 { + location := &properties.NameVariant{ + Underscore: naming.Underscore("", "location", ""), + CamelCase: naming.CamelCase("", "location", "", true), + LowerCamelCase: naming.CamelCase("", "location", "", false), + } + + attributes = append(attributes, attributeCtx{ + Package: packageName, + Name: location, + Required: true, + SchemaType: "SingleNestedAttribute", + }) + } normalizationAttrs, normalizationSchemas := createSchemaSpecForNormalization(resourceTyp, schemaTyp, spec, packageName, structName, manager) attributes = append(attributes, normalizationAttrs...) @@ -1452,18 +1465,21 @@ func createSchemaSpecForEntrySingularModel(resourceTyp properties.ResourceType, func createSchemaSpecForEntryListModel(resourceTyp properties.ResourceType, schemaTyp properties.SchemaType, spec *properties.Normalization, packageName string, structName string, manager *imports.Manager) []schemaCtx { var schemas []schemaCtx var attributes []attributeCtx - location := &properties.NameVariant{ - Underscore: naming.Underscore("", "location", ""), - CamelCase: naming.CamelCase("", "location", "", true), - LowerCamelCase: naming.CamelCase("", "location", "", false), - } - attributes = append(attributes, attributeCtx{ - Package: packageName, - Name: location, - Required: true, - SchemaType: "SingleNestedAttribute", - }) + if len(spec.Locations) > 0 { + location := &properties.NameVariant{ + Underscore: naming.Underscore("", "location", ""), + CamelCase: naming.CamelCase("", "location", "", true), + LowerCamelCase: naming.CamelCase("", "location", "", false), + } + + attributes = append(attributes, attributeCtx{ + Package: packageName, + Name: location, + Required: true, + SchemaType: "SingleNestedAttribute", + }) + } listNameStr := spec.TerraformProviderConfig.PluralName listName := &properties.NameVariant{ @@ -1517,7 +1533,11 @@ func createSchemaSpecForModel(resourceTyp properties.ResourceType, schemaTyp pro case properties.SchemaDataSource: packageName = "dsschema" case properties.SchemaResource: - packageName = "rsschema" + if spec.TerraformProviderConfig.Ephemeral == true { + packageName = "ephschema" + } else { + packageName = "rsschema" + } case properties.SchemaCommon, properties.SchemaProvider: panic("unreachable") } @@ -2236,11 +2256,14 @@ func createStructSpecForUuidModel(resourceTyp properties.ResourceType, schemaTyp var structs []datasourceStructSpec var fields []datasourceStructFieldSpec - fields = append(fields, datasourceStructFieldSpec{ - Name: "Location", - Type: fmt.Sprintf("%sLocation", names.StructName), - Tags: []string{"`tfsdk:\"location\"`"}, - }) + + if len(spec.Locations) > 0 { + fields = append(fields, datasourceStructFieldSpec{ + Name: "Location", + Type: fmt.Sprintf("%sLocation", names.StructName), + Tags: []string{"`tfsdk:\"location\"`"}, + }) + } if resourceTyp == properties.ResourceUuidPlural { @@ -2305,11 +2328,13 @@ func createStructSpecForEntryListModel(resourceTyp properties.ResourceType, sche var structs []datasourceStructSpec var fields []datasourceStructFieldSpec - fields = append(fields, datasourceStructFieldSpec{ - Name: "Location", - Type: fmt.Sprintf("%sLocation", names.StructName), - Tags: []string{"`tfsdk:\"location\"`"}, - }) + if len(spec.Locations) > 0 { + fields = append(fields, datasourceStructFieldSpec{ + Name: "Location", + Type: fmt.Sprintf("%sLocation", names.StructName), + Tags: []string{"`tfsdk:\"location\"`"}, + }) + } var structName string switch schemaTyp { @@ -2360,11 +2385,13 @@ func createStructSpecForEntryModel(resourceTyp properties.ResourceType, schemaTy var fields []datasourceStructFieldSpec - fields = append(fields, datasourceStructFieldSpec{ - Name: "Location", - Type: fmt.Sprintf("%sLocation", names.StructName), - Tags: []string{"`tfsdk:\"location\"`"}, - }) + if len(spec.Locations) > 0 { + fields = append(fields, datasourceStructFieldSpec{ + Name: "Location", + Type: fmt.Sprintf("%sLocation", names.StructName), + Tags: []string{"`tfsdk:\"location\"`"}, + }) + } var structName string switch schemaTyp { @@ -2826,6 +2853,83 @@ func ResourceDeleteFunction(resourceTyp properties.ResourceType, names *NameProv return processTemplate(tmpl, "resource-delete-function", data, funcMap) } +func ResourceOpenFunction(resourceTyp properties.ResourceType, names *NameProvider, serviceName string, paramSpec *properties.Normalization, resourceSDKName string) (string, error) { + var tmpl string + switch resourceTyp { + case properties.ResourceEntry, properties.ResourceConfig: + case properties.ResourceEntryPlural: + case properties.ResourceUuid: + case properties.ResourceUuidPlural: + return "", fmt.Errorf("Ephemeral resources are only implemented for custom specs") + case properties.ResourceCustom: + var err error + tmpl, err = getCustomTemplateForFunction(paramSpec, "Open") + if err != nil { + return "", err + } + } + + return processTemplate(tmpl, "resource-open-function", nil, nil) +} + +func ResourceRenewFunction(resourceTyp properties.ResourceType, names *NameProvider, serviceName string, paramSpec *properties.Normalization, resourceSDKName string) (string, error) { + var tmpl string + switch resourceTyp { + case properties.ResourceEntry, properties.ResourceConfig: + case properties.ResourceEntryPlural: + case properties.ResourceUuid: + case properties.ResourceUuidPlural: + return "", fmt.Errorf("Ephemeral resources are only implemented for custom specs") + case properties.ResourceCustom: + var err error + tmpl, err = getCustomTemplateForFunction(paramSpec, "Renew") + if err != nil { + return "", err + } + } + + return processTemplate(tmpl, "resource-renew-function", nil, nil) +} + +func ResourceCloseFunction(resourceTyp properties.ResourceType, names *NameProvider, serviceName string, paramSpec *properties.Normalization, resourceSDKName string) (string, error) { + var tmpl string + switch resourceTyp { + case properties.ResourceEntry, properties.ResourceConfig: + case properties.ResourceEntryPlural: + case properties.ResourceUuid: + case properties.ResourceUuidPlural: + return "", fmt.Errorf("Ephemeral resources are only implemented for custom specs") + case properties.ResourceCustom: + var err error + tmpl, err = getCustomTemplateForFunction(paramSpec, "Close") + if err != nil { + return "", err + } + } + + return processTemplate(tmpl, "resource-close-function", nil, nil) +} + +func FunctionSupported(spec *properties.Normalization, function string) (bool, error) { + switch function { + case "Create", "Delete", "Read", "Update": + return spec.TerraformProviderConfig.Ephemeral != true, nil + case "Open", "Close", "Renew": + if spec.TerraformProviderConfig.Ephemeral != true { + return false, nil + } + + if resource, found := customResourceFuncsMap[spec.TerraformProviderConfig.Suffix]; !found { + return false, fmt.Errorf("cannot find a list of custom functions for %s", spec.TerraformProviderConfig.Suffix) + } else { + _, found := resource[function] + return found, nil + } + default: + return false, fmt.Errorf("invalid custom function name: %s", function) + } +} + type importStateStructFieldSpec struct { Name string Type string @@ -3024,4 +3128,8 @@ var customResourceFuncsMap = map[string]map[string]string{ "Delete": deviceGroupParentResourceDelete, "Common": deviceGroupParentCommon, }, + "api_key": { + "Imports": apiKeyImports, + "Open": apiKeyOpen, + }, } diff --git a/pkg/translate/terraform_provider/template.go b/pkg/translate/terraform_provider/template.go index 13c5b580..a2760c51 100644 --- a/pkg/translate/terraform_provider/template.go +++ b/pkg/translate/terraform_provider/template.go @@ -230,23 +230,38 @@ if !movementRequired { const resourceObj = ` {{- /* Begin */ -}} +{{- if IsEphemeral }} +// Generate Terraform Ephemeral object +var ( + _ ephemeral.EphemeralResource = &{{ resourceStructName }}{} + _ ephemeral.EphemeralResourceWithConfigure = &{{ resourceStructName }}{} +) +{{- else }} // Generate Terraform Resource object var ( _ resource.Resource = &{{ resourceStructName }}{} _ resource.ResourceWithConfigure = &{{ resourceStructName }}{} _ resource.ResourceWithImportState = &{{ resourceStructName }}{} ) +{{- end }} + +{{- if IsEphemeral }} +func New{{ resourceStructName }}() ephemeral.EphemeralResource { + return &{{ resourceStructName }}{} +} +{{- else }} func New{{ resourceStructName }}() resource.Resource { -{{- if IsImportable }} + {{- if IsImportable }} if _, found := resourceFuncMap["panos{{ metaName }}"]; !found { resourceFuncMap["panos{{ metaName }}"] = resourceFuncs{ CreateImportId: {{ structName }}ImportStateCreator, } } -{{- end }} + {{- end }} return &{{ resourceStructName }}{} } +{{- end }} type {{ resourceStructName }} struct { client *pango.Client @@ -263,16 +278,14 @@ type {{ resourceStructName }} struct { {{- end }} } +{{- if HasLocations }} func {{ resourceStructName }}LocationSchema() rsschema.Attribute { return {{ structName }}LocationSchema() } +{{- end }} {{ RenderResourceStructs }} -func (r *{{ resourceStructName }}) Metadata(ctx context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) { - resp.TypeName = req.ProviderTypeName + "{{ metaName }}" -} - func (r *{{ resourceStructName }}) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) { {{- if HasPosition }} var resource {{ resourceStructName }}Model @@ -288,13 +301,17 @@ func (r *{{ resourceStructName }}) ValidateConfig(ctx context.Context, req resou // {{ RenderResourceSchema }} -func (r *{{ resourceStructName }}) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { +func (r *{{ resourceStructName }}) Metadata(ctx context.Context, req {{ tfresourcepkg }}.MetadataRequest, resp *{{ tfresourcepkg }}.MetadataResponse) { + resp.TypeName = req.ProviderTypeName + "{{ metaName }}" +} + +func (r *{{ resourceStructName }}) Schema(_ context.Context, _ {{ tfresourcepkg }}.SchemaRequest, resp *{{ tfresourcepkg }}.SchemaResponse) { resp.Schema = {{ resourceStructName }}Schema() } // -func (r *{{ resourceStructName }}) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) { +func (r *{{ resourceStructName }}) Configure(ctx context.Context, req {{ tfresourcepkg }}.ConfigureRequest, resp *{{ tfresourcepkg }}.ConfigureResponse) { // Prevent panic if the provider has not been configured. if req.ProviderData == nil { return @@ -339,22 +356,48 @@ func (r *{{ resourceStructName }}) Configure(ctx context.Context, req resource.C {{ RenderCopyFromPangoFunctions }} +{{- if FunctionSupported "Create" }} func (r *{{ resourceStructName }}) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { {{ ResourceCreateFunction resourceStructName serviceName}} } +{{- end }} +{{- if FunctionSupported "Read" }} func (o *{{ resourceStructName }}) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { {{ ResourceReadFunction resourceStructName serviceName}} } +{{- end }} +{{- if FunctionSupported "Update" }} func (r *{{ resourceStructName }}) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { {{ ResourceUpdateFunction resourceStructName serviceName}} } +{{- end }} +{{- if FunctionSupported "Delete" }} func (r *{{ resourceStructName }}) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { {{ ResourceDeleteFunction resourceStructName serviceName}} } +{{- end }} + +{{- if FunctionSupported "Open" }} +func (r *{{ resourceStructName }}) Open(ctx context.Context, req ephemeral.OpenRequest, resp *ephemeral.OpenResponse) { + {{ ResourceOpenFunction resourceStructName serviceName}} +} +{{- end }} + +{{- if FunctionSupported "Renew" }} +func (r *{{ resourceStructName }}) Open(ctx context.Context, req ephemeral.RenewRequest, resp *ephemeral.RenewResponse) { + {{ ResourceRenewFunction resourceStructName serviceName}} +} +{{- end }} + +{{- if FunctionSupported "Close" }} +func (r *{{ resourceStructName }}) Open(ctx context.Context, req ephemeral.CloseRequest, resp *ephemeral.CloseResponse) { + {{ ResourceCloseFunction resourceStructName serviceName}} +} +{{- end }} {{ RenderImportStateStructs }} @@ -1418,11 +1461,13 @@ const resourceImportStateFunctionTmpl = ` ` const commonTemplate = ` +{{- if HasLocations }} {{- RenderLocationStructs }} {{- RenderLocationSchemaGetter }} {{- RenderLocationMarshallers }} +{{- end }} {{- RenderCustomCommonCode }} ` @@ -1468,9 +1513,11 @@ type {{ dataSourceStructName }}Filter struct { {{ RenderDataSourceSchema }} +{{- if HasLocations }} func {{ dataSourceStructName }}LocationSchema() rsschema.Attribute { return {{ structName }}LocationSchema() } +{{- end }} // Metadata returns the data source type name. func (d *{{ dataSourceStructName }}) Metadata(_ context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) { @@ -1523,9 +1570,11 @@ func (d *{{ dataSourceStructName }}) Configure(_ context.Context, req datasource {{- end }} } +{{- if FunctionSupported "Read" }} func (o *{{ dataSourceStructName }}) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { {{ DataSourceReadFunction dataSourceStructName serviceName }} } +{{- end }} {{- /* Done */ -}} ` @@ -1685,6 +1734,14 @@ func (p *PanosProvider) Resources(_ context.Context) []func() resource.Resource } } +func (p *PanosProvider) EphemeralResources(_ context.Context) []func() ephemeral.EphemeralResource { + return []func() ephemeral.EphemeralResource{ +{{- range $fnName := EphemeralResources }} + New{{ $fnName }}, +{{- end }} + } +} + func (p *PanosProvider) Functions(_ context.Context) []func() function.Function { return []func() function.Function{ NewAddressValueFunction, diff --git a/pkg/translate/terraform_provider/terraform_provider_file.go b/pkg/translate/terraform_provider/terraform_provider_file.go index 6e42fd65..704beb72 100644 --- a/pkg/translate/terraform_provider/terraform_provider_file.go +++ b/pkg/translate/terraform_provider/terraform_provider_file.go @@ -64,6 +64,9 @@ func (g *GenerateTerraformProvider) appendResourceType(terraformProvider *proper case properties.SchemaResource: flags |= properties.TerraformSpecResource terraformProvider.Resources = append(terraformProvider.Resources, names.ResourceStructName) + case properties.SchemaEphemeralResource: + flags |= properties.TerraformSpecEphemeralResource + terraformProvider.EphemeralResources = append(terraformProvider.EphemeralResources, names.ResourceStructName) case properties.SchemaProvider, properties.SchemaCommon: } @@ -93,6 +96,8 @@ func (g *GenerateTerraformProvider) generateTerraformEntityTemplate(resourceTyp resourceType = "DataSource" case properties.SchemaResource: resourceType = "Resource" + case properties.SchemaEphemeralResource: + resourceType = "EphemeralResource" case properties.SchemaCommon: resourceType = "Common" case properties.SchemaProvider: @@ -126,14 +131,28 @@ func (g *GenerateTerraformProvider) GenerateTerraformResource(resourceTyp proper hasPosition = false } + schemaTyp := properties.SchemaResource + if spec.TerraformProviderConfig.Ephemeral { + schemaTyp = properties.SchemaEphemeralResource + } + funcMap := template.FuncMap{ - "GoSDKSkipped": func() bool { return spec.GoSdkSkip }, - "IsEntry": func() bool { return spec.HasEntryName() && !spec.HasEntryUuid() }, - "HasImports": func() bool { return len(spec.Imports) > 0 }, - "IsCustom": func() bool { return spec.TerraformProviderConfig.ResourceType == properties.TerraformResourceCustom }, - "IsUuid": func() bool { return spec.HasEntryUuid() }, - "IsConfig": func() bool { return !spec.HasEntryName() && !spec.HasEntryUuid() }, - "IsImportable": func() bool { return resourceTyp == properties.ResourceEntry }, + "GoSDKSkipped": func() bool { return spec.GoSdkSkip }, + "IsEntry": func() bool { return spec.HasEntryName() && !spec.HasEntryUuid() }, + "HasImports": func() bool { return len(spec.Imports) > 0 }, + "HasLocations": func() bool { return len(spec.Locations) > 0 }, + "IsCustom": func() bool { return spec.TerraformProviderConfig.ResourceType == properties.TerraformResourceCustom }, + "IsUuid": func() bool { return spec.HasEntryUuid() }, + "IsConfig": func() bool { return !spec.HasEntryName() && !spec.HasEntryUuid() }, + "IsEphemeral": func() bool { return spec.TerraformProviderConfig.Ephemeral }, + "IsImportable": func() bool { return resourceTyp == properties.ResourceEntry }, + "tfresourcepkg": func() string { + if spec.TerraformProviderConfig.Ephemeral == true { + return "ephemeral" + } else { + return "resource" + } + }, "resourceSDKName": func() string { return names.PackageName }, "HasPosition": func() bool { return hasPosition }, "metaName": func() string { return names.MetaName }, @@ -165,6 +184,18 @@ func (g *GenerateTerraformProvider) GenerateTerraformResource(resourceTyp proper "ResourceDeleteFunction": func(structName string, serviceName string) (string, error) { return ResourceDeleteFunction(resourceTyp, names, serviceName, spec, names.PackageName) }, + "ResourceOpenFunction": func(structName string, serviceName string) (string, error) { + return ResourceOpenFunction(resourceTyp, names, serviceName, spec, names.PackageName) + }, + "ResourceRenewFunction": func(structName string, serviceName string) (string, error) { + return ResourceOpenFunction(resourceTyp, names, serviceName, spec, names.PackageName) + }, + "ResourceCloseFunction": func(structName string, serviceName string) (string, error) { + return ResourceOpenFunction(resourceTyp, names, serviceName, spec, names.PackageName) + }, + "FunctionSupported": func(function string) (bool, error) { + return FunctionSupported(spec, function) + }, "RenderImportStateStructs": func() (string, error) { return RenderImportStateStructs(resourceTyp, names, spec) }, @@ -219,15 +250,23 @@ func (g *GenerateTerraformProvider) GenerateTerraformResource(resourceTyp proper conditionallyAddModifiers(terraformProvider.ImportManager, spec) conditionallyAddDefaults(terraformProvider.ImportManager, spec.Spec) - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/diag", "") + if spec.TerraformProviderConfig.Ephemeral { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/ephemeral/schema", "ephschema") + } else { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema", "rsschema") + } + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/attr", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource", "") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema", "rsschema") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/types", "") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-log/tflog", "") - err := g.generateTerraformEntityTemplate(resourceTyp, properties.SchemaResource, names, spec, terraformProvider, resourceObj, funcMap) + if len(spec.Locations) > 0 { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/diag", "") + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault", "") + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-log/tflog", "") + } + + err := g.generateTerraformEntityTemplate(resourceTyp, schemaTyp, names, spec, terraformProvider, resourceObj, funcMap) if err != nil { return err } @@ -250,15 +289,23 @@ func (g *GenerateTerraformProvider) GenerateTerraformResource(resourceTyp proper conditionallyAddModifiers(terraformProvider.ImportManager, spec) conditionallyAddDefaults(terraformProvider.ImportManager, spec.Spec) - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/diag", "") + if spec.TerraformProviderConfig.Ephemeral { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/ephemeral/schema", "ephschema") + } else { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema", "rsschema") + } + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/attr", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource", "") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema", "rsschema") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/types", "") - terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-log/tflog", "") - err := g.generateTerraformEntityTemplate(resourceTyp, properties.SchemaResource, names, spec, terraformProvider, resourceObj, funcMap) + if len(spec.Locations) > 0 { + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/diag", "") + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault", "") + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-log/tflog", "") + } + + err := g.generateTerraformEntityTemplate(resourceTyp, schemaTyp, names, spec, terraformProvider, resourceObj, funcMap) if err != nil { return err } @@ -294,6 +341,7 @@ func (g *GenerateTerraformProvider) GenerateTerraformDataSource(resourceTyp prop "GoSDKSkipped": func() bool { return spec.GoSdkSkip }, "IsEntry": func() bool { return spec.HasEntryName() && !spec.HasEntryUuid() }, "HasImports": func() bool { return len(spec.Imports) > 0 }, + "HasLocations": func() bool { return len(spec.Locations) > 0 }, "IsCustom": func() bool { return spec.TerraformProviderConfig.ResourceType == properties.TerraformResourceCustom }, "IsUuid": func() bool { return spec.HasEntryUuid() }, "resourceSDKName": func() string { return names.PackageName }, @@ -306,6 +354,9 @@ func (g *GenerateTerraformProvider) GenerateTerraformDataSource(resourceTyp prop "DataSourceReadFunction": func(structName string, serviceName string) (string, error) { return DataSourceReadFunction(resourceTyp, names, serviceName, spec, names.PackageName) }, + "FunctionSupported": func(function string) (bool, error) { + return FunctionSupported(spec, function) + }, "RenderCopyToPangoFunctions": func() (string, error) { return RenderCopyToPangoFunctions(resourceTyp, names.PackageName, names.DataSourceStructName, spec) }, @@ -343,7 +394,11 @@ func (g *GenerateTerraformProvider) GenerateTerraformDataSource(resourceTyp prop } func (g *GenerateTerraformProvider) GenerateCommonCode(resourceTyp properties.ResourceType, spec *properties.Normalization, terraformProvider *properties.TerraformProviderFile) error { - terraformProvider.ImportManager.AddStandardImport("encoding/json", "") + + // For specs with locations, we need to implement MarshalJSON and UnmarshalJSON methods + if len(spec.Locations) > 0 { + terraformProvider.ImportManager.AddStandardImport("encoding/json", "") + } // Imports required by resources that can be imported into state if resourceTyp == properties.ResourceEntry { terraformProvider.ImportManager.AddStandardImport("encoding/base64", "") @@ -352,6 +407,7 @@ func (g *GenerateTerraformProvider) GenerateCommonCode(resourceTyp properties.Re } names := NewNameProvider(spec, resourceTyp) funcMap := template.FuncMap{ + "HasLocations": func() bool { return len(spec.Locations) > 0 }, "RenderLocationStructs": func() (string, error) { return RenderLocationStructs(resourceTyp, names, spec) }, "RenderLocationSchemaGetter": func() (string, error) { return RenderLocationSchemaGetter(names, spec, terraformProvider.ImportManager) @@ -386,12 +442,14 @@ func (g *GenerateTerraformProvider) GenerateTerraformProvider(terraformProvider terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/provider", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/provider/schema", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/resource", "") + terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/ephemeral", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-framework/types", "") terraformProvider.ImportManager.AddHashicorpImport("github.com/hashicorp/terraform-plugin-log/tflog", "") funcMap := template.FuncMap{ "RenderImports": func() (string, error) { return terraformProvider.ImportManager.RenderImports() }, "DataSources": func() []string { return terraformProvider.DataSources }, + "EphemeralResources": func() []string { return terraformProvider.EphemeralResources }, "Resources": func() []string { return terraformProvider.Resources }, "RenderResourceFuncMap": func() (string, error) { return RenderResourceFuncMap(terraformProvider.SpecMetadata) }, "ProviderParams": func() map[string]properties.TerraformProviderParams { return providerConfig.TerraformProviderParams }, diff --git a/specs/device/api_key.yaml b/specs/device/api_key.yaml new file mode 100644 index 00000000..45e806d2 --- /dev/null +++ b/specs/device/api_key.yaml @@ -0,0 +1,51 @@ +name: API Key +terraform_provider_config: + skip_datasource: true + description: API Key + resource_type: custom + ephemeral: true + custom_functions: + Open: apiKeyEphemeralResourceOpen + Close: apiKeyEphemeralResourceClose + suffix: api_key +go_sdk_config: + skip: true + package: ["api_key"] +xpath_suffix: ["api-key"] +locations: [] +entries: [] +imports: [] +version: 11.0.2 +spec: + params: + - name: username + type: string + required: true + profiles: + - xpath: ["username"] + validators: + - type: length + spec: + min: 1 + max: 63 + - name: password + type: string + required: true + profiles: + - xpath: ["password"] + validators: + - type: length + spec: + min: 1 + max: 63 + codegen_overrides: + terraform: + sensitive: true + - name: api-key + type: string + profiles: + - xpath: ["api-key"] + codegen_overrides: + terraform: + sensitive: true + computed: true diff --git a/specs/schema/object.schema.json b/specs/schema/object.schema.json index 7cb71920..68121838 100644 --- a/specs/schema/object.schema.json +++ b/specs/schema/object.schema.json @@ -28,13 +28,15 @@ }, "custom_functions": { "type": "object", - "required": ["Read", "Create", "Update", "Delete"], "additionalProperties": false, "properties": { "Read": { "type": "string" }, "Create": { "type": "string" }, "Update": { "type": "string" }, - "Delete": { "type": "string" } + "Delete": { "type": "string" }, + "Open": { "type": "string" }, + "Refresh": { "type": "string" }, + "Close": { "type": "string" } } }, "resource_variants": {