Skip to content
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

Jump to bottom

d/aws_outposts_assets - add host id and status filters #27303

Merged
merged 22 commits into from
Oct 24, 2022
Merged

d/aws_outposts_assets - add host id and status filters #27303

Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cd52036
wip
albsilv-aws Oct 18, 2022
40ccdf8
initial
albsilv-aws Oct 18, 2022
ad3ea42
update outposts_assets data with host and status filter
Oct 18, 2022
0c3dc1e
add host and status fiter support for aws_outposts_assets data
Oct 18, 2022
8334f3f
update changelog
Oct 18, 2022
6a2b38a
remove unnecessary char
Oct 18, 2022
497a890
add new line to changelog
Oct 18, 2022
88e6d96
add pr recommendations
Oct 18, 2022
e5cd8e3
add status filter test
Oct 18, 2022
96df8b4
changelog fixes
Oct 18, 2022
0cb7749
MinItems defaults to 0 if Optional: true. Removing
Oct 19, 2022
aade18d
remove comments
Oct 19, 2022
849aa4d
tf fmt
kpena027 Oct 20, 2022
a715fd4
formatting
kpena027 Oct 20, 2022
b2c96c0
formatting
kpena027 Oct 20, 2022
a420339
update documentation with filter examples
Oct 20, 2022
71a76e0
add host filter test
Oct 21, 2022
d95eb4f
update test to pass in hostID
Oct 21, 2022
ee0814d
Update formatting documentation
kpena027 Oct 21, 2022
4ebbbea
Update 27303.txt
ewbankkit Oct 24, 2022
b6e1aac
Fix terrafmt errors.
ewbankkit Oct 24, 2022
68d948c
Fix markdown-lint 'MD047/single-trailing-newline Files should end wit…
ewbankkit Oct 24, 2022
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
20 changes: 20 additions & 0 deletions internal/service/outposts/outpost_assets_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/aws/aws-sdk-go/service/outposts"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/flex"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
)

Expand All @@ -25,6 +26,16 @@ func DataSourceOutpostAssets() *schema.Resource {
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"host_id_filter": {
Type: schema.TypeList,
kpena027 marked this conversation as resolved.
Show resolved Hide resolved
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"status_id_filter": {
Type: schema.TypeList,
kpena027 marked this conversation as resolved.
Show resolved Hide resolved
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
},
}
}
Expand All @@ -36,6 +47,15 @@ func DataSourceOutpostAssetsRead(d *schema.ResourceData, meta interface{}) error
input := &outposts.ListAssetsInput{
OutpostIdentifier: outpost_id,
}

if _, ok := d.GetOk("host_id_filter"); ok {
input.HostIdFilter = flex.ExpandStringList(d.Get("host_id_filter").([]interface{}))
kpena027 marked this conversation as resolved.
Show resolved Hide resolved
}

if _, ok := d.GetOk("status_id_filter"); ok {
input.StatusFilter = flex.ExpandStringList(d.Get("status_id_filter").([]interface{}))
kpena027 marked this conversation as resolved.
Show resolved Hide resolved
}

var asset_ids []string
err := conn.ListAssetsPages(input, func(page *outposts.ListAssetsOutput, lastPage bool) bool {
if page == nil {
Expand Down