- Notifications
You must be signed in to change notification settings - Fork22
DNM: hack: terraform-plugin-framework and dynamic types#354
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
johnstcn wants to merge4 commits intomainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+381 −6
Draft
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
4 changes: 2 additions & 2 deletionsMakefile
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletionsgo.mod
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletionsgo.sum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
55 changes: 51 additions & 4 deletionsmain.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,65 @@ | ||
| package main | ||
| import ( | ||
| "context" | ||
| "flag" | ||
| "log" | ||
| "github.com/hashicorp/terraform-plugin-framework/providerserver" | ||
| "github.com/hashicorp/terraform-plugin-go/tfprotov6" | ||
| "github.com/hashicorp/terraform-plugin-go/tfprotov6/tf6server" | ||
| "github.com/hashicorp/terraform-plugin-mux/tf5to6server" | ||
| "github.com/hashicorp/terraform-plugin-mux/tf6muxserver" | ||
| "github.com/coder/terraform-provider-coder/v2/provider" | ||
| "github.com/coder/terraform-provider-coder/v2/tpfprovider" | ||
| ) | ||
| // Run the docs generation tool, check its repository for more information on how it works and how docs | ||
| // can be customized. | ||
| //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs | ||
| func main() { | ||
| ctx := context.Background() | ||
| var debug bool | ||
| flag.BoolVar(&debug, "debug", false, "enable debug logging") | ||
| flag.Parse() | ||
| servePprof() | ||
| upgradedSDKServer, err := tf5to6server.UpgradeServer( | ||
| ctx, | ||
| provider.New().GRPCProvider, | ||
| ) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| providers := []func() tfprotov6.ProviderServer{ | ||
| providerserver.NewProtocol6(tpfprovider.NewFrameworkProvider()()), | ||
| func() tfprotov6.ProviderServer { | ||
| return upgradedSDKServer | ||
| }, | ||
| } | ||
| muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| var serveOpts []tf6server.ServeOpt | ||
| if debug { | ||
| serveOpts = append(serveOpts, tf6server.WithManagedDebug()) | ||
| } | ||
| err = tf6server.Serve( | ||
| "registry.terraform.io/coder/coder", | ||
| muxServer.ProviderServer, | ||
| serveOpts..., | ||
| ) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| } |
100 changes: 100 additions & 0 deletionstpfprovider/parameter.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| package tpfprovider | ||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "math/big" | ||
| "os" | ||
| "strings" | ||
| "github.com/coder/terraform-provider-coder/v2/provider" | ||
| "github.com/hashicorp/terraform-plugin-framework/datasource" | ||
| "github.com/hashicorp/terraform-plugin-framework/datasource/schema" | ||
| "github.com/hashicorp/terraform-plugin-framework/types" | ||
| ) | ||
| type parameterDataSourceModel struct { | ||
| Name types.String `tfsdk:"name"` | ||
| Type types.Dynamic `tfsdk:"type"` | ||
| Value types.Dynamic `tfsdk:"value"` | ||
| } | ||
| type parameterDataSource struct{} | ||
| func NewParameterDataSource() datasource.DataSource { | ||
| return ¶meterDataSource{} | ||
| } | ||
| func (m *parameterDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) { | ||
| resp.TypeName = "coder_parameter" | ||
| } | ||
| func (m *parameterDataSource) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) { | ||
| resp.Schema = schema.Schema{ | ||
| Attributes: map[string]schema.Attribute{ | ||
| "name": schema.StringAttribute{ | ||
| Required: true, | ||
| }, | ||
| "type": schema.DynamicAttribute{ | ||
| Required: true, | ||
| }, | ||
| "value": schema.DynamicAttribute{ | ||
| Computed: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
| func (m *parameterDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { | ||
| var data parameterDataSourceModel | ||
| resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) | ||
| if resp.Diagnostics.HasError() { | ||
| return | ||
| } | ||
| if data.Name.IsNull() { | ||
| resp.Diagnostics.AddError("name is required", "name") | ||
| return | ||
| } | ||
| ds := data.Name.ValueString() | ||
| parameterEnv := provider.ParameterEnvironmentVariable(ds) | ||
| rawValue, ok := os.LookupEnv(parameterEnv) | ||
| if !ok { | ||
| resp.Diagnostics.AddError("parameter not found", "name") | ||
| return | ||
| } | ||
| switch data.Type.UnderlyingValue().(type) { | ||
| case types.String: | ||
| data.Value = types.DynamicValue(types.StringValue(rawValue)) | ||
| case types.Number: | ||
| // convert the raw value to a number | ||
| var floatVal float64 | ||
| if err := json.NewDecoder(strings.NewReader(rawValue)).Decode(&floatVal); err != nil { | ||
| resp.Diagnostics.AddError("failed to parse value as number", "value") | ||
| return | ||
| } | ||
| data.Value = types.DynamicValue(types.NumberValue(big.NewFloat(floatVal))) | ||
| case types.Bool: | ||
| // convert the raw value to a bool | ||
| var boolVal bool | ||
| if err := json.NewDecoder(strings.NewReader(rawValue)).Decode(&boolVal); err != nil { | ||
| resp.Diagnostics.AddError("failed to parse value as bool", "value") | ||
| return | ||
| } | ||
| data.Value = types.DynamicValue(types.BoolValue(boolVal)) | ||
| case types.List: | ||
| // TODO: handle list | ||
| resp.Diagnostics.AddError("TODO: list type not supported", "type") | ||
| return | ||
| case types.Map: | ||
| // TODO: handle map | ||
| resp.Diagnostics.AddError("TODO: map type not supported", "type") | ||
| return | ||
| } | ||
| resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) | ||
| } |
151 changes: 151 additions & 0 deletionstpfprovider/parameter_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package tpfprovider | ||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "testing" | ||
| "github.com/coder/terraform-provider-coder/v2/provider" | ||
| "github.com/hashicorp/terraform-plugin-testing/helper/resource" | ||
| "github.com/hashicorp/terraform-plugin-testing/terraform" | ||
| ) | ||
| func TestAccParameterDataSource(t *testing.T) { | ||
| t.Run("string", func(t *testing.T) { | ||
| t.Setenv(provider.ParameterEnvironmentVariable("test"), "test") | ||
| resource.Test(t, resource.TestCase{ | ||
| IsUnitTest: true, | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, | ||
| Steps: []resource.TestStep{{ | ||
| Config: ` | ||
| provider coder {} | ||
| data "coder_parameter" "test" { | ||
| name = "test" | ||
| type = "" | ||
| }`, | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testParameterEnv("test", "test"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "name", "test"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "type", ""), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value", "test"), | ||
| ), | ||
| }}, | ||
| }) | ||
| }) | ||
| t.Run("number", func(t *testing.T) { | ||
| t.Setenv(provider.ParameterEnvironmentVariable("test"), "3.14") | ||
| resource.Test(t, resource.TestCase{ | ||
| IsUnitTest: true, | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, | ||
| Steps: []resource.TestStep{{ | ||
| Config: ` | ||
| provider coder {} | ||
| data "coder_parameter" "test" { | ||
| name = "test" | ||
| type = 0 | ||
| }`, | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testParameterEnv("test", "3.14"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "name", "test"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "type", "0"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value", "3.14"), | ||
| ), | ||
| }}, | ||
| }) | ||
| }) | ||
| t.Run("bool", func(t *testing.T) { | ||
| t.Setenv(provider.ParameterEnvironmentVariable("test"), "true") | ||
| resource.Test(t, resource.TestCase{ | ||
| IsUnitTest: true, | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, | ||
| Steps: []resource.TestStep{{ | ||
| Config: ` | ||
| provider coder {} | ||
| data "coder_parameter" "test" { | ||
| name = "test" | ||
| type = false | ||
| }`, | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testParameterEnv("test", "true"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "name", "test"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "type", "false"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value", "true"), | ||
| ), | ||
| }}, | ||
| }) | ||
| }) | ||
| t.Run("list of string", func(t *testing.T) { | ||
| t.Skip("TODO: not implemented yet") | ||
| t.Setenv(provider.ParameterEnvironmentVariable("test"), `["a","b","c"]`) | ||
| resource.Test(t, resource.TestCase{ | ||
| IsUnitTest: true, | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, | ||
| Steps: []resource.TestStep{{ | ||
| Config: ` | ||
| provider coder {} | ||
| data "coder_parameter" "test" { | ||
| name = "test" | ||
| type = [""] | ||
| }`, | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testParameterEnv("test", `["a","b","c"]`), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "name", "test"), | ||
| resource.TestCheckTypeSetElemAttr("data.coder_parameter.test", "type*", "[]"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.#", "3"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.0", "a"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.1", "b"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.2", "c"), | ||
| ), | ||
| }}, | ||
| }) | ||
| }) | ||
| t.Run("list of number", func(t *testing.T) { | ||
| t.Skip("TODO: not implemented yet") | ||
| t.Setenv(provider.ParameterEnvironmentVariable("test"), `[1, 2, 3]`) | ||
| resource.Test(t, resource.TestCase{ | ||
| IsUnitTest: true, | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, | ||
| Steps: []resource.TestStep{{ | ||
| Config: ` | ||
| provider coder {} | ||
| data "coder_parameter" "test" { | ||
| name = "test" | ||
| type = [0] | ||
| } | ||
| `, | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| testParameterEnv("test", `[1,2,3]`), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "name", "test"), | ||
| resource.TestCheckTypeSetElemAttr("data.coder_parameter.test", "type*", "[]"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.#", "3"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.0", "1"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.1", "2"), | ||
| resource.TestCheckResourceAttr("data.coder_parameter.test", "value.2", "3"), | ||
| ), | ||
| }}, | ||
| }) | ||
| }) | ||
| } | ||
| func testParameterEnv(name, value string) func(*terraform.State) error { | ||
| return func(*terraform.State) error { | ||
| penv := provider.ParameterEnvironmentVariable("test") | ||
| val, ok := os.LookupEnv(penv) | ||
| if !ok { | ||
| return fmt.Errorf("parameter environment variable %q not set", penv) | ||
| } | ||
| if val != value { | ||
| return fmt.Errorf("parameter environment variable %q has unexpected value %q", penv, val) | ||
| } | ||
| return nil | ||
| } | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.