Skip to content

Commit ec3773e

Browse files
bfladbflad
authored
Updates for [email protected] (#184)
Dependency updated via: ```go go get github.com/hashicorp/[email protected] go mod tidy ```
1 parent 58e0baa commit ec3773e

File tree

4 files changed

+29
-23
lines changed

4 files changed

+29
-23
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/hashicorp/terraform-plugin-docs v0.13.0
7-
github.com/hashicorp/terraform-plugin-framework v0.11.1
7+
github.com/hashicorp/terraform-plugin-framework v0.12.0
88
github.com/hashicorp/terraform-plugin-framework-validators v0.5.0
99
github.com/hashicorp/terraform-plugin-go v0.14.0
1010
github.com/hashicorp/terraform-plugin-sdk/v2 v2.21.0
@@ -21,7 +21,7 @@ require (
2121
github.com/davecgh/go-spew v1.1.1 // indirect
2222
github.com/fatih/color v1.13.0 // indirect
2323
github.com/golang/protobuf v1.5.2 // indirect
24-
github.com/google/go-cmp v0.5.8 // indirect
24+
github.com/google/go-cmp v0.5.9 // indirect
2525
github.com/google/uuid v1.3.0 // indirect
2626
github.com/hashicorp/errwrap v1.1.0 // indirect
2727
github.com/hashicorp/go-checkpoint v0.5.0 // indirect

‎go.sum

+4-3
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
9494
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9595
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9696
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
97-
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
9897
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
98+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
99+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
99100
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
100101
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
101102
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -138,8 +139,8 @@ github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e
138139
github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM=
139140
github.com/hashicorp/terraform-plugin-docs v0.13.0 h1:6e+VIWsVGb6jYJewfzq2ok2smPzZrt1Wlm9koLeKazY=
140141
github.com/hashicorp/terraform-plugin-docs v0.13.0/go.mod h1:W0oCmHAjIlTHBbvtppWHe8fLfZ2BznQbuv8+UD8OucQ=
141-
github.com/hashicorp/terraform-plugin-framework v0.11.1 h1:rq8f+TLDO4tJu+n9mMYlDrcRoIdrg0gTUvV2Jr0Ya24=
142-
github.com/hashicorp/terraform-plugin-framework v0.11.1/go.mod h1:GENReHOz6GEt8Jk3UN94vk8BdC6irEHFgN3Z9HPhPUU=
142+
github.com/hashicorp/terraform-plugin-framework v0.12.0 h1:Bk3l5MQUaZoo5eplr+u1FomYqGS564e8Tp3rutnCfYg=
143+
github.com/hashicorp/terraform-plugin-framework v0.12.0/go.mod h1:wcZdk4+Uef6Ng+BiBJjGAcIPlIs5bhlEV/TA1k6Xkq8=
143144
github.com/hashicorp/terraform-plugin-framework-validators v0.5.0 h1:eD79idhnJOBajkUMEbm0c8dOyOb/F49STbUEVojT6F4=
144145
github.com/hashicorp/terraform-plugin-framework-validators v0.5.0/go.mod h1:NfGgclDM3FZqvNVppPKE2aHI1JAyT002ypPRya7ch3I=
145146
github.com/hashicorp/terraform-plugin-go v0.14.0 h1:ttnSlS8bz3ZPYbMb84DpcPhY4F5DsQtcAS7cHo8uvP4=

‎internal/provider/data_source_http.go

+15-12
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,27 @@ import (
1212
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
1313
"github.com/hashicorp/terraform-plugin-framework/datasource"
1414
"github.com/hashicorp/terraform-plugin-framework/diag"
15-
"github.com/hashicorp/terraform-plugin-framework/provider"
1615
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1716
"github.com/hashicorp/terraform-plugin-framework/types"
1817
)
1918

20-
var _ provider.DataSourceType = (*httpDataSourceType)(nil)
19+
var _ datasource.DataSource = (*httpDataSource)(nil)
20+
21+
func NewHttpDataSource() datasource.DataSource {
22+
return &httpDataSource{}
23+
}
2124

22-
type httpDataSourceType struct{}
25+
type httpDataSource struct{}
26+
27+
func (d *httpDataSource) Metadata(_ context.Context, _ datasource.MetadataRequest, resp *datasource.MetadataResponse) {
28+
// This data source name unconventionally is equal to the provider name,
29+
// but it has been named this since its inception. Changing this widely
30+
// adopted data source name should only be done with strong consideration
31+
// to the practitioner burden of updating it everywhere.
32+
resp.TypeName = "http"
33+
}
2334

24-
func (d *httpDataSourceType) GetSchema(context.Context) (tfsdk.Schema, diag.Diagnostics) {
35+
func (d *httpDataSource) GetSchema(context.Context) (tfsdk.Schema, diag.Diagnostics) {
2536
return tfsdk.Schema{
2637
Description: `
2738
The ` + "`http`" + ` data source makes an HTTP GET request to the given URL and exports
@@ -111,14 +122,6 @@ your control should be treated as untrustworthy.`,
111122
}, nil
112123
}
113124

114-
func (d *httpDataSourceType) NewDataSource(context.Context, provider.Provider) (datasource.DataSource, diag.Diagnostics) {
115-
return &httpDataSource{}, nil
116-
}
117-
118-
var _ datasource.DataSource = (*httpDataSource)(nil)
119-
120-
type httpDataSource struct{}
121-
122125
func (d *httpDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
123126
var model modelV0
124127
diags := req.Config.Get(ctx, &model)

‎internal/provider/provider.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ package provider
33
import (
44
"context"
55

6+
"github.com/hashicorp/terraform-plugin-framework/datasource"
67
"github.com/hashicorp/terraform-plugin-framework/diag"
78
"github.com/hashicorp/terraform-plugin-framework/provider"
9+
"github.com/hashicorp/terraform-plugin-framework/resource"
810
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
911
)
1012

@@ -23,12 +25,12 @@ func (p *httpProvider) GetSchema(context.Context) (tfsdk.Schema, diag.Diagnostic
2325
func (p *httpProvider) Configure(context.Context, provider.ConfigureRequest, *provider.ConfigureResponse) {
2426
}
2527

26-
func (p *httpProvider) GetResources(context.Context) (map[string]provider.ResourceType, diag.Diagnostics) {
27-
return map[string]provider.ResourceType{}, nil
28+
func (p *httpProvider) Resources(context.Context) []func() resource.Resource {
29+
return nil
2830
}
2931

30-
func (p *httpProvider) GetDataSources(context.Context) (map[string]provider.DataSourceType, diag.Diagnostics) {
31-
return map[string]provider.DataSourceType{
32-
"http": &httpDataSourceType{},
33-
}, nil
32+
func (p *httpProvider) DataSources(context.Context) []func() datasource.DataSource {
33+
return []func() datasource.DataSource{
34+
NewHttpDataSource,
35+
}
3436
}

0 commit comments

Comments
 (0)