aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address review feedback

Browse Source
pull/37317/head
Daniel Schmidt 10 months ago
parent ac132d1b15
commit d0e5c3cc7b
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
docs/plugin-protocol/tfplugin5.proto
Unescape View File

@ -190,7 +190,6 @@ message ActionSchema {
}
}
// Schema is the configuration schema for a Resource, Provider, or Provisioner.
message Schema {
message Block {

2
docs/plugin-protocol/tfplugin6.proto
Unescape View File

@ -189,8 +189,6 @@ message ActionSchema {
}
}
// Schema is the configuration schema for a Resource or Provider.
message Schema {
message Block {

20
internal/grpcwrap/provider.go
Unescape View File

@ -884,28 +884,34 @@ func (p *provider) PlanAction(_ context.Context, req *tfplugin5.PlanAction_Reque
priorState, err := decodeDynamicValue(lr.PriorState, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
config, err := decodeDynamicValue(lr.Config, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
var priorIdentity cty.Value
if lr.PriorIdentity != nil && lr.PriorIdentity.IdentityData != nil {
priorIdentity, err = decodeDynamicValue(lr.PriorIdentity.IdentityData, linkedResourceIdentityTy)
if err != nil {
return nil, fmt.Errorf("failed to decode prior identity for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode prior identity for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
} else {
priorIdentity = cty.NullVal(linkedResourceIdentityTy)
}
plannedState, err := decodeDynamicValue(lr.PlannedState, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
inputLinkedResources = append(inputLinkedResources, providers.LinkedResourcePlanData{
PriorState: priorState,
Config: config,
PriorIdentity: priorIdentity,
PlannedState: plannedState,
})
}
@ -976,24 +982,24 @@ func (p *provider) InvokeAction(req *tfplugin5.InvokeAction_Request, server tfpl
priorState, err := decodeDynamicValue(lr.PriorState, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
plannedState, err := decodeDynamicValue(lr.PlannedState, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
config, err := decodeDynamicValue(lr.Config, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
plannedIdentity := cty.NullVal(linkedResourceIdentityTy)
if lr.PlannedIdentity != nil && lr.PlannedIdentity.IdentityData != nil {
plannedIdentity, err = decodeDynamicValue(lr.PlannedIdentity.IdentityData, linkedResourceIdentityTy)
if err != nil {
return fmt.Errorf("failed to decode planned identity for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode planned identity for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
}

20
internal/grpcwrap/provider6.go
Unescape View File

@ -955,28 +955,34 @@ func (p *provider6) PlanAction(_ context.Context, req *tfplugin6.PlanAction_Requ
priorState, err := decodeDynamicValue6(lr.PriorState, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
config, err := decodeDynamicValue6(lr.Config, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
var priorIdentity cty.Value
if lr.PriorIdentity != nil && lr.PriorIdentity.IdentityData != nil {
priorIdentity, err = decodeDynamicValue6(lr.PriorIdentity.IdentityData, linkedResourceIdentityTy)
if err != nil {
return nil, fmt.Errorf("failed to decode prior identity for linked resource #%d (%q) in action %q: %w", i+1, linkedResouceSchemas[i].TypeName, req.ActionType, err)
return nil, fmt.Errorf("failed to decode prior identity for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
} else {
priorIdentity = cty.NullVal(linkedResourceIdentityTy)
}
plannedState, err := decodeDynamicValue6(lr.PlannedState, linkedResourceTy)
if err != nil {
return nil, fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i, linkedResouceSchemas[i].TypeName, req.ActionType, err)
}
inputLinkedResources = append(inputLinkedResources, providers.LinkedResourcePlanData{
PriorState: priorState,
Config: config,
PriorIdentity: priorIdentity,
PlannedState: plannedState,
})
}
@ -1047,24 +1053,24 @@ func (p *provider6) InvokeAction(req *tfplugin6.InvokeAction_Request, server tfp
priorState, err := decodeDynamicValue6(lr.PriorState, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode prior state for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
plannedState, err := decodeDynamicValue6(lr.PlannedState, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode planned state for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
config, err := decodeDynamicValue6(lr.Config, linkedResourceTy)
if err != nil {
return fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode config for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
plannedIdentity := cty.NullVal(linkedResourceIdentityTy)
if lr.PlannedIdentity != nil && lr.PlannedIdentity.IdentityData != nil {
plannedIdentity, err = decodeDynamicValue6(lr.PlannedIdentity.IdentityData, linkedResourceIdentityTy)
if err != nil {
return fmt.Errorf("failed to decode planned identity for linked resource #%d (%q) in action %q: %w", i+1, linkedResourceSchemas[i].TypeName, req.ActionType, err)
return fmt.Errorf("failed to decode planned identity for linked resource #%d (%q) in action %q: %w", i, linkedResourceSchemas[i].TypeName, req.ActionType, err)
}
}

Write Preview
Loading…
Cancel
Save