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

Resource/lb_listener: Add alpn policy argument #14462

Merged
merged 15 commits into from
Apr 5, 2021
Merged

Resource/lb_listener: Add alpn policy argument #14462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4732862
Adding alpn policy to aws lb listener, for NLBs
knorby Aug 4, 2020
93d726b
removing whitespace cleanup noise
knorby Aug 4, 2020
a5c39f0
whitespace, second pass
knorby Aug 4, 2020
379c284
Adding validation and documentation
knorby Aug 4, 2020
0d0cbfd
r/lb_listener: Cleanup retry
YakDriver Apr 2, 2021
97c0f4f
r/lb_listener: Standardize retry, naming
YakDriver Apr 5, 2021
51b410e
r/lb_listener: Sort arguments
YakDriver Apr 5, 2021
15f2a14
r/lb_listener: Standardize errors
YakDriver Apr 5, 2021
38bd855
r/lb_listener: Standardize retry, naming
YakDriver Apr 5, 2021
c9d6e45
r/lb_listener: Add changelog file
YakDriver Apr 5, 2021
a0c131f
ds/lb_listener: Sort arguments
YakDriver Apr 5, 2021
e277193
docs/ds/lb_listener: Clean up docs
YakDriver Apr 5, 2021
1273098
docs/r/lb_listener: Clean up docs
YakDriver Apr 5, 2021
7355e58
docs/r/lb_listener: Add authenticate OIDC description
YakDriver Apr 5, 2021
fabe712
ds/lb_listener: Rework tests to standardize, fix randomization
YakDriver Apr 5, 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
7 changes: 7 additions & 0 deletions .changelog/14462.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_lb_listener: Add `alpn_policy` argument
```

```release-note:enhancement
data-source/aws_lb_listener: Add `alpn_policy` argument
```
129 changes: 64 additions & 65 deletions aws/data_source_aws_lb_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,20 @@ func dataSourceAwsLbListener() *schema.Resource {
Read: dataSourceAwsLbListenerRead,

Schema: map[string]*schema.Schema{
"alpn_policy": {
Type: schema.TypeString,
Computed: true,
},
"arn": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"load_balancer_arn", "port"},
},

"load_balancer_arn": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"arn"},
},
"port": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ConflictsWith: []string{"arn"},
},

"protocol": {
Type: schema.TypeString,
Computed: true,
},

"ssl_policy": {
Type: schema.TypeString,
Computed: true,
},

"certificate_arn": {
Type: schema.TypeString,
Computed: true,
},

"default_action": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -169,6 +148,46 @@ func dataSourceAwsLbListener() *schema.Resource {
},
},
},
"forward": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"stickiness": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"duration": {
Type: schema.TypeInt,
Computed: true,
},
"enabled": {
Type: schema.TypeBool,
Computed: true,
},
},
},
},
"target_group": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"arn": {
Type: schema.TypeString,
Computed: true,
},
"weight": {
Type: schema.TypeInt,
Computed: true,
},
},
},
},
},
},
},
"order": {
Type: schema.TypeInt,
Computed: true,
Expand Down Expand Up @@ -213,49 +232,29 @@ func dataSourceAwsLbListener() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"forward": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"target_group": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"arn": {
Type: schema.TypeString,
Computed: true,
},
"weight": {
Type: schema.TypeInt,
Computed: true,
},
},
},
},
"stickiness": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"enabled": {
Type: schema.TypeBool,
Computed: true,
},
"duration": {
Type: schema.TypeInt,
Computed: true,
},
},
},
},
},
},
},
},
},
},
"load_balancer_arn": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"arn"},
},
"port": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ConflictsWith: []string{"arn"},
},
"protocol": {
Type: schema.TypeString,
Computed: true,
},
"ssl_policy": {
Type: schema.TypeString,
Computed: true,
},
},
}
}
Expand Down
Loading