Skip to content

Implement State, State.Get, State.GetAttribute, Config, Plan #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmoe merged 9 commits into from
Jun 10, 2021
Merged

Implement State, State.Get, State.GetAttribute, Config, Plan #46

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6be95f
remove duplication
kmoe Jun 2, 2021
02c323d
wip
kmoe Jun 8, 2021
dea5415
Apply suggestions from code review
kmoe Jun 9, 2021
33a886f
ensure Get works for complex types
kmoe Jun 9, 2021
a50a7ae
fix nested attributes
kmoe Jun 9, 2021
f294107
add Config and Plan types
kmoe Jun 9, 2021
59f19ac
use new types in req/res
kmoe Jun 9, 2021
cb11377
remove unnecessary pointers
kmoe Jun 10, 2021
335f4f1
add test for types.ObjectType
kmoe Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unnecessary pointers
  • Loading branch information
@kmoe
kmoe committed Jun 10, 2021
commit cb11377de2df22fe0cc1471d4be292e0d9cc6319
10 changes: 5 additions & 5 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ func (c Config) GetAttribute(ctx context.Context, path *tftypes.AttributePath) (
return nil, fmt.Errorf("error walking config: %w", err)
}

return attrType.ValueFromTerraform(ctx, *attrValue)
return attrType.ValueFromTerraform(ctx, attrValue)
}

func (c Config) terraformValueAtPath(path *tftypes.AttributePath) (*tftypes.Value, error) {
func (c Config) terraformValueAtPath(path *tftypes.AttributePath) (tftypes.Value, error) {
rawValue, remaining, err := tftypes.WalkAttributePath(c.Raw, path)
if err != nil {
return nil, fmt.Errorf("%v still remains in the path: %w", remaining, err)
return tftypes.Value{}, fmt.Errorf("%v still remains in the path: %w", remaining, err)
}
attrValue, ok := rawValue.(tftypes.Value)
if !ok {
return nil, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
return tftypes.Value{}, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
}
return &attrValue, err
return attrValue, err
}
10 changes: 5 additions & 5 deletions plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ func (p Plan) GetAttribute(ctx context.Context, path *tftypes.AttributePath) (at
return nil, fmt.Errorf("error walking plan: %w", err)
}

return attrType.ValueFromTerraform(ctx, *attrValue)
return attrType.ValueFromTerraform(ctx, attrValue)
}

func (p Plan) terraformValueAtPath(path *tftypes.AttributePath) (*tftypes.Value, error) {
func (p Plan) terraformValueAtPath(path *tftypes.AttributePath) (tftypes.Value, error) {
rawValue, remaining, err := tftypes.WalkAttributePath(p.Raw, path)
if err != nil {
return nil, fmt.Errorf("%v still remains in the path: %w", remaining, err)
return tftypes.Value{}, fmt.Errorf("%v still remains in the path: %w", remaining, err)
}
attrValue, ok := rawValue.(tftypes.Value)
if !ok {
return nil, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
return tftypes.Value{}, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
}
return &attrValue, err
return attrValue, err
}
10 changes: 5 additions & 5 deletions state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ func (s State) GetAttribute(ctx context.Context, path *tftypes.AttributePath) (a
return nil, fmt.Errorf("error walking state: %w", err)
}

return attrType.ValueFromTerraform(ctx, *attrValue)
return attrType.ValueFromTerraform(ctx, attrValue)
}

func (s State) terraformValueAtPath(path *tftypes.AttributePath) (*tftypes.Value, error) {
func (s State) terraformValueAtPath(path *tftypes.AttributePath) (tftypes.Value, error) {
rawValue, remaining, err := tftypes.WalkAttributePath(s.Raw, path)
if err != nil {
return nil, fmt.Errorf("%v still remains in the path: %w", remaining, err)
return tftypes.Value{}, fmt.Errorf("%v still remains in the path: %w", remaining, err)
}
attrValue, ok := rawValue.(tftypes.Value)
if !ok {
return nil, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
return tftypes.Value{}, fmt.Errorf("got non-tftypes.Value result %v", rawValue)
}
return &attrValue, err
return attrValue, err
}