ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugin: new API for ImportState

This commit is contained in:
Mitchell Hashimoto 2016-05-04 12:43:10 -07:00
parent 2bb814e3de
commit a6b4bb4932
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/resource_provider.go
View File

@ -177,10 +177,12 @@ func (p *ResourceProvider) Refresh(
} }
func (p *ResourceProvider) ImportState( func (p *ResourceProvider) ImportState(
info *terraform.InstanceInfo) ([]*terraform.InstanceState, error) { info *terraform.InstanceInfo,
id string) ([]*terraform.InstanceState, error) {
var resp ResourceProviderImportStateResponse var resp ResourceProviderImportStateResponse
args := &ResourceProviderImportStateArgs{ args := &ResourceProviderImportStateArgs{
Info: info, Info: info,
Id: id,
} }
err := p.Client.Call("Plugin.ImportState", args, &resp) err := p.Client.Call("Plugin.ImportState", args, &resp)
@ -265,6 +267,7 @@ type ResourceProviderRefreshResponse struct {
type ResourceProviderImportStateArgs struct { type ResourceProviderImportStateArgs struct {
Info *terraform.InstanceInfo Info *terraform.InstanceInfo
Id string
} }
type ResourceProviderImportStateResponse struct { type ResourceProviderImportStateResponse struct {
@ -391,7 +394,7 @@ func (s *ResourceProviderServer) Refresh(
func (s *ResourceProviderServer) ImportState( func (s *ResourceProviderServer) ImportState(
args *ResourceProviderImportStateArgs, args *ResourceProviderImportStateArgs,
result *ResourceProviderImportStateResponse) error { result *ResourceProviderImportStateResponse) error {
states, err := s.Provider.ImportState(args.Info) states, err := s.Provider.ImportState(args.Info, args.Id)
*result = ResourceProviderImportStateResponse{ *result = ResourceProviderImportStateResponse{
State: states, State: states,
Error: plugin.NewBasicError(err), Error: plugin.NewBasicError(err),