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

Allow redisVersion to change, promoted some fields to GA #4838

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 0 additions & 3 deletions mmv1/products/redis/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ objects:
- REDIS_5_0 for Redis 5.0 compatibility
- REDIS_4_0 for Redis 4.0 compatibility
- REDIS_3_2 for Redis 3.2 compatibility
input: true
- !ruby/object:Api::Type::String
name: reservedIpRange
description: |
Expand All @@ -192,7 +191,6 @@ objects:
input: true
- !ruby/object:Api::Type::Enum
name: transitEncryptionMode
min_version: beta
input: true
description: |
The TLS mode of the Redis instance, If not provided, TLS is disabled for the instance.
Expand All @@ -204,7 +202,6 @@ objects:
default_value: :DISABLED
- !ruby/object:Api::Type::Array
name: 'serverCaCerts'
min_version: beta
description: |
List of server CA certificates for the instance.
output: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<% autogen_exception -%>

package google

import (
Expand Down Expand Up @@ -79,8 +77,8 @@ func TestAccRedisInstance_redisInstanceAuthEnabled(t *testing.T) {
}

vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckRedisInstanceDestroyProducer(t),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -122,6 +120,7 @@ resource "google_redis_instance" "test" {
maxmemory-policy = "allkeys-lru"
notify-keyspace-events = "KEA"
}
redis_version = "REDIS_4_0"
}
`, name)
}
Expand All @@ -142,9 +141,8 @@ resource "google_redis_instance" "test" {
maxmemory-policy = "noeviction"
notify-keyspace-events = ""
}
<% unless version == 'ga' -%>
transit_encryption_mode = "SERVER_AUTHENTICATION"
<% end -%>
redis_version = "REDIS_5_0"
ScottSuarez marked this conversation as resolved.
Show resolved Hide resolved
}
`, name)
}
Expand Down