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.

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

Fix Idempotency for bigip_ltm_rewrite_profile #937

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 60 additions & 18 deletions bigip/resource_bigip_ltm_profile_rewrite.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func resourceBigipLtmRewriteProfile() *schema.Resource {
"signing_key_password": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Sensitive: true,
Description: "Specifies a pass phrase to use for encrypting the private signing key.",
ValidateFunc: validateF5Name,
Expand Down Expand Up @@ -263,32 +264,73 @@ func resourceBigipLtmProfileRewriteDelete(ctx context.Context, d *schema.Resourc
}

func setRewriteProfileData(d *schema.ResourceData, data *bigip.RewriteProfile) diag.Diagnostics {

_ = d.Set("name", data.FullPath)
_ = d.Set("defaults_from", data.DefaultsFrom)
_ = d.Set("rewrite_mode", data.Mode)
_ = d.Set("ca_file", data.CaFile)
_ = d.Set("crl_file", data.CrlFile)
_ = d.Set("signing_cert", data.SigningCert)
_ = d.Set("signing_key", data.SigningKey)
_ = d.Set("signing_key_password", data.SigningKeyPass)
_ = d.Set("cache_type", data.CachingType)
_ = d.Set("split_tunneling", data.SplitTunnel)
_ = d.Set("rewrite_list", data.RewriteList)
_ = d.Set("bypass_list", data.BypassList)
if _, ok := d.GetOk("defaults_from"); ok {
_ = d.Set("defaults_from", data.DefaultsFrom)
}
if _, ok := d.GetOk("ca_file"); ok {
_ = d.Set("ca_file", data.CaFile)
}
if _, ok := d.GetOk("crl_file"); ok {
_ = d.Set("crl_file", data.CrlFile)
}
if _, ok := d.GetOk("signing_cert"); ok {
_ = d.Set("signing_cert", data.SigningCert)
}
if _, ok := d.GetOk("signing_key"); ok {
_ = d.Set("signing_key", data.SigningKey)
}
if _, ok := d.GetOk("signing_key_password"); ok {
_ = d.Set("signing_key_password", data.SigningKeyPass)
}
if _, ok := d.GetOk("cache_type"); ok {
_ = d.Set("cache_type", data.CachingType)
}
if _, ok := d.GetOk("split_tunneling"); ok {
_ = d.Set("split_tunneling", data.SplitTunnel)
}
if _, ok := d.GetOk("rewrite_list"); ok {
_ = d.Set("rewrite_list", data.RewriteList)
}
if _, ok := d.GetOk("bypass_list"); ok {
_ = d.Set("bypass_list", data.BypassList)
}
var reqList []interface{}
req := make(map[string]interface{})
req["insert_xfwd_for"] = data.Request.XfwdFor
req["insert_xfwd_host"] = data.Request.XfwdHost
req["insert_xfwd_protocol"] = data.Request.XfwdProtocol
req["rewrite_headers"] = data.Request.RewriteHeaders
if val, ok := d.GetOk("request"); ok {
for _, item := range val.(*schema.Set).List() {
if val, ok := item.(map[string]interface{})["insert_xfwd_for"].(string); ok && val != "" {
req["insert_xfwd_for"] = val
}
if val, ok := item.(map[string]interface{})["insert_xfwd_host"].(string); ok && val != "" {
req["insert_xfwd_host"] = val
}
if val, ok := item.(map[string]interface{})["insert_xfwd_protocol"].(string); ok && val != "" {
req["insert_xfwd_protocol"] = val
}
if val, ok := item.(map[string]interface{})["rewrite_headers"].(string); ok && val != "" {
req["rewrite_headers"] = val
}
}
}
reqList = append(reqList, req)
_ = d.Set("request", reqList)
var resList []interface{}
res := make(map[string]interface{})
res["rewrite_content"] = data.Response.RewriteContent
res["rewrite_headers"] = data.Response.RewriteHeaders
resList = append(resList, res)
_ = d.Set("response", resList)
if val, ok := d.GetOk("response"); ok {
for _, item := range val.(*schema.Set).List() {
if val, ok := item.(map[string]interface{})["rewrite_content"].(string); ok && val != "" {
res["rewrite_content"] = val
}
if val, ok := item.(map[string]interface{})["rewrite_headers"].(string); ok && val != "" {
res["rewrite_headers"] = val
}
}
resList = append(resList, res)
_ = d.Set("response", resList)
}
cookies := make([]interface{}, len(data.Cookies))
for i, v := range data.Cookies {
obj := make(map[string]interface{})
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/bigip_ltm_profile_rewrite.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ resource "bigip_ltm_profile_rewrite" "test-profile2" {

* `signing_key` - (Optional, type `string`) Specifies a certificate to use for re-signing of signed Java applets after patching. (name should be in full path which is combination of partition and key name )

* `signing_key_password` - (Optional, type `string`) Specifies a pass phrase to use for encrypting the private signing key.
* `signing_key_password` - (Optional, type `string`) Specifies a pass phrase to use for encrypting the private signing key. Since it's a sensitive entity idempotency will fail in the update call.

* `split_tunneling` - (Optional,type `string`) Specifies the type of Client caching. Valid choices are: `true, false`

Expand Down
4 changes: 2 additions & 2 deletions go.mod
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-20240213064501-035c7f45b94c
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240213064501-035c7f45b94c
github.com/f5devcentral/go-bigip v0.0.0-20240214135103-fd95be9ae1fb
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240214135103-fd95be9ae1fb
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
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-20240213064501-035c7f45b94c h1:wWbL9ITo0nsAQr+MCZ1nsdlxDykBrGF8ozhG2ubGiGw=
github.com/f5devcentral/go-bigip v0.0.0-20240213064501-035c7f45b94c/go.mod h1:0Lkr0fBU6O1yBxF2mt9JFwXpaFbIb/wAY7oM3dMJDdA=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240213064501-035c7f45b94c h1:d1xnDqT9OCxjzI9xr+4rzagzOHCWGrMzGRwIPT198wE=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240213064501-035c7f45b94c/go.mod h1:r7o5I22EvO+fps2u10bz4ZUlTlNHopQSWzVcW19hK3U=
github.com/f5devcentral/go-bigip v0.0.0-20240214135103-fd95be9ae1fb h1:r2hm89TgbKAJQnViwet98Z7Hq1o5JE4TX/bbRG7489o=
github.com/f5devcentral/go-bigip v0.0.0-20240214135103-fd95be9ae1fb/go.mod h1:0Lkr0fBU6O1yBxF2mt9JFwXpaFbIb/wAY7oM3dMJDdA=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240214135103-fd95be9ae1fb h1:ZobhcJVa43SKFAhDUc3FQBnn5U+OXdAD7ur5lKbokIY=
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240214135103-fd95be9ae1fb/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
2 changes: 1 addition & 1 deletion vendor/github.com/f5devcentral/go-bigip/ltm.go

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
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-20240213064501-035c7f45b94c
# github.com/f5devcentral/go-bigip v0.0.0-20240214135103-fd95be9ae1fb
## explicit; go 1.20
github.com/f5devcentral/go-bigip
# github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240213064501-035c7f45b94c
# github.com/f5devcentral/go-bigip/f5teem v0.0.0-20240214135103-fd95be9ae1fb
## explicit; go 1.13
github.com/f5devcentral/go-bigip/f5teem
# github.com/fatih/color v1.13.0
Expand Down