upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-02-18 18:29:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ephemeral protocol rename

Browse source 
Add `Resource` to all the ephemeral protocol symbols to make them
consistent with existing naming conventions.
This commit is contained in:
James Bardin 2024-09-20 11:08:50 -04:00
parent 1a72b39d42
commit 9c3dc8f73a
22 changed files with 1512 additions and 1496 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/plugin-protocol/tfplugin5.7.proto
View file

@ -274,10 +274,10 @@ service Provider {
rpc ReadDataSource(ReadDataSource.Request) returns (ReadDataSource.Response);
//////// Ephemeral Resource Lifecycle
rpc ValidateEphemeralConfig(ValidateEphemeralConfig.Request) returns (ValidateEphemeralConfig.Response);
rpc OpenEphemeral(OpenEphemeral.Request) returns (OpenEphemeral.Response);
rpc RenewEphemeral(RenewEphemeral.Request) returns (RenewEphemeral.Response);
rpc CloseEphemeral(CloseEphemeral.Request) returns (CloseEphemeral.Response);
rpc ValidateEphemeralResourceConfig(ValidateEphemeralResourceConfig.Request) returns (ValidateEphemeralResourceConfig.Response);
rpc OpenEphemeralResource(OpenEphemeralResource.Request) returns (OpenEphemeralResource.Response);
rpc RenewEphemeralResource(RenewEphemeralResource.Request) returns (RenewEphemeralResource.Response);
rpc CloseEphemeralResource(CloseEphemeralResource.Request) returns (CloseEphemeralResource.Response);
// GetFunctions returns the definitions of all functions.
rpc GetFunctions(GetFunctions.Request) returns (GetFunctions.Response);
@ -402,7 +402,7 @@ message ValidateDataSourceConfig {
}
}
message ValidateEphemeralConfig {
message ValidateEphemeralResourceConfig {
message Request {
string type_name = 1;
DynamicValue config = 2;
@ -625,7 +625,7 @@ message ProvisionResource {
}
}
message OpenEphemeral {
message OpenEphemeralResource {
message Request {
string type_name = 1;
DynamicValue config = 2;
@ -639,7 +639,7 @@ message OpenEphemeral {
}
}
message RenewEphemeral {
message RenewEphemeralResource {
message Request {
string type_name = 1;
DynamicValue state = 2;
@ -652,7 +652,7 @@ message RenewEphemeral {
}
}
message CloseEphemeral {
message CloseEphemeralResource {
message Request {
string type_name = 1;
DynamicValue state = 2;

16
docs/plugin-protocol/tfplugin6.7.proto
View file

@ -292,10 +292,10 @@ service Provider {
rpc ReadDataSource(ReadDataSource.Request) returns (ReadDataSource.Response);
//////// Ephemeral Resource Lifecycle
rpc ValidateEphemeralConfig(ValidateEphemeralConfig.Request) returns (ValidateEphemeralConfig.Response);
rpc OpenEphemeral(OpenEphemeral.Request) returns (OpenEphemeral.Response);
rpc RenewEphemeral(RenewEphemeral.Request) returns (RenewEphemeral.Response);
rpc CloseEphemeral(CloseEphemeral.Request) returns (CloseEphemeral.Response);
rpc ValidateEphemeralResourceConfig(ValidateEphemeralResourceConfig.Request) returns (ValidateEphemeralResourceConfig.Response);
rpc OpenEphemeralResource(OpenEphemeralResource.Request) returns (OpenEphemeralResource.Response);
rpc RenewEphemeralResource(RenewEphemeralResource.Request) returns (RenewEphemeralResource.Response);
rpc CloseEphemeralResource(CloseEphemeralResource.Request) returns (CloseEphemeralResource.Response);
// GetFunctions returns the definitions of all functions.
rpc GetFunctions(GetFunctions.Request) returns (GetFunctions.Response);
@ -419,7 +419,7 @@ message ValidateDataResourceConfig {
}
}
message ValidateEphemeralConfig {
message ValidateEphemeralResourceConfig {
message Request {
string type_name = 1;
DynamicValue config = 2;
@ -605,7 +605,7 @@ message ReadDataSource {
}
}
message OpenEphemeral {
message OpenEphemeralResource {
message Request {
string type_name = 1;
DynamicValue config = 2;
@ -619,7 +619,7 @@ message OpenEphemeral {
}
}
message RenewEphemeral {
message RenewEphemeralResource {
message Request {
string type_name = 1;
DynamicValue state = 2;
@ -632,7 +632,7 @@ message RenewEphemeral {
}
}
message CloseEphemeral {
message CloseEphemeralResource {
message Request {
string type_name = 1;
DynamicValue state = 2;

22
internal/builtin/providers/terraform/provider.go
View file

@ -195,29 +195,29 @@ func (p *Provider) ValidateResourceConfig(req providers.ValidateResourceConfigRe
return validateDataStoreResourceConfig(req)
}
func (p *Provider) ValidateEphemeralConfig(req providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
var resp providers.ValidateEphemeralConfigResponse
func (p *Provider) ValidateEphemeralResourceConfig(req providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
var resp providers.ValidateEphemeralResourceConfigResponse
resp.Diagnostics.Append(fmt.Errorf("unsupported ephemeral resource type %q", req.TypeName))
return resp
}
// OpenEphemeral implements providers.Interface.
func (p *Provider) OpenEphemeral(req providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
var resp providers.OpenEphemeralResponse
// OpenEphemeralResource implements providers.Interface.
func (p *Provider) OpenEphemeralResource(req providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
var resp providers.OpenEphemeralResourceResponse
resp.Diagnostics.Append(fmt.Errorf("unsupported ephemeral resource type %q", req.TypeName))
return resp
}
// RenewEphemeral implements providers.Interface.
func (p *Provider) RenewEphemeral(req providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
var resp providers.RenewEphemeralResponse
// RenewEphemeralResource implements providers.Interface.
func (p *Provider) RenewEphemeralResource(req providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
var resp providers.RenewEphemeralResourceResponse
resp.Diagnostics.Append(fmt.Errorf("unsupported ephemeral resource type %q", req.TypeName))
return resp
}
// CloseEphemeral implements providers.Interface.
func (p *Provider) CloseEphemeral(req providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
var resp providers.CloseEphemeralResponse
// CloseEphemeralResource implements providers.Interface.
func (p *Provider) CloseEphemeralResource(req providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
var resp providers.CloseEphemeralResourceResponse
resp.Diagnostics.Append(fmt.Errorf("unsupported ephemeral resource type %q", req.TypeName))
return resp
}

12
internal/grpcwrap/provider.go
View file

@ -146,8 +146,8 @@ func (p *provider) ValidateDataSourceConfig(_ context.Context, req *tfplugin5.Va
return resp, nil
}
func (p *provider) ValidateEphemeralConfig(_ context.Context, req *tfplugin5.ValidateEphemeralConfig_Request) (*tfplugin5.ValidateEphemeralConfig_Response, error) {
resp := &tfplugin5.ValidateEphemeralConfig_Response{}
func (p *provider) ValidateEphemeralResourceConfig(_ context.Context, req *tfplugin5.ValidateEphemeralResourceConfig_Request) (*tfplugin5.ValidateEphemeralResourceConfig_Response, error) {
resp := &tfplugin5.ValidateEphemeralResourceConfig_Response{}
ty := p.schema.DataSources[req.TypeName].Block.ImpliedType()
configVal, err := decodeDynamicValue(req.Config, ty)
@ -156,7 +156,7 @@ func (p *provider) ValidateEphemeralConfig(_ context.Context, req *tfplugin5.Val
return resp, nil
}
validateResp := p.provider.ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest{
validateResp := p.provider.ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest{
TypeName: req.TypeName,
Config: configVal,
})
@ -449,15 +449,15 @@ func (p *provider) ReadDataSource(_ context.Context, req *tfplugin5.ReadDataSour
return resp, nil
}
func (p *provider) OpenEphemeral(_ context.Context, req *tfplugin5.OpenEphemeral_Request) (*tfplugin5.OpenEphemeral_Response, error) {
func (p *provider) OpenEphemeralResource(_ context.Context, req *tfplugin5.OpenEphemeralResource_Request) (*tfplugin5.OpenEphemeralResource_Response, error) {
panic("unimplemented")
}
func (p *provider) RenewEphemeral(_ context.Context, req *tfplugin5.RenewEphemeral_Request) (*tfplugin5.RenewEphemeral_Response, error) {
func (p *provider) RenewEphemeralResource(_ context.Context, req *tfplugin5.RenewEphemeralResource_Request) (*tfplugin5.RenewEphemeralResource_Response, error) {
panic("unimplemented")
}
func (p *provider) CloseEphemeral(_ context.Context, req *tfplugin5.CloseEphemeral_Request) (*tfplugin5.CloseEphemeral_Response, error) {
func (p *provider) CloseEphemeralResource(_ context.Context, req *tfplugin5.CloseEphemeralResource_Request) (*tfplugin5.CloseEphemeralResource_Response, error) {
panic("unimplemented")
}

12
internal/grpcwrap/provider6.go
View file

@ -146,8 +146,8 @@ func (p *provider6) ValidateDataResourceConfig(_ context.Context, req *tfplugin6
return resp, nil
}
func (p *provider6) ValidateEphemeralConfig(_ context.Context, req *tfplugin6.ValidateEphemeralConfig_Request) (*tfplugin6.ValidateEphemeralConfig_Response, error) {
resp := &tfplugin6.ValidateEphemeralConfig_Response{}
func (p *provider6) ValidateEphemeralResourceConfig(_ context.Context, req *tfplugin6.ValidateEphemeralResourceConfig_Request) (*tfplugin6.ValidateEphemeralResourceConfig_Response, error) {
resp := &tfplugin6.ValidateEphemeralResourceConfig_Response{}
ty := p.schema.DataSources[req.TypeName].Block.ImpliedType()
configVal, err := decodeDynamicValue6(req.Config, ty)
@ -156,7 +156,7 @@ func (p *provider6) ValidateEphemeralConfig(_ context.Context, req *tfplugin6.Va
return resp, nil
}
validateResp := p.provider.ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest{
validateResp := p.provider.ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest{
TypeName: req.TypeName,
Config: configVal,
})
@ -449,15 +449,15 @@ func (p *provider6) ReadDataSource(_ context.Context, req *tfplugin6.ReadDataSou
return resp, nil
}
func (p *provider6) OpenEphemeral(_ context.Context, req *tfplugin6.OpenEphemeral_Request) (*tfplugin6.OpenEphemeral_Response, error) {
func (p *provider6) OpenEphemeralResource(_ context.Context, req *tfplugin6.OpenEphemeralResource_Request) (*tfplugin6.OpenEphemeralResource_Response, error) {
panic("unimplemented")
}
func (p *provider6) RenewEphemeral(_ context.Context, req *tfplugin6.RenewEphemeral_Request) (*tfplugin6.RenewEphemeral_Response, error) {
func (p *provider6) RenewEphemeralResource(_ context.Context, req *tfplugin6.RenewEphemeralResource_Request) (*tfplugin6.RenewEphemeralResource_Response, error) {
panic("unimplemented")
}
func (p *provider6) CloseEphemeral(_ context.Context, req *tfplugin6.CloseEphemeral_Request) (*tfplugin6.CloseEphemeral_Response, error) {
func (p *provider6) CloseEphemeralResource(_ context.Context, req *tfplugin6.CloseEphemeralResource_Request) (*tfplugin6.CloseEphemeralResource_Response, error) {
panic("unimplemented")
}

16
internal/plugin/grpc_provider.go
View file

@ -767,23 +767,23 @@ func (p *GRPCProvider) ReadDataSource(r providers.ReadDataSourceRequest) (resp p
return resp
}
func (p *GRPCProvider) ValidateEphemeralConfig(req providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
logger.Trace("GRPCProvider: ValidateEphemeralConfig")
func (p *GRPCProvider) ValidateEphemeralResourceConfig(req providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
logger.Trace("GRPCProvider: ValidateEphemeralResourceConfig")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) OpenEphemeral(r providers.OpenEphemeralRequest) (resp providers.OpenEphemeralResponse) {
logger.Trace("GRPCProvider: OpenEphemeral")
func (p *GRPCProvider) OpenEphemeralResource(r providers.OpenEphemeralResourceRequest) (resp providers.OpenEphemeralResourceResponse) {
logger.Trace("GRPCProvider: OpenEphemeralResource")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) RenewEphemeral(r providers.RenewEphemeralRequest) (resp providers.RenewEphemeralResponse) {
logger.Trace("GRPCProvider: RenewEphemeral")
func (p *GRPCProvider) RenewEphemeralResource(r providers.RenewEphemeralResourceRequest) (resp providers.RenewEphemeralResourceResponse) {
logger.Trace("GRPCProvider: RenewEphemeralResource")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) CloseEphemeral(r providers.CloseEphemeralRequest) (resp providers.CloseEphemeralResponse) {
logger.Trace("GRPCProvider: CloseEphemeral")
func (p *GRPCProvider) CloseEphemeralResource(r providers.CloseEphemeralResourceRequest) (resp providers.CloseEphemeralResourceResponse) {
logger.Trace("GRPCProvider: CloseEphemeralResource")
panic("ephemeral resources not supported")
}

56
internal/plugin/mock_proto/mock.go
View file

@ -82,24 +82,24 @@ func (mr *MockProviderClientMockRecorder) CallFunction(arg0, arg1 any, arg2 ...a
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CallFunction", reflect.TypeOf((*MockProviderClient)(nil).CallFunction), varargs...)
}
// CloseEphemeral mocks base method.
func (m *MockProviderClient) CloseEphemeral(arg0 context.Context, arg1 *tfplugin5.CloseEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin5.CloseEphemeral_Response, error) {
// CloseEphemeralResource mocks base method.
func (m *MockProviderClient) CloseEphemeralResource(arg0 context.Context, arg1 *tfplugin5.CloseEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin5.CloseEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "CloseEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin5.CloseEphemeral_Response)
ret := m.ctrl.Call(m, "CloseEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin5.CloseEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// CloseEphemeral indicates an expected call of CloseEphemeral.
func (mr *MockProviderClientMockRecorder) CloseEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// CloseEphemeralResource indicates an expected call of CloseEphemeralResource.
func (mr *MockProviderClientMockRecorder) CloseEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseEphemeral", reflect.TypeOf((*MockProviderClient)(nil).CloseEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).CloseEphemeralResource), varargs...)
}
// Configure mocks base method.
@ -222,24 +222,24 @@ func (mr *MockProviderClientMockRecorder) MoveResourceState(arg0, arg1 any, arg2
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MoveResourceState", reflect.TypeOf((*MockProviderClient)(nil).MoveResourceState), varargs...)
}
// OpenEphemeral mocks base method.
func (m *MockProviderClient) OpenEphemeral(arg0 context.Context, arg1 *tfplugin5.OpenEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin5.OpenEphemeral_Response, error) {
// OpenEphemeralResource mocks base method.
func (m *MockProviderClient) OpenEphemeralResource(arg0 context.Context, arg1 *tfplugin5.OpenEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin5.OpenEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "OpenEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin5.OpenEphemeral_Response)
ret := m.ctrl.Call(m, "OpenEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin5.OpenEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// OpenEphemeral indicates an expected call of OpenEphemeral.
func (mr *MockProviderClientMockRecorder) OpenEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// OpenEphemeralResource indicates an expected call of OpenEphemeralResource.
func (mr *MockProviderClientMockRecorder) OpenEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenEphemeral", reflect.TypeOf((*MockProviderClient)(nil).OpenEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).OpenEphemeralResource), varargs...)
}
// PlanResourceChange mocks base method.
@ -322,24 +322,24 @@ func (mr *MockProviderClientMockRecorder) ReadResource(arg0, arg1 any, arg2 ...a
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadResource", reflect.TypeOf((*MockProviderClient)(nil).ReadResource), varargs...)
}
// RenewEphemeral mocks base method.
func (m *MockProviderClient) RenewEphemeral(arg0 context.Context, arg1 *tfplugin5.RenewEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin5.RenewEphemeral_Response, error) {
// RenewEphemeralResource mocks base method.
func (m *MockProviderClient) RenewEphemeralResource(arg0 context.Context, arg1 *tfplugin5.RenewEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin5.RenewEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "RenewEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin5.RenewEphemeral_Response)
ret := m.ctrl.Call(m, "RenewEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin5.RenewEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// RenewEphemeral indicates an expected call of RenewEphemeral.
func (mr *MockProviderClientMockRecorder) RenewEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// RenewEphemeralResource indicates an expected call of RenewEphemeralResource.
func (mr *MockProviderClientMockRecorder) RenewEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewEphemeral", reflect.TypeOf((*MockProviderClient)(nil).RenewEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).RenewEphemeralResource), varargs...)
}
// Stop mocks base method.
@ -402,24 +402,24 @@ func (mr *MockProviderClientMockRecorder) ValidateDataSourceConfig(arg0, arg1 an
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateDataSourceConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateDataSourceConfig), varargs...)
}
// ValidateEphemeralConfig mocks base method.
func (m *MockProviderClient) ValidateEphemeralConfig(arg0 context.Context, arg1 *tfplugin5.ValidateEphemeralConfig_Request, arg2 ...grpc.CallOption) (*tfplugin5.ValidateEphemeralConfig_Response, error) {
// ValidateEphemeralResourceConfig mocks base method.
func (m *MockProviderClient) ValidateEphemeralResourceConfig(arg0 context.Context, arg1 *tfplugin5.ValidateEphemeralResourceConfig_Request, arg2 ...grpc.CallOption) (*tfplugin5.ValidateEphemeralResourceConfig_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "ValidateEphemeralConfig", varargs...)
ret0, _ := ret[0].(*tfplugin5.ValidateEphemeralConfig_Response)
ret := m.ctrl.Call(m, "ValidateEphemeralResourceConfig", varargs...)
ret0, _ := ret[0].(*tfplugin5.ValidateEphemeralResourceConfig_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// ValidateEphemeralConfig indicates an expected call of ValidateEphemeralConfig.
func (mr *MockProviderClientMockRecorder) ValidateEphemeralConfig(arg0, arg1 any, arg2 ...any) *gomock.Call {
// ValidateEphemeralResourceConfig indicates an expected call of ValidateEphemeralResourceConfig.
func (mr *MockProviderClientMockRecorder) ValidateEphemeralResourceConfig(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateEphemeralConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateEphemeralConfig), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateEphemeralResourceConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateEphemeralResourceConfig), varargs...)
}
// ValidateResourceTypeConfig mocks base method.

16
internal/plugin6/grpc_provider.go
View file

@ -756,23 +756,23 @@ func (p *GRPCProvider) ReadDataSource(r providers.ReadDataSourceRequest) (resp p
return resp
}
func (p *GRPCProvider) ValidateEphemeralConfig(req providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
logger.Trace("GRPCProvider.v6: ValidateEphemeralConfig")
func (p *GRPCProvider) ValidateEphemeralResourceConfig(req providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
logger.Trace("GRPCProvider.v6: ValidateEphemeralResourceConfig")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) OpenEphemeral(r providers.OpenEphemeralRequest) (resp providers.OpenEphemeralResponse) {
logger.Trace("GRPCProvide.v6: OpenEphemeral")
func (p *GRPCProvider) OpenEphemeralResource(r providers.OpenEphemeralResourceRequest) (resp providers.OpenEphemeralResourceResponse) {
logger.Trace("GRPCProvide.v6: OpenEphemeralResource")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) RenewEphemeral(r providers.RenewEphemeralRequest) (resp providers.RenewEphemeralResponse) {
logger.Trace("GRPCProvider.v6: RenewEphemeral")
func (p *GRPCProvider) RenewEphemeralResource(r providers.RenewEphemeralResourceRequest) (resp providers.RenewEphemeralResourceResponse) {
logger.Trace("GRPCProvider.v6: RenewEphemeralResource")
panic("ephemeral resources not supported")
}
func (p *GRPCProvider) CloseEphemeral(r providers.CloseEphemeralRequest) (resp providers.CloseEphemeralResponse) {
logger.Trace("GRPCProvider.v6: CloseEphemeral")
func (p *GRPCProvider) CloseEphemeralResource(r providers.CloseEphemeralResourceRequest) (resp providers.CloseEphemeralResourceResponse) {
logger.Trace("GRPCProvider.v6: CloseEphemeralResource")
panic("ephemeral resources not supported")
}

56
internal/plugin6/mock_proto/mock.go
View file

@ -81,24 +81,24 @@ func (mr *MockProviderClientMockRecorder) CallFunction(arg0, arg1 any, arg2 ...a
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CallFunction", reflect.TypeOf((*MockProviderClient)(nil).CallFunction), varargs...)
}
// CloseEphemeral mocks base method.
func (m *MockProviderClient) CloseEphemeral(arg0 context.Context, arg1 *tfplugin6.CloseEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin6.CloseEphemeral_Response, error) {
// CloseEphemeralResource mocks base method.
func (m *MockProviderClient) CloseEphemeralResource(arg0 context.Context, arg1 *tfplugin6.CloseEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin6.CloseEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "CloseEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin6.CloseEphemeral_Response)
ret := m.ctrl.Call(m, "CloseEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin6.CloseEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// CloseEphemeral indicates an expected call of CloseEphemeral.
func (mr *MockProviderClientMockRecorder) CloseEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// CloseEphemeralResource indicates an expected call of CloseEphemeralResource.
func (mr *MockProviderClientMockRecorder) CloseEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseEphemeral", reflect.TypeOf((*MockProviderClient)(nil).CloseEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).CloseEphemeralResource), varargs...)
}
// ConfigureProvider mocks base method.
@ -221,24 +221,24 @@ func (mr *MockProviderClientMockRecorder) MoveResourceState(arg0, arg1 any, arg2
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MoveResourceState", reflect.TypeOf((*MockProviderClient)(nil).MoveResourceState), varargs...)
}
// OpenEphemeral mocks base method.
func (m *MockProviderClient) OpenEphemeral(arg0 context.Context, arg1 *tfplugin6.OpenEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin6.OpenEphemeral_Response, error) {
// OpenEphemeralResource mocks base method.
func (m *MockProviderClient) OpenEphemeralResource(arg0 context.Context, arg1 *tfplugin6.OpenEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin6.OpenEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "OpenEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin6.OpenEphemeral_Response)
ret := m.ctrl.Call(m, "OpenEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin6.OpenEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// OpenEphemeral indicates an expected call of OpenEphemeral.
func (mr *MockProviderClientMockRecorder) OpenEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// OpenEphemeralResource indicates an expected call of OpenEphemeralResource.
func (mr *MockProviderClientMockRecorder) OpenEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenEphemeral", reflect.TypeOf((*MockProviderClient)(nil).OpenEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OpenEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).OpenEphemeralResource), varargs...)
}
// PlanResourceChange mocks base method.
@ -301,24 +301,24 @@ func (mr *MockProviderClientMockRecorder) ReadResource(arg0, arg1 any, arg2 ...a
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadResource", reflect.TypeOf((*MockProviderClient)(nil).ReadResource), varargs...)
}
// RenewEphemeral mocks base method.
func (m *MockProviderClient) RenewEphemeral(arg0 context.Context, arg1 *tfplugin6.RenewEphemeral_Request, arg2 ...grpc.CallOption) (*tfplugin6.RenewEphemeral_Response, error) {
// RenewEphemeralResource mocks base method.
func (m *MockProviderClient) RenewEphemeralResource(arg0 context.Context, arg1 *tfplugin6.RenewEphemeralResource_Request, arg2 ...grpc.CallOption) (*tfplugin6.RenewEphemeralResource_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "RenewEphemeral", varargs...)
ret0, _ := ret[0].(*tfplugin6.RenewEphemeral_Response)
ret := m.ctrl.Call(m, "RenewEphemeralResource", varargs...)
ret0, _ := ret[0].(*tfplugin6.RenewEphemeralResource_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// RenewEphemeral indicates an expected call of RenewEphemeral.
func (mr *MockProviderClientMockRecorder) RenewEphemeral(arg0, arg1 any, arg2 ...any) *gomock.Call {
// RenewEphemeralResource indicates an expected call of RenewEphemeralResource.
func (mr *MockProviderClientMockRecorder) RenewEphemeralResource(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewEphemeral", reflect.TypeOf((*MockProviderClient)(nil).RenewEphemeral), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewEphemeralResource", reflect.TypeOf((*MockProviderClient)(nil).RenewEphemeralResource), varargs...)
}
// StopProvider mocks base method.
@ -381,24 +381,24 @@ func (mr *MockProviderClientMockRecorder) ValidateDataResourceConfig(arg0, arg1
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateDataResourceConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateDataResourceConfig), varargs...)
}
// ValidateEphemeralConfig mocks base method.
func (m *MockProviderClient) ValidateEphemeralConfig(arg0 context.Context, arg1 *tfplugin6.ValidateEphemeralConfig_Request, arg2 ...grpc.CallOption) (*tfplugin6.ValidateEphemeralConfig_Response, error) {
// ValidateEphemeralResourceConfig mocks base method.
func (m *MockProviderClient) ValidateEphemeralResourceConfig(arg0 context.Context, arg1 *tfplugin6.ValidateEphemeralResourceConfig_Request, arg2 ...grpc.CallOption) (*tfplugin6.ValidateEphemeralResourceConfig_Response, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "ValidateEphemeralConfig", varargs...)
ret0, _ := ret[0].(*tfplugin6.ValidateEphemeralConfig_Response)
ret := m.ctrl.Call(m, "ValidateEphemeralResourceConfig", varargs...)
ret0, _ := ret[0].(*tfplugin6.ValidateEphemeralResourceConfig_Response)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// ValidateEphemeralConfig indicates an expected call of ValidateEphemeralConfig.
func (mr *MockProviderClientMockRecorder) ValidateEphemeralConfig(arg0, arg1 any, arg2 ...any) *gomock.Call {
// ValidateEphemeralResourceConfig indicates an expected call of ValidateEphemeralResourceConfig.
func (mr *MockProviderClientMockRecorder) ValidateEphemeralResourceConfig(arg0, arg1 any, arg2 ...any) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]any{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateEphemeralConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateEphemeralConfig), varargs...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateEphemeralResourceConfig", reflect.TypeOf((*MockProviderClient)(nil).ValidateEphemeralResourceConfig), varargs...)
}
// ValidateProviderConfig mocks base method.

16
internal/provider-simple-v6/provider.go
View file

@ -171,28 +171,28 @@ func (s simple) ReadDataSource(req providers.ReadDataSourceRequest) (resp provid
return resp
}
func (p simple) ValidateEphemeralConfig(req providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
func (p simple) ValidateEphemeralResourceConfig(req providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("ValidateEphemeralConfig on provider that didn't declare any ephemeral resource types")
panic("ValidateEphemeralResourceConfig on provider that didn't declare any ephemeral resource types")
}
func (s simple) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
func (s simple) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("OpenEphemeral on provider that didn't declare any ephemeral resource types")
panic("OpenEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
func (s simple) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("RenewEphemeral on provider that didn't declare any ephemeral resource types")
panic("RenewEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
func (s simple) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("CloseEphemeral on provider that didn't declare any ephemeral resource types")
panic("CloseEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) CallFunction(req providers.CallFunctionRequest) (resp providers.CallFunctionResponse) {

16
internal/provider-simple/provider.go
View file

@ -144,28 +144,28 @@ func (s simple) ReadDataSource(req providers.ReadDataSourceRequest) (resp provid
return resp
}
func (p simple) ValidateEphemeralConfig(req providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
func (p simple) ValidateEphemeralResourceConfig(req providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("ValidateEphemeralConfig on provider that didn't declare any ephemeral resource types")
panic("ValidateEphemeralResourceConfig on provider that didn't declare any ephemeral resource types")
}
func (s simple) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
func (s simple) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("OpenEphemeral on provider that didn't declare any ephemeral resource types")
panic("OpenEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
func (s simple) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("RenewEphemeral on provider that didn't declare any ephemeral resource types")
panic("RenewEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
func (s simple) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
// Our schema doesn't include any ephemeral resource types, so it should be
// impossible to get in here.
panic("CloseEphemeral on provider that didn't declare any ephemeral resource types")
panic("CloseEphemeralResource on provider that didn't declare any ephemeral resource types")
}
func (s simple) CallFunction(req providers.CallFunctionRequest) (resp providers.CallFunctionResponse) {

46
internal/providers/ephemeral.go
View file

@ -10,9 +10,9 @@ import (
"github.com/zclconf/go-cty/cty"
)
// OpenEphemeralRequest represents the arguments for the OpenEphemeral
// OpenEphemeralResourceRequest represents the arguments for the OpenEphemeralResource
// operation on a provider.
type OpenEphemeralRequest struct {
type OpenEphemeralResourceRequest struct {
// TypeName is the type of ephemeral resource to open. This should
// only be one of the type names previously reported in the provider's
// schema.
@ -29,9 +29,9 @@ type OpenEphemeralRequest struct {
Config cty.Value
}
// OpenEphemeralRequest represents the response from an OpenEphemeral
// OpenEphemeralResourceRequest represents the response from an OpenEphemeralResource
// operation on a provider.
type OpenEphemeralResponse struct {
type OpenEphemeralResourceResponse struct {
// Deferred, if present, signals that the provider doesn't have enough
// information to open this ephemeral resource instance.
//
@ -55,7 +55,7 @@ type OpenEphemeralResponse struct {
Result cty.Value
// InternalContext is any internal data needed by the provider to perform a
// subsequent [Interface.CloseEphemeral] request for the same object. The
// subsequent [Interface.CloseEphemeralResource] request for the same object. The
// provider may choose any encoding format to represent the needed data,
// because Terraform Core treats this field as opaque.
//
@ -67,7 +67,7 @@ type OpenEphemeralResponse struct {
// reasonable thing to encode here.
//
// Because ephemeral resource instances never outlive a single Terraform
// Core phase, it's guaranteed that a CloseEphemeral request will be
// Core phase, it's guaranteed that a CloseEphemeralResource request will be
// received by exactly the same plugin instance that returned this value,
// and so it's valid for this to refer to in-memory state belonging to the
// provider instance.
@ -78,7 +78,7 @@ type OpenEphemeralResponse struct {
// expiration time.
//
// If a provider sets this field then it may receive a subsequent
// [Interface.RenewEphemeral] call, if Terraform expects to need the
// [Interface.RenewEphemeralResource] call, if Terraform expects to need the
// object beyond the expiration time.
Renew *EphemeralRenew
@ -96,7 +96,7 @@ type EphemeralRenew struct {
ExpireTime time.Time
// InternalContext is any internal data needed by the provider to
// perform a subsequent [Interface.RenewEphemeral] request. The provider
// perform a subsequent [Interface.RenewEphemeralResource] request. The provider
// may choose any encoding format to represent the needed data, because
// Terraform Core treats this field as opaque.
//
@ -108,33 +108,33 @@ type EphemeralRenew struct {
// remote system is a reasonable thing to encode here.
//
// Because ephemeral resource instances never outlive a single Terraform
// Core phase, it's guaranteed that a RenewEphemeral request will be
// Core phase, it's guaranteed that a RenewEphemeralResource request will be
// received by exactly the same plugin instance that previously handled
// the OpenEphemeral or RenewEphemeral request that produced this internal
// the OpenEphemeralResource or RenewEphemeralResource request that produced this internal
// context, and so it's valid for this to refer to in-memory state in the
// provider object.
InternalContext []byte
}
// RenewEphemeralRequest represents the arguments for the RenewEphemeral
// RenewEphemeralResourceRequest represents the arguments for the RenewEphemeralResource
// operation on a provider.
type RenewEphemeralRequest struct {
type RenewEphemeralResourceRequest struct {
// TypeName is the type of ephemeral resource being renewed. This should
// only be one of the type names previously sent in a successful
// [OpenEphemeralRequest].
// [OpenEphemeralResourceRequest].
TypeName string
// InternalContext echoes verbatim the value from the field of the same
// name from the most recent [EphemeralRenew] object, received from either
// an [OpenEphemeralResponse] or a [RenewEphemeralResponse] object.
// an [OpenEphemeralResourceResponse] or a [RenewEphemeralResourceResponse] object.
InternalContext []byte
}
// RenewEphemeralRequest represents the response from a RenewEphemeral
// RenewEphemeralResourceRequest represents the response from a RenewEphemeralResource
// operation on a provider.
type RenewEphemeralResponse struct {
type RenewEphemeralResourceResponse struct {
// RenewAgain, if set, describes a new expiration deadline for the
// object, possibly causing a further call to [Interface.RenewEphemeral]
// object, possibly causing a further call to [Interface.RenewEphemeralResource]
// if Terraform needs to exceed the updated deadline.
//
// If this is not set then Terraform Core will not make any further
@ -155,22 +155,22 @@ type RenewEphemeralResponse struct {
Diagnostics tfdiags.Diagnostics
}
// CloseEphemeralRequest represents the arguments for the CloseEphemeral
// CloseEphemeralResourceRequest represents the arguments for the CloseEphemeralResource
// operation on a provider.
type CloseEphemeralRequest struct {
type CloseEphemeralResourceRequest struct {
// TypeName is the type of ephemeral resource being closed. This should
// only be one of the type names previously sent in a successful
// [OpenEphemeralRequest].
// [OpenEphemeralResourceRequest].
TypeName string
// InternalContext echoes verbatim the value from the field of the same
// name from the corresponding [OpenEphemeralResponse] object.
// name from the corresponding [OpenEphemeralResourceResponse] object.
InternalContext []byte
}
// CloseEphemeralRequest represents the response from a CloseEphemeral
// CloseEphemeralResourceRequest represents the response from a CloseEphemeralResource
// operation on a provider.
type CloseEphemeralResponse struct {
type CloseEphemeralResourceResponse struct {
// Diagnostics describes any problems encountered while closing the
// ephemeral resource instance. If this contains errors then the other
// response fields must be assumed invalid.

16
internal/providers/mock.go
View file

@ -289,7 +289,7 @@ func (m *Mock) ReadDataSource(request ReadDataSourceRequest) ReadDataSourceRespo
return response
}
func (m *Mock) ValidateEphemeralConfig(ValidateEphemeralConfigRequest) ValidateEphemeralConfigResponse {
func (m *Mock) ValidateEphemeralResourceConfig(ValidateEphemeralResourceConfigRequest) ValidateEphemeralResourceConfigResponse {
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
@ -297,12 +297,12 @@ func (m *Mock) ValidateEphemeralConfig(ValidateEphemeralConfigRequest) ValidateE
"The provider mocking mechanism does not yet support ephemeral resource types.",
nil, // the topmost configuration object
))
return ValidateEphemeralConfigResponse{
return ValidateEphemeralResourceConfigResponse{
Diagnostics: diags,
}
}
func (m *Mock) OpenEphemeral(OpenEphemeralRequest) OpenEphemeralResponse {
func (m *Mock) OpenEphemeralResource(OpenEphemeralResourceRequest) OpenEphemeralResourceResponse {
// FIXME: Design some means to mock an ephemeral resource type.
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
@ -311,12 +311,12 @@ func (m *Mock) OpenEphemeral(OpenEphemeralRequest) OpenEphemeralResponse {
"The provider mocking mechanism does not yet support ephemeral resource types.",
nil, // the topmost configuration object
))
return OpenEphemeralResponse{
return OpenEphemeralResourceResponse{
Diagnostics: diags,
}
}
func (m *Mock) RenewEphemeral(RenewEphemeralRequest) RenewEphemeralResponse {
func (m *Mock) RenewEphemeralResource(RenewEphemeralResourceRequest) RenewEphemeralResourceResponse {
// FIXME: Design some means to mock an ephemeral resource type.
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
@ -325,12 +325,12 @@ func (m *Mock) RenewEphemeral(RenewEphemeralRequest) RenewEphemeralResponse {
"The provider mocking mechanism does not yet support ephemeral resource types.",
nil, // the topmost configuration object
))
return RenewEphemeralResponse{
return RenewEphemeralResourceResponse{
Diagnostics: diags,
}
}
func (m *Mock) CloseEphemeral(CloseEphemeralRequest) CloseEphemeralResponse {
func (m *Mock) CloseEphemeralResource(CloseEphemeralResourceRequest) CloseEphemeralResourceResponse {
// FIXME: Design some means to mock an ephemeral resource type.
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
@ -339,7 +339,7 @@ func (m *Mock) CloseEphemeral(CloseEphemeralRequest) CloseEphemeralResponse {
"The provider mocking mechanism does not yet support ephemeral resource types.",
nil, // the topmost configuration object
))
return CloseEphemeralResponse{
return CloseEphemeralResourceResponse{
Diagnostics: diags,
}
}

20
internal/providers/provider.go
View file

@ -31,9 +31,9 @@ type Interface interface {
// configuration values.
ValidateDataResourceConfig(ValidateDataResourceConfigRequest) ValidateDataResourceConfigResponse
// ValidateEphemeralConfig allows the provider to validate the
// ValidateEphemeralResourceConfig allows the provider to validate the
// ephemeral resource configuration values.
ValidateEphemeralConfig(ValidateEphemeralConfigRequest) ValidateEphemeralConfigResponse
ValidateEphemeralResourceConfig(ValidateEphemeralResourceConfigRequest) ValidateEphemeralResourceConfigResponse
// UpgradeResourceState is called when the state loader encounters an
// instance state whose schema version is less than the one reported by the
@ -78,14 +78,14 @@ type Interface interface {
// ReadDataSource returns the data source's current state.
ReadDataSource(ReadDataSourceRequest) ReadDataSourceResponse
// OpenEphemeral opens an ephemeral resource instance.
OpenEphemeral(OpenEphemeralRequest) OpenEphemeralResponse
// RenewEphemeral extends the validity of a previously-opened ephemeral
// OpenEphemeralResource opens an ephemeral resource instance.
OpenEphemeralResource(OpenEphemeralResourceRequest) OpenEphemeralResourceResponse
// RenewEphemeralResource extends the validity of a previously-opened ephemeral
// resource instance.
RenewEphemeral(RenewEphemeralRequest) RenewEphemeralResponse
// CloseEphemeral closes an ephemeral resource instance, with the intent
RenewEphemeralResource(RenewEphemeralResourceRequest) RenewEphemeralResourceResponse
// CloseEphemeralResource closes an ephemeral resource instance, with the intent
// of rendering it invalid as soon as possible.
CloseEphemeral(CloseEphemeralRequest) CloseEphemeralResponse
CloseEphemeralResource(CloseEphemeralResourceRequest) CloseEphemeralResourceResponse
// CallFunction calls a provider-contributed function.
CallFunction(CallFunctionRequest) CallFunctionResponse
@ -208,7 +208,7 @@ type ValidateDataResourceConfigResponse struct {
Diagnostics tfdiags.Diagnostics
}
type ValidateEphemeralConfigRequest struct {
type ValidateEphemeralResourceConfigRequest struct {
// TypeName is the name of the data source type to validate.
TypeName string
@ -217,7 +217,7 @@ type ValidateEphemeralConfigRequest struct {
Config cty.Value
}
type ValidateEphemeralConfigResponse struct {
type ValidateEphemeralResourceConfigResponse struct {
// Diagnostics contains any warnings or errors from the method call.
Diagnostics tfdiags.Diagnostics
}

90
internal/providers/testing/provider_mock.go
View file

@ -94,22 +94,22 @@ type MockProvider struct {
ReadDataSourceRequest providers.ReadDataSourceRequest
ReadDataSourceFn func(providers.ReadDataSourceRequest) providers.ReadDataSourceResponse
ValidateEphemeralConfigCalled bool
ValidateEphemeralConfigResponse *providers.ValidateEphemeralConfigResponse
ValidateEphemeralConfigRequest providers.ValidateEphemeralConfigRequest
ValidateEphemeralConfigFn func(providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse
OpenEphemeralCalled bool
OpenEphemeralResponse *providers.OpenEphemeralResponse
OpenEphemeralRequest providers.OpenEphemeralRequest
OpenEphemeralFn func(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse
RenewEphemeralCalled bool
RenewEphemeralResponse *providers.RenewEphemeralResponse
RenewEphemeralRequest providers.RenewEphemeralRequest
RenewEphemeralFn func(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse
CloseEphemeralCalled bool
CloseEphemeralResponse *providers.CloseEphemeralResponse
CloseEphemeralRequest providers.CloseEphemeralRequest
CloseEphemeralFn func(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse
ValidateEphemeralResourceConfigCalled bool
ValidateEphemeralResourceConfigResponse *providers.ValidateEphemeralResourceConfigResponse
ValidateEphemeralResourceConfigRequest providers.ValidateEphemeralResourceConfigRequest
ValidateEphemeralResourceConfigFn func(providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse
OpenEphemeralResourceCalled bool
OpenEphemeralResourceResponse *providers.OpenEphemeralResourceResponse
OpenEphemeralResourceRequest providers.OpenEphemeralResourceRequest
OpenEphemeralResourceFn func(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse
RenewEphemeralResourceCalled bool
RenewEphemeralResourceResponse *providers.RenewEphemeralResourceResponse
RenewEphemeralResourceRequest providers.RenewEphemeralResourceRequest
RenewEphemeralResourceFn func(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse
CloseEphemeralResourceCalled bool
CloseEphemeralResourceResponse *providers.CloseEphemeralResourceResponse
CloseEphemeralResourceRequest providers.CloseEphemeralResourceRequest
CloseEphemeralResourceFn func(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse
CallFunctionCalled bool
CallFunctionResponse providers.CallFunctionResponse
@ -222,12 +222,12 @@ func (p *MockProvider) ValidateDataResourceConfig(r providers.ValidateDataResour
return resp
}
func (p *MockProvider) ValidateEphemeralConfig(r providers.ValidateEphemeralConfigRequest) (resp providers.ValidateEphemeralConfigResponse) {
func (p *MockProvider) ValidateEphemeralResourceConfig(r providers.ValidateEphemeralResourceConfigRequest) (resp providers.ValidateEphemeralResourceConfigResponse) {
p.Lock()
defer p.Unlock()
p.ValidateEphemeralConfigCalled = true
p.ValidateEphemeralConfigRequest = r
p.ValidateEphemeralResourceConfigCalled = true
p.ValidateEphemeralResourceConfigRequest = r
// Marshall the value to replicate behavior by the GRPC protocol
dataSchema, ok := p.getProviderSchema().EphemeralTypes[r.TypeName]
@ -242,11 +242,11 @@ func (p *MockProvider) ValidateEphemeralConfig(r providers.ValidateEphemeralConf
}
if p.ValidateDataResourceConfigFn != nil {
return p.ValidateEphemeralConfigFn(r)
return p.ValidateEphemeralResourceConfigFn(r)
}
if p.ValidateDataResourceConfigResponse != nil {
return *p.ValidateEphemeralConfigResponse
return *p.ValidateEphemeralResourceConfigResponse
}
return resp
@ -600,70 +600,70 @@ func (p *MockProvider) ReadDataSource(r providers.ReadDataSourceRequest) (resp p
return resp
}
func (p *MockProvider) OpenEphemeral(r providers.OpenEphemeralRequest) (resp providers.OpenEphemeralResponse) {
func (p *MockProvider) OpenEphemeralResource(r providers.OpenEphemeralResourceRequest) (resp providers.OpenEphemeralResourceResponse) {
p.Lock()
defer p.Unlock()
if !p.ConfigureProviderCalled {
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before OpenEphemeral %q", r.TypeName))
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before OpenEphemeralResource %q", r.TypeName))
return resp
}
p.OpenEphemeralCalled = true
p.OpenEphemeralRequest = r
p.OpenEphemeralResourceCalled = true
p.OpenEphemeralResourceRequest = r
if p.OpenEphemeralFn != nil {
return p.OpenEphemeralFn(r)
if p.OpenEphemeralResourceFn != nil {
return p.OpenEphemeralResourceFn(r)
}
if p.OpenEphemeralResponse != nil {
resp = *p.OpenEphemeralResponse
if p.OpenEphemeralResourceResponse != nil {
resp = *p.OpenEphemeralResourceResponse
}
return resp
}
func (p *MockProvider) RenewEphemeral(r providers.RenewEphemeralRequest) (resp providers.RenewEphemeralResponse) {
func (p *MockProvider) RenewEphemeralResource(r providers.RenewEphemeralResourceRequest) (resp providers.RenewEphemeralResourceResponse) {
p.Lock()
defer p.Unlock()
if !p.ConfigureProviderCalled {
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before RenewEphemeral %q", r.TypeName))
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before RenewEphemeralResource %q", r.TypeName))
return resp
}
p.RenewEphemeralCalled = true
p.RenewEphemeralRequest = r
p.RenewEphemeralResourceCalled = true
p.RenewEphemeralResourceRequest = r
if p.RenewEphemeralFn != nil {
return p.RenewEphemeralFn(r)
if p.RenewEphemeralResourceFn != nil {
return p.RenewEphemeralResourceFn(r)
}
if p.RenewEphemeralResponse != nil {
resp = *p.RenewEphemeralResponse
if p.RenewEphemeralResourceResponse != nil {
resp = *p.RenewEphemeralResourceResponse
}
return resp
}
func (p *MockProvider) CloseEphemeral(r providers.CloseEphemeralRequest) (resp providers.CloseEphemeralResponse) {
func (p *MockProvider) CloseEphemeralResource(r providers.CloseEphemeralResourceRequest) (resp providers.CloseEphemeralResourceResponse) {
p.Lock()
defer p.Unlock()
if !p.ConfigureProviderCalled {
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before CloseEphemeral %q", r.TypeName))
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before CloseEphemeralResource %q", r.TypeName))
return resp
}
p.CloseEphemeralCalled = true
p.CloseEphemeralRequest = r
p.CloseEphemeralResourceCalled = true
p.CloseEphemeralResourceRequest = r
if p.CloseEphemeralFn != nil {
return p.CloseEphemeralFn(r)
if p.CloseEphemeralResourceFn != nil {
return p.CloseEphemeralResourceFn(r)
}
if p.CloseEphemeralResponse != nil {
resp = *p.CloseEphemeralResponse
if p.CloseEphemeralResourceResponse != nil {
resp = *p.CloseEphemeralResourceResponse
}
return resp

8
internal/refactoring/mock_provider.go
View file

@ -81,7 +81,7 @@ func (provider *mockProvider) MoveResourceState(providers.MoveResourceStateReque
}
}
func (provider *mockProvider) ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
func (provider *mockProvider) ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
panic("not implemented in mock")
}
@ -89,15 +89,15 @@ func (provider *mockProvider) ReadDataSource(providers.ReadDataSourceRequest) pr
panic("not implemented in mock")
}
func (provider *mockProvider) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
func (provider *mockProvider) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
panic("not implemented in mock")
}
func (provider *mockProvider) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
func (provider *mockProvider) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
panic("not implemented in mock")
}
func (provider *mockProvider) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
func (provider *mockProvider) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
panic("not implemented in mock")
}

2
internal/resources/ephemeral/ephemeral_resources.go
View file

@ -107,7 +107,7 @@ func (r *Resources) CloseInstances(ctx context.Context, configAddr addrs.ConfigR
var diags tfdiags.Diagnostics
// Use a read-lock here so we can run multiple close calls concurrently for
// different resources. This needs to call CloseEphemeral which is sent to
// different resources. This needs to call CloseEphemeralResource which is sent to
// the provider and can take an unknown amount of time.
r.mu.RLock()
for _, elem := range r.active.Get(configAddr).Elems {

28
internal/stacks/stackruntime/internal/stackeval/stubs/errored.go
View file

@ -128,8 +128,8 @@ func (p *erroredProvider) ReadResource(req providers.ReadResourceRequest) provid
}
}
// OpenEphemeral implements providers.Interface.
func (p *erroredProvider) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
// OpenEphemeralResource implements providers.Interface.
func (p *erroredProvider) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
@ -137,23 +137,23 @@ func (p *erroredProvider) OpenEphemeral(providers.OpenEphemeralRequest) provider
"Cannot open this ephemeral resource instance because its associated provider configuration is invalid.",
nil, // nil attribute path means the overall configuration block
))
return providers.OpenEphemeralResponse{
return providers.OpenEphemeralResourceResponse{
Diagnostics: diags,
}
}
// RenewEphemeral implements providers.Interface.
func (p *erroredProvider) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// RenewEphemeralResource implements providers.Interface.
func (p *erroredProvider) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.RenewEphemeralResponse{}
return providers.RenewEphemeralResourceResponse{}
}
// CloseEphemeral implements providers.Interface.
func (p *erroredProvider) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// CloseEphemeralResource implements providers.Interface.
func (p *erroredProvider) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.CloseEphemeralResponse{}
return providers.CloseEphemeralResourceResponse{}
}
// Stop implements providers.Interface.
@ -201,10 +201,10 @@ func (p *erroredProvider) ValidateProviderConfig(req providers.ValidateProviderC
}
}
// ValidateEphemeralConfig implements providers.Interface.
func (p *erroredProvider) ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
// ValidateEphemeralResourceConfig implements providers.Interface.
func (p *erroredProvider) ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
return providers.ValidateEphemeralConfigResponse{
return providers.ValidateEphemeralResourceConfigResponse{
Diagnostics: nil,
}
}

32
internal/stacks/stackruntime/internal/stackeval/stubs/offline.go
View file

@ -72,16 +72,16 @@ func (o *offlineProvider) ValidateDataResourceConfig(request providers.ValidateD
}
}
// ValidateEphemeralConfig implements providers.Interface.
func (p *offlineProvider) ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
// ValidateEphemeralResourceConfig implements providers.Interface.
func (p *offlineProvider) ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
"Called ValidateEphemeralConfig on an unconfigured provider",
"Called ValidateEphemeralResourceConfig on an unconfigured provider",
"Cannot validate this resource config because this provider is not configured. This is a bug in Terraform - please report it.",
nil, // nil attribute path means the overall configuration block
))
return providers.ValidateEphemeralConfigResponse{
return providers.ValidateEphemeralResourceConfigResponse{
Diagnostics: diags,
}
}
@ -186,32 +186,32 @@ func (o *offlineProvider) ReadDataSource(request providers.ReadDataSourceRequest
}
}
// OpenEphemeral implements providers.Interface.
func (u *offlineProvider) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
// OpenEphemeralResource implements providers.Interface.
func (u *offlineProvider) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
var diags tfdiags.Diagnostics
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
"Called OpenEphemeral on an unconfigured provider",
"Called OpenEphemeralResource on an unconfigured provider",
"Cannot open this resource instance because this provider is not configured. This is a bug in Terraform - please report it.",
nil, // nil attribute path means the overall configuration block
))
return providers.OpenEphemeralResponse{
return providers.OpenEphemeralResourceResponse{
Diagnostics: diags,
}
}
// RenewEphemeral implements providers.Interface.
func (u *offlineProvider) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// RenewEphemeralResource implements providers.Interface.
func (u *offlineProvider) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.RenewEphemeralResponse{}
return providers.RenewEphemeralResourceResponse{}
}
// CloseEphemeral implements providers.Interface.
func (u *offlineProvider) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// CloseEphemeralResource implements providers.Interface.
func (u *offlineProvider) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.CloseEphemeralResponse{}
return providers.CloseEphemeralResourceResponse{}
}
func (o *offlineProvider) CallFunction(request providers.CallFunctionRequest) providers.CallFunctionResponse {

28
internal/stacks/stackruntime/internal/stackeval/stubs/unknown.go
View file

@ -57,9 +57,9 @@ func (u *unknownProvider) ValidateDataResourceConfig(request providers.ValidateD
return u.unconfiguredClient.ValidateDataResourceConfig(request)
}
// ValidateEphemeralConfig implements providers.Interface.
func (p *unknownProvider) ValidateEphemeralConfig(providers.ValidateEphemeralConfigRequest) providers.ValidateEphemeralConfigResponse {
return providers.ValidateEphemeralConfigResponse{
// ValidateEphemeralResourceConfig implements providers.Interface.
func (p *unknownProvider) ValidateEphemeralResourceConfig(providers.ValidateEphemeralResourceConfigRequest) providers.ValidateEphemeralResourceConfigResponse {
return providers.ValidateEphemeralResourceConfigResponse{
Diagnostics: nil,
}
}
@ -240,8 +240,8 @@ func (u *unknownProvider) ReadDataSource(request providers.ReadDataSourceRequest
}
}
// OpenEphemeral implements providers.Interface.
func (u *unknownProvider) OpenEphemeral(providers.OpenEphemeralRequest) providers.OpenEphemeralResponse {
// OpenEphemeralResource implements providers.Interface.
func (u *unknownProvider) OpenEphemeralResource(providers.OpenEphemeralResourceRequest) providers.OpenEphemeralResourceResponse {
// TODO: Once there's a definition for how deferred actions ought to work
// for ephemeral resource instances, make this report that this one needs
// to be deferred if the client announced that it supports deferral.
@ -255,23 +255,23 @@ func (u *unknownProvider) OpenEphemeral(providers.OpenEphemeralRequest) provider
"Cannot open this resource instance because its associated provider configuration is unknown.",
nil, // nil attribute path means the overall configuration block
))
return providers.OpenEphemeralResponse{
return providers.OpenEphemeralResourceResponse{
Diagnostics: diags,
}
}
// RenewEphemeral implements providers.Interface.
func (u *unknownProvider) RenewEphemeral(providers.RenewEphemeralRequest) providers.RenewEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// RenewEphemeralResource implements providers.Interface.
func (u *unknownProvider) RenewEphemeralResource(providers.RenewEphemeralResourceRequest) providers.RenewEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.RenewEphemeralResponse{}
return providers.RenewEphemeralResourceResponse{}
}
// CloseEphemeral implements providers.Interface.
func (u *unknownProvider) CloseEphemeral(providers.CloseEphemeralRequest) providers.CloseEphemeralResponse {
// We don't have anything to do here because OpenEphemeral didn't really
// CloseEphemeralResource implements providers.Interface.
func (u *unknownProvider) CloseEphemeralResource(providers.CloseEphemeralResourceRequest) providers.CloseEphemeralResourceResponse {
// We don't have anything to do here because OpenEphemeralResource didn't really
// actually "open" anything.
return providers.CloseEphemeralResponse{}
return providers.CloseEphemeralResourceResponse{}
}
func (u *unknownProvider) CallFunction(request providers.CallFunctionRequest) providers.CallFunctionResponse {

1306
internal/tfplugin5/tfplugin5.pb.go
View file

File diff suppressed because it is too large Load diff

1178
internal/tfplugin6/tfplugin6.pb.go
View file

File diff suppressed because it is too large Load diff