Skip to content

Commit ff05362

Browse files
mildwonkeymildwonkey
authored
providers.Interface: rename ValidateDataSourceConfig to ValidateDataResourceConfig (hashicorp#27874)
* providers.Interface: rename ValidateDataSourceConfig to ValidateDataResourceConfig This PR came about after renaming ValidateResourceTypeConfig to ValidateResourceConfig: I now understand that we'd called it the former instead of the latter to indicate that the function wasn't necessarily operating on a resource that actually exists. A possibly-more-accurate renaming of both functions might then be ValidateManagedResourceConfig and ValidateDataResourceConfig. The next commit will update the protocol (v6 only) as well; these are in separate commits for reviewers and will get squashed together before merging. * extend renaming to protov6
1 parent 21d881d commit ff05362

20 files changed

Lines changed: 339 additions & 338 deletions

File tree

‎builtin/providers/terraform/provider.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ func (p *Provider) ValidateProviderConfig(req providers.ValidateProviderConfigRe
3939
return res
4040
}
4141

42-
// ValidateDataSourceConfig is used to validate the data source configuration values.
43-
func (p *Provider) ValidateDataSourceConfig(req providers.ValidateDataSourceConfigRequest) providers.ValidateDataSourceConfigResponse {
42+
// ValidateDataResourceConfig is used to validate the data source configuration values.
43+
func (p *Provider) ValidateDataResourceConfig(req providers.ValidateDataResourceConfigRequest) providers.ValidateDataResourceConfigResponse {
4444
// FIXME: move the backend configuration validate call that's currently
4545
// inside the read method into here so that we can catch provider configuration
4646
// errors in terraform validate as well as during terraform plan.
47-
var res providers.ValidateDataSourceConfigResponse
47+
var res providers.ValidateDataResourceConfigResponse
4848

4949
// This should not happen
5050
if req.TypeName != "terraform_remote_state" {

‎docs/plugin-protocol/tfplugin6.0.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ service Provider {
146146
rpc GetProviderSchema(GetProviderSchema.Request) returns (GetProviderSchema.Response);
147147
rpc ValidateProviderConfig(ValidateProviderConfig.Request) returns (ValidateProviderConfig.Response);
148148
rpc ValidateResourceConfig(ValidateResourceConfig.Request) returns (ValidateResourceConfig.Response);
149-
rpc ValidateDataSourceConfig(ValidateDataSourceConfig.Request) returns (ValidateDataSourceConfig.Response);
149+
rpc ValidateDataResourceConfig(ValidateDataResourceConfig.Request) returns (ValidateDataResourceConfig.Response);
150150
rpc UpgradeResourceState(UpgradeResourceState.Request) returns (UpgradeResourceState.Response);
151151

152152
//////// One-time initialization, called before other functions below
@@ -222,7 +222,7 @@ message ValidateResourceConfig {
222222
}
223223
}
224224

225-
message ValidateDataSourceConfig {
225+
message ValidateDataResourceConfig {
226226
message Request {
227227
string type_name = 1;
228228
DynamicValue config = 2;

‎internal/grpcwrap/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (p *provider) ValidateDataSourceConfig(_ context.Context, req *tfplugin5.Va
113113
return resp, nil
114114
}
115115

116-
validateResp := p.provider.ValidateDataSourceConfig(providers.ValidateDataSourceConfigRequest{
116+
validateResp := p.provider.ValidateDataResourceConfig(providers.ValidateDataResourceConfigRequest{
117117
TypeName: req.TypeName,
118118
Config: configVal,
119119
})

‎internal/grpcwrap/provider6.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func (p *provider6) ValidateResourceConfig(_ context.Context, req *tfplugin6.Val
103103
return resp, nil
104104
}
105105

106-
func (p *provider6) ValidateDataSourceConfig(_ context.Context, req *tfplugin6.ValidateDataSourceConfig_Request) (*tfplugin6.ValidateDataSourceConfig_Response, error) {
107-
resp := &tfplugin6.ValidateDataSourceConfig_Response{}
106+
func (p *provider6) ValidateDataResourceConfig(_ context.Context, req *tfplugin6.ValidateDataResourceConfig_Request) (*tfplugin6.ValidateDataResourceConfig_Response, error) {
107+
resp := &tfplugin6.ValidateDataResourceConfig_Response{}
108108
ty := p.schema.DataSources[req.TypeName].Block.ImpliedType()
109109

110110
configVal, err := decodeDynamicValue6(req.Config, ty)
@@ -113,7 +113,7 @@ func (p *provider6) ValidateDataSourceConfig(_ context.Context, req *tfplugin6.V
113113
return resp, nil
114114
}
115115

116-
validateResp := p.provider.ValidateDataSourceConfig(providers.ValidateDataSourceConfigRequest{
116+
validateResp := p.provider.ValidateDataResourceConfig(providers.ValidateDataResourceConfigRequest{
117117
TypeName: req.TypeName,
118118
Config: configVal,
119119
})

‎internal/legacy/terraform/provider_mock.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ type MockProvider struct {
3535
ValidateResourceConfigRequest providers.ValidateResourceConfigRequest
3636
ValidateResourceConfigFn func(providers.ValidateResourceConfigRequest) providers.ValidateResourceConfigResponse
3737

38-
ValidateDataSourceConfigCalled bool
39-
ValidateDataSourceConfigTypeName string
40-
ValidateDataSourceConfigResponse providers.ValidateDataSourceConfigResponse
41-
ValidateDataSourceConfigRequest providers.ValidateDataSourceConfigRequest
42-
ValidateDataSourceConfigFn func(providers.ValidateDataSourceConfigRequest) providers.ValidateDataSourceConfigResponse
38+
ValidateDataResourceConfigCalled bool
39+
ValidateDataResourceConfigTypeName string
40+
ValidateDataResourceConfigResponse providers.ValidateDataResourceConfigResponse
41+
ValidateDataResourceConfigRequest providers.ValidateDataResourceConfigRequest
42+
ValidateDataResourceConfigFn func(providers.ValidateDataResourceConfigRequest) providers.ValidateDataResourceConfigResponse
4343

4444
UpgradeResourceStateCalled bool
4545
UpgradeResourceStateTypeName string
@@ -150,18 +150,18 @@ func (p *MockProvider) ValidateResourceConfig(r providers.ValidateResourceConfig
150150
return p.ValidateResourceConfigResponse
151151
}
152152

153-
func (p *MockProvider) ValidateDataSourceConfig(r providers.ValidateDataSourceConfigRequest) providers.ValidateDataSourceConfigResponse {
153+
func (p *MockProvider) ValidateDataResourceConfig(r providers.ValidateDataResourceConfigRequest) providers.ValidateDataResourceConfigResponse {
154154
p.Lock()
155155
defer p.Unlock()
156156

157-
p.ValidateDataSourceConfigCalled = true
158-
p.ValidateDataSourceConfigRequest = r
157+
p.ValidateDataResourceConfigCalled = true
158+
p.ValidateDataResourceConfigRequest = r
159159

160-
if p.ValidateDataSourceConfigFn != nil {
161-
return p.ValidateDataSourceConfigFn(r)
160+
if p.ValidateDataResourceConfigFn != nil {
161+
return p.ValidateDataResourceConfigFn(r)
162162
}
163163

164-
return p.ValidateDataSourceConfigResponse
164+
return p.ValidateDataResourceConfigResponse
165165
}
166166

167167
func (p *MockProvider) UpgradeResourceState(r providers.UpgradeResourceStateRequest) providers.UpgradeResourceStateResponse {

‎internal/provider-simple-v6/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (s simple) ValidateResourceConfig(req providers.ValidateResourceConfigReque
5858
return resp
5959
}
6060

61-
func (s simple) ValidateDataSourceConfig(req providers.ValidateDataSourceConfigRequest) (resp providers.ValidateDataSourceConfigResponse) {
61+
func (s simple) ValidateDataResourceConfig(req providers.ValidateDataResourceConfigRequest) (resp providers.ValidateDataResourceConfigResponse) {
6262
return resp
6363
}
6464

‎internal/provider-simple/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (s simple) ValidateResourceConfig(req providers.ValidateResourceConfigReque
5858
return resp
5959
}
6060

61-
func (s simple) ValidateDataSourceConfig(req providers.ValidateDataSourceConfigRequest) (resp providers.ValidateDataSourceConfigResponse) {
61+
func (s simple) ValidateDataResourceConfig(req providers.ValidateDataResourceConfigRequest) (resp providers.ValidateDataResourceConfigResponse) {
6262
return resp
6363
}
6464

0 commit comments

Comments
 (0)