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

devel sync to master #1023

Merged
merged 5 commits into from
Oct 15, 2024
Merged

devel sync to master #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c554a7
fix virtual address mask issues
RavinderReddyF5 Sep 17, 2024
c0459d3
Merge pull request #1013 from F5Networks/devel_00686645
RavinderReddyF5 Sep 30, 2024
8ad54d7
adding crl file support
RavinderReddyF5 Oct 15, 2024
2baea33
fix lint issues
RavinderReddyF5 Oct 15, 2024
c6696b2
Merge pull request #1022 from F5Networks/devel_ssl_crl_support
RavinderReddyF5 Oct 15, 2024
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
12 changes: 10 additions & 2 deletions bigip/resource_bigip_ltm_profile_ssl_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,18 @@ func resourceBigipLtmProfileClientSsl() *schema.Resource {
Computed: true,
Description: "(Advertised Certificate Authorities)Specifies that the CAs that the system advertises to clients is being trusted by the profile. The default is `None`",
},

"crl_file": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Certificate revocation file name",
},

"allow_expired_crl": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "allow_expired_crl option to be `enabled` / `disabled`. Default is `disabled`.",
},
"forward_proxy_bypass_default_action": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -653,6 +657,9 @@ func resourceBigipLtmProfileClientSSLRead(ctx context.Context, d *schema.Resourc
if _, ok := d.GetOk("crl_file"); ok {
_ = d.Set("crl_file", obj.CrlFile)
}
if _, ok := d.GetOk("allow_expired_crl"); ok {
_ = d.Set("allow_expired_crl", obj.AllowExpiredCrl)
}
if _, ok := d.GetOk("forward_proxy_bypass_default_action"); ok {
_ = d.Set("forward_proxy_bypass_default_action", obj.ForwardProxyBypassDefaultAction)
}
Expand Down Expand Up @@ -891,6 +898,7 @@ func getClientSslConfig(d *schema.ResourceData, config *bigip.ClientSSLProfile)
}
config.ClientCertCa = d.Get("client_cert_ca").(string)
config.CrlFile = d.Get("crl_file").(string)
config.AllowExpiredCrl = d.Get("allow_expired_crl").(string)
config.ForwardProxyBypassDefaultAction = d.Get("forward_proxy_bypass_default_action").(string)
config.GenericAlert = d.Get("generic_alert").(string)
config.HandshakeTimeout = d.Get("handshake_timeout").(string)
Expand Down
3 changes: 2 additions & 1 deletion bigip/resource_bigip_ltm_virtual_address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ func resourceBigipLtmVirtualAddressRead(ctx context.Context, d *schema.ResourceD
if va.FullPath != name {
return diag.FromErr(fmt.Errorf("virtual address %s not found", name))
}
log.Printf("[DEBUG] virtual address configured on bigip is :%v", vas)
log.Printf("[DEBUG] virtual address configured on bigip is :%+v", vas)

_ = d.Set("name", name)
_ = d.Set("arp", va.ARP)
_ = d.Set("auto_delete", va.AutoDelete)
Expand Down
4 changes: 4 additions & 0 deletions docs/resources/bigip_ltm_profile_client_ssl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ Don't insert empty fragments and No TLSv1.3 are listed as Enabled Options. `Usag

* `ca_file` - (Optional) (Trusted Certificate Authorities)Specifies a client CA that the system trusts. The default is `None`.

* `crl_file` - (Optional) Specifies the name of a file containing a list of revoked client certificates. The default is `None`.

* `allow_expired_crl` - (Optional) Instructs the system to use the specified CRL file even if it has expired. The default is `disabled`.

* `client_cert_ca` - (Optional)(Advertised Certificate Authorities)Specifies that the CAs that the system advertises to clients is being trusted by the profile. The default is `None`.

* `renegotiation` - (Optional) Enables or disables SSL renegotiation.When creating a new profile, the setting is provided by the parent profile
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/Azure/azure-storage-blob-go v0.13.0
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest/adal v0.9.13
github.com/f5devcentral/go-bigip v0.0.0-20240801101847-64d6eb419ed6
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240801101847-64d6eb419ed6
github.com/f5devcentral/go-bigip v0.0.0-20241015134941-ace8c7550cdb
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20241015134941-ace8c7550cdb
github.com/google/uuid v1.3.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.25.0
github.com/stretchr/testify v1.8.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/f5devcentral/go-bigip v0.0.0-20240801101847-64d6eb419ed6 h1:ckTAKRScUrCQLzhr0LjuGEQ+Cdw+DihVacGtk7VHRn4=
github.com/f5devcentral/go-bigip v0.0.0-20240801101847-64d6eb419ed6/go.mod h1:0Lkr0fBU6O1yBxF2mt9JFwXpaFbIb/wAY7oM3dMJDdA=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240801101847-64d6eb419ed6 h1:1n8eAKWABMl4ZkjdheVQC19fdyNwO5k/DqP8e3OB2sI=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240801101847-64d6eb419ed6/go.mod h1:r7o5I22EvO+fps2u10bz4ZUlTlNHopQSWzVcW19hK3U=
github.com/f5devcentral/go-bigip v0.0.0-20241015134941-ace8c7550cdb h1:fXszVqyYEUktmRzhAfkBa38quBIGN4mCVdgnEgnzZw4=
github.com/f5devcentral/go-bigip v0.0.0-20241015134941-ace8c7550cdb/go.mod h1:0Lkr0fBU6O1yBxF2mt9JFwXpaFbIb/wAY7oM3dMJDdA=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20241015134941-ace8c7550cdb h1:m7yCTq/MdZ3JKcXBOqwgnOhOmnAuiHuo4iGODW5nJHQ=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20241015134941-ace8c7550cdb/go.mod h1:r7o5I22EvO+fps2u10bz4ZUlTlNHopQSWzVcW19hK3U=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
Expand Down
3 changes: 2 additions & 1 deletion vendor/github.com/f5devcentral/go-bigip/ltm.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ github.com/apparentlymart/go-textseg/v13/textseg
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/f5devcentral/go-bigip v0.0.0-20240801101847-64d6eb419ed6
# github.com/f5devcentral/go-bigip v0.0.0-20241015134941-ace8c7550cdb
## explicit; go 1.20
github.com/f5devcentral/go-bigip
# github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240801101847-64d6eb419ed6
# github.com/f5devcentral/go-bigip/f5teem v0.0.0-20241015134941-ace8c7550cdb
## explicit; go 1.13
github.com/f5devcentral/go-bigip/f5teem
# github.com/fatih/color v1.13.0
Expand Down