Provider: use embedded Go catalog; implement DataSource Configure; fix provider signatures and attr types; build succeeds

Author: ndbroadbent

go.mod

@@ -2,7 +2,29 @@ module github.com/DocSpring/terraform-provider-logstruct
 
 go 1.22.0
 
+require github.com/hashicorp/terraform-plugin-framework v1.11.0
+
 require (
-    github.com/hashicorp/terraform-plugin-framework v1.11.0
-    github.com/hashicorp/terraform-plugin-log/tflog v0.9.0
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect
+	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
+	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.0 // indirect
 )

go.sum

@@ -0,0 +1,70 @@
+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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+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/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+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.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/terraform-plugin-framework v1.11.0 h1:M7+9zBArexHFXDx/pKTxjE6n/2UCXY6b8FIq9ZYhwfE=
+github.com/hashicorp/terraform-plugin-framework v1.11.0/go.mod h1:qBXLDn69kM97NNVi/MQ9qgd1uWWsVftGSnygYG1tImM=
+github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co=
+github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ=
+github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
+github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
+github.com/hashicorp/terraform-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/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
+github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
+github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+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=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
+google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/data/catalog_gen.go

@@ -11,7 +11,7 @@ import (
     "github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-type cwFilterDataSource struct{}
+type cwFilterDataSource struct{ client *MetadataClient }
 
 func NewCloudWatchFilterDataSource() datasource.DataSource { return &cwFilterDataSource{} }
 
@@ -42,14 +42,19 @@ func (d *cwFilterDataSource) Schema(_ context.Context, _ datasource.SchemaReques
     }
 }
 
