azurerm_redis_cache : fix incorrect ssl values for redis_primary_connection_string and secondary_connection_string
#23575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
1 task
sinbai
changed the title
azurerm_redis_cache : fix the wrong ssl value of redis_primary_connection_string and secondary_connection_stringazurerm_redis_cache : fix incorrect ssl values for redis_primary_connection_string and secondary_connection_string
catriona-m
requested changes
Oct 16, 2023
There was a problem hiding this comment.
Thanks for opening this @sinbai. It looks like there is a test failure relating to this that needs to be addressed:
------- Stdout: -------
=== RUN TestAccRedisCache_withoutSSL
=== PAUSE TestAccRedisCache_withoutSSL
=== CONT TestAccRedisCache_withoutSSL
testcase.go:113: Step 1/2 error: Check failed: Check 2/3 error: Bad: wrong SSL setting in connection string: primary_connection_string
--- FAIL: TestAccRedisCache_withoutSSL (2048.00s)
FAIL
|
Hi, Thanks, Perhaps we need two outputs nonssl_primary_connection_string & primary_connection_string to cover every usage ? of course, nonssl_primary_connection_string should use nonssl port with ssl=false and primary_connection_string should use ssl port with ssl=true ? |
Hi @catriona-m thanks for your feedback. The code has been updated. Could you please take another look? |
catriona-m
reviewed
Oct 17, 2023
| @@ -1492,7 +1492,7 @@ resource "azurerm_redis_cache" "test" { | |||
| `, data.RandomInteger, data.Locations.Primary, data.RandomInteger) | |||
| } | |||
|
|
|||
| func testCheckSSLInConnectionString(resourceName string, propertyName string, requireSSL bool) acceptance.TestCheckFunc { | |||
| func testCheckSSLInConnectionString(resourceName string, propertyName string) acceptance.TestCheckFunc { | |||
There was a problem hiding this comment.
given that the connection string is now specifically set to be true now, we probably don't need to have this check in the tests at all anymore?
There was a problem hiding this comment.
Good suggestion, fixed. Thanks.
catriona-m
added a commit
that referenced
this pull request
Oct 18, 2023
dduportal
pushed a commit
to jenkins-infra/azure
that referenced
this pull request
Oct 20, 2023
<Actions>
<action
id="4a39167e811ac038e4a588362092472c27cfbe9e4929ae61d035f708a093a669">
<h3>Bump Terraform `azurerm` provider version</h3>
<details
id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24">
<summary>Update Terraform lock file</summary>
<p>"hashicorp/azurerm" updated from "3.76.0" to
"3.77.0" in file ".terraform.lock.hcl"</p>
<details>
<summary>3.77.0</summary>
<pre>Changelog retrieved
from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.77.0
FEATURES:

*
New Resources: `azurerm_application_load_balancer_frontend`
([#23411](https://github.com/hashicorp/terraform-provider-azurerm/issues/23411))
*
New Resources: `azurerm_dev_center`
([#23538](https://github.com/hashicorp/terraform-provider-azurerm/issues/23538))
*
New Resources: `azurerm_dev_center_project`
([#23538](https://github.com/hashicorp/terraform-provider-azurerm/issues/23538))

ENHANCEMENTS:

*
dependencies: updating to `v0.62.0` of
`github.com/hashicorp/go-azure-helpers`
([#23581](https://github.com/hashicorp/terraform-provider-azurerm/issues/23581))
*
dependencies: updating Kusto SDK from `2023-05-02` to `2023-08-15`
([#23598](https://github.com/hashicorp/terraform-provider-azurerm/issues/23598))
*
dependencies: updating nginx from `2022-08-01` to `2023-04-01`
([#23583](https://github.com/hashicorp/terraform-provider-azurerm/issues/23583))
*
`netapp`: updating to use API Version `2023-05-01`
([#23576](https://github.com/hashicorp/terraform-provider-azurerm/issues/23576))
*
`springcloud`: updating to use API Version `2023-09-01-preview`
([#23544](https://github.com/hashicorp/terraform-provider-azurerm/issues/23544))
*
`storage`: updating to use API Version `2023-01-01`
([#23543](https://github.com/hashicorp/terraform-provider-azurerm/issues/23543))
*
`internal/sdk`: fixing an issue where struct fields containing
`removedInNextMajorVersion` wouldn't be decoded correctly
([#23564](https://github.com/hashicorp/terraform-provider-azurerm/issues/23564))
*
`internal/sdk`: struct tag parsing is now handled consistently during
both encoding and decoding
([#23568](https://github.com/hashicorp/terraform-provider-azurerm/issues/23568))
*
provider: the `roll_instances_when_required` provider feature in the
`virtual_machine_scale_set` block is now optional
([#22976](https://github.com/hashicorp/terraform-provider-azurerm/issues/22976))
*
Data Source: `azurerm_automation_account`: refactoring the remaining
usage of `Azure/azure-sdk-for-go` to use `hashicorp/go-azure-sdk`
([#23555](https://github.com/hashicorp/terraform-provider-azurerm/issues/23555))
*
`azurerm_automation_account`: refactoring the remaining usage of
`Azure/azure-sdk-for-go` to use `hashicorp/go-azure-sdk`
([#23555](https://github.com/hashicorp/terraform-provider-azurerm/issues/23555))
*
`azurerm_resource_deployment_script_azure_cli` - improve validation for
the `version` property to support newer versions
([#23370](https://github.com/hashicorp/terraform-provider-azurerm/issues/23370))
*
`azurerm_resource_deployment_script_azure_power_shell` - improve
validation for the `version` property to support newer versions
([#23370](https://github.com/hashicorp/terraform-provider-azurerm/issues/23370))
*
`azurerm_nginx_deployment` - support for the `capacity` and `email`
properties
([#23596](https://github.com/hashicorp/terraform-provider-azurerm/issues/23596))

BUG
FIXES:

* Data Source: `azurerm_virtual_hub_connection` - export
the `inbound_route_map_id`, `outbound_route_map_id`, and
`static_vnet_local_route_override_criteria` attributes in the `routing`
block, and fix a bug where these attributes could not be set
([#23491](https://github.com/hashicorp/terraform-provider-azurerm/issues/23491))
*
`azurerm_cdn_frontdoor_rule` - the `url_filename_condition` properties
`match_values` is now optional if `operator` is set to `Any`
([#23541](https://github.com/hashicorp/terraform-provider-azurerm/issues/23541))
*
`azurerm_shared_image_gallery` - added the `Private` and `Groups`
options for the `sharing.permission` property
([#23570](https://github.com/hashicorp/terraform-provider-azurerm/issues/23570))
*
`azurerm_redis_cache` - fixed incorrect ssl values for
`redis_primary_connection_string` and `secondary_connection_string`
([#23575](https://github.com/hashicorp/terraform-provider-azurerm/issues/23575))
*
`azurerm_monitor_activity_log_alert` - the `recommend_category` property
now can be set to `HighAvailability`
([#23605](https://github.com/hashicorp/terraform-provider-azurerm/issues/23605))
*
`azurerm_recovery_services_vault` - the `encryption` property can now be
used with the `cross_region_restore_enabled` property
([#23618](https://github.com/hashicorp/terraform-provider-azurerm/issues/23618))
*
`azurerm_storage_account_customer_managed_key` - prevent a panic when
the keyvault id is empty
([#23599](https://github.com/hashicorp/terraform-provider-azurerm/issues/23599))


</pre>
</details>
</details>
</action>
</Actions>
---
<table>
<tr>
<td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
</td>
<td>
<p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
</p>
<details><summary>Options:</summary>
<br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
<ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
</ul>
<p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
</p>
</details>
</td>
</tr>
</table>
Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the ports of
primary_connection_stringandsecondary_connection_stringare set toprops.SslPort, the ssl value should always be true, rather than relying on the value ofenable_non_ssl_port.Fix #23490