Skip to content

Commit f1aa7c6

Browse files
Fix versioned tests (#500)
* Fix tests failing on 11.3 * Fix server_settings test on PF 12.0
1 parent 09d6969 commit f1aa7c6

File tree

5 files changed

+36
-16
lines changed

5 files changed

+36
-16
lines changed

internal/acctest/config/idp/adapter/idp_adapter_resource_gen_test.go

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/acctest/config/redirectvalidation/redirect_validation_resource_gen_test.go

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/acctest/config/serversettings/server_settings_resource_gen_test.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/resource/config/incomingproxysettings/incoming_proxy_settings_resource.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,17 @@ func (r *incomingProxySettingsResource) Schema(ctx context.Context, req resource
126126
}
127127

128128
func addOptionalIncomingProxySettingsFields(ctx context.Context, addRequest *client.IncomingProxySettings, plan incomingProxySettingsResourceModel) {
129-
addRequest.EnableClientCertHeaderAuth = plan.EnableClientCertHeaderAuth.ValueBoolPointer()
129+
if internaltypes.IsDefined(plan.EnableClientCertHeaderAuth) {
130+
addRequest.EnableClientCertHeaderAuth = plan.EnableClientCertHeaderAuth.ValueBoolPointer()
131+
}
130132
addRequest.ForwardedIpAddressHeaderName = plan.ForwardedIpAddressHeaderName.ValueStringPointer()
131133
addRequest.ForwardedIpAddressHeaderIndex = plan.ForwardedIpAddressHeaderIndex.ValueStringPointer()
132134
addRequest.ForwardedHostHeaderName = plan.ForwardedHostHeaderName.ValueStringPointer()
133135
addRequest.ForwardedHostHeaderIndex = plan.ForwardedHostHeaderIndex.ValueStringPointer()
134136
addRequest.ClientCertSSLHeaderName = plan.ClientCertSSLHeaderName.ValueStringPointer()
135-
addRequest.ClientCertHeaderEncodingFormat = plan.ClientCertHeaderEncodingFormat.ValueStringPointer()
137+
if internaltypes.IsDefined(plan.ClientCertHeaderEncodingFormat) {
138+
addRequest.ClientCertHeaderEncodingFormat = plan.ClientCertHeaderEncodingFormat.ValueStringPointer()
139+
}
136140
addRequest.ClientCertChainSSLHeaderName = plan.ClientCertChainSSLHeaderName.ValueStringPointer()
137141
addRequest.ProxyTerminatesHttpsConns = plan.ProxyTerminatesHttpsConns.ValueBoolPointer()
138142
}

internal/resource/config/redirectvalidation/redirect_validation_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func (r *redirectValidationResource) ModifyPlan(ctx context.Context, req resourc
266266
if plan == nil {
267267
return
268268
}
269-
// If redirect_validation_local_settings.uri_allow_list is set prior to PF version 11.3, throw an error
269+
// If redirect_validation_local_settings.uri_allow_list is set prior to PF version 12.1, throw an error
270270
var diags diag.Diagnostics
271271
var localSettingsAttrs map[string]attr.Value
272272
localSettingsModified := false

0 commit comments

Comments
 (0)