+func (d *cwFilterDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, _ *datasource.ConfigureResponse) {
+    if req.ProviderData == nil { return }
+    if c, ok := req.ProviderData.(*MetadataClient); ok { d.client = c }
+}
+
 func (d *cwFilterDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
     var data cwFilterModel
     diags := req.Config.Get(ctx, &data)
     resp.Diagnostics.Append(diags...)
     if resp.Diagnostics.HasError() { return }
 
-    client, ok := req.ProviderData.(*MetadataClient)
-    if !ok || client == nil {
+    client := d.client
+    if client == nil {
         resp.Diagnostics.AddError("Provider not configured", "Missing metadata client")
         return
     }
@@ -100,4 +105,3 @@ func (d *cwFilterDataSource) Read(ctx context.Context, req datasource.ReadReques
 
 func contains(arr []string, s string) bool { for _, v := range arr { if v == s { return true } }; return false }
 func escape(s string) string { return strings.ReplaceAll(s, "\"", "\\\"") }
-

pkg/provider/datasource_cw_filter.go

@@ -6,9 +6,10 @@ import (
     "github.com/hashicorp/terraform-plugin-framework/datasource"
     "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
     "github.com/hashicorp/terraform-plugin-framework/types"
+    "github.com/hashicorp/terraform-plugin-framework/attr"
 )
 
-type structDataSource struct{}
+type structDataSource struct{ client *MetadataClient }
 
 func NewStructDataSource() datasource.DataSource { return &structDataSource{} }
 
@@ -34,14 +35,19 @@ func (d *structDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
     }
 }
 
+func (d *structDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, _ *datasource.ConfigureResponse) {
+    if req.ProviderData == nil { return }
+    if c, ok := req.ProviderData.(*MetadataClient); ok { d.client = c }
+}
+
 func (d *structDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
     var data structDataModel
     diags := req.Config.Get(ctx, &data)
     resp.Diagnostics.Append(diags...)
     if resp.Diagnostics.HasError() { return }
 
-    client, ok := req.ProviderData.(*MetadataClient)
-    if !ok || client == nil {
+    client := d.client
+    if client == nil {
         resp.Diagnostics.AddError("Provider not configured", "Missing metadata client")
         return
     }
@@ -59,7 +65,7 @@ func (d *structDataSource) Read(ctx context.Context, req datasource.ReadRequest,
     for _, e := range allowed { data.AllowedEvents = append(data.AllowedEvents, types.StringValue(e)) }
     _ = single
     // keys map
-    kv := map[string]types.Value{}
+    kv := map[string]attr.Value{}
     for k, v := range client.Keys { kv[k] = types.StringValue(v) }
     m, md := types.MapValue(types.StringType, kv)
     resp.Diagnostics.Append(md...)
@@ -68,4 +74,3 @@ func (d *structDataSource) Read(ctx context.Context, req datasource.ReadRequest,
     diags = resp.State.Set(ctx, &data)
     resp.Diagnostics.Append(diags...)
 }
-

pkg/provider/datasource_struct.go

@@ -1,86 +1,32 @@
 package provider
 
 import (
-    "encoding/json"
     "fmt"
-    "os"
-    "path/filepath"
+    "github.com/DocSpring/terraform-provider-logstruct/pkg/data"
 )
 
 type MetadataClient struct {
-    Keys         map[string]string
-    Enums        map[string][]EnumValue
-    Structs      map[string]StructInfo
+    Keys    map[string]string
+    Structs map[string]StructCatalog
 }
 
-type EnumValue struct {
-    Name  string `json:"name"`
-    Value string `json:"value"`
-}
-
-type FieldInfo struct {
-    Optional  bool   `json:"optional"`
-    Type      string `json:"type"`
-    BaseEnum  string `json:"base_enum,omitempty"`
-    EnumValue string `json:"enum_value,omitempty"`
-    // for enum_union
-    EnumValues []string `json:"enum_values,omitempty"`
-}
-
-type StructInfo struct {
-    Name   string               `json:"name"`
-    Fields map[string]FieldInfo `json:"fields"`
-}
+type StructCatalog = data.StructCatalog
 
-func NewMetadataClient(dir string) (*MetadataClient, error) {
-    c := &MetadataClient{}
-
-    // keys
-    keysPath := filepath.Join(dir, "log-keys.json")
-    b, err := os.ReadFile(keysPath)
-    if err != nil { return nil, fmt.Errorf("read log-keys.json: %w", err) }
-    if err := json.Unmarshal(b, &c.Keys); err != nil { return nil, fmt.Errorf("parse log-keys.json: %w", err) }
-
-    // enums
-    enumsPath := filepath.Join(dir, "sorbet-enums.json")
-    b, err = os.ReadFile(enumsPath)
-    if err != nil { return nil, fmt.Errorf("read sorbet-enums.json: %w", err) }
-    if err := json.Unmarshal(b, &c.Enums); err != nil { return nil, fmt.Errorf("parse sorbet-enums.json: %w", err) }
-
-    // structs
-    structsPath := filepath.Join(dir, "sorbet-log-structs.json")
-    b, err = os.ReadFile(structsPath)
-    if err != nil { return nil, fmt.Errorf("read sorbet-log-structs.json: %w", err) }
-    if err := json.Unmarshal(b, &c.Structs); err != nil { return nil, fmt.Errorf("parse sorbet-log-structs.json: %w", err) }
-
-    return c, nil
+func NewMetadataClient() (*MetadataClient, error) {
+    return &MetadataClient{Keys: data.CatalogData.Keys, Structs: data.CatalogData.Structs}, nil
 }
 
 func (c *MetadataClient) AllowedEventsForStruct(structName string) ([]string, bool, error) {
     si, ok := c.Structs[structName]
     if !ok { return nil, false, fmt.Errorf("unknown struct: %s", structName) }
-    f, ok := si.Fields["event"]
-    if !ok { return nil, false, fmt.Errorf("struct %s missing event field", structName) }
-    switch f.Type {
-    case "enum_single":
-        if f.EnumValue == "" { return nil, false, fmt.Errorf("struct %s event enum_single missing value", structName) }
-        return []string{f.EnumValue}, true, nil
-    case "enum_union":
-        if len(f.EnumValues) == 0 { return nil, false, fmt.Errorf("struct %s event enum_union empty", structName) }
-        return f.EnumValues, false, nil
-    default:
-        return nil, false, fmt.Errorf("struct %s event field not enum: %s", structName, f.Type)
-    }
+    if len(si.AllowedEvents) == 1 { return si.AllowedEvents, true, nil }
+    if len(si.AllowedEvents) > 1 { return si.AllowedEvents, false, nil }
+    return nil, false, fmt.Errorf("struct %s has no allowed events", structName)
 }
 
 func (c *MetadataClient) FixedSourceForStruct(structName string) (string, bool, error) {
     si, ok := c.Structs[structName]
     if !ok { return "", false, fmt.Errorf("unknown struct: %s", structName) }
-    f, ok := si.Fields["source"]
-    if !ok { return "", false, fmt.Errorf("struct %s missing source field", structName) }
-    if f.Type == "enum_single" && f.EnumValue != "" {
-        return f.EnumValue, true, nil
-    }
+    if si.FixedSource != nil { return *si.FixedSource, true, nil }
     return "", false, nil
 }
-