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

add transit encryption mode support for redis instance resource #4444

Merged
merged 6 commits into from
Feb 11, 2021
Merged

add transit encryption mode support for redis instance resource #4444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02a1a83
add transit encryption mode support for redis instance resource
venkykuberan Jan 29, 2021
429158a
DISABLED option added for transit enryption mode
venkykuberan Feb 1, 2021
ba683dc
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
venkykuberan Feb 1, 2021
3e4039f
transit_encryption_mode is made to ForceNew as API don't accept the u…
venkykuberan Feb 10, 2021
f5cc9c1
server certs attribute added
venkykuberan Feb 10, 2021
cd62f54
output flag added to all sub-fields of sercercacerts
venkykuberan Feb 11, 2021
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
45 changes: 45 additions & 0 deletions mmv1/products/redis/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,48 @@ objects:
- :STANDARD_HA
default_value: :BASIC
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.

- SERVER_AUTHENTICATION: Client to Server traffic encryption enabled with server authentcation
values:
- :SERVER_AUTHENTICATION
rileykarson marked this conversation as resolved.
Show resolved Hide resolved
- :DISABLED
default_value: :DISABLED
- !ruby/object:Api::Type::Array
name: 'serverCaCerts'
Copy link
Member

@rileykarson rileykarson Feb 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slevenick any idea what this error is about? https://console.cloud.google.com/cloud-build/builds/eec8061e-2d56-4995-b3ae-be46aab37a82;step=15?project=graphite-docker-images

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

min_version: beta
description: |
List of server CA certificates for the instance.
output: true
item_type: !ruby/object:Api::Type::NestedObject
properties:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you mark each subproperty here output: true as well? That'll make this schema a little more correct: auto-pr-4444-old..auto-pr-4444#diff-fd32ba4f30

- !ruby/object:Api::Type::String
name: 'serialNumber'
output: true
description: |
Serial number, as extracted from the certificate.
- !ruby/object:Api::Type::String
name: 'cert'
output: true
description: |
Serial number, as extracted from the certificate.
- !ruby/object:Api::Type::String
name: 'createTime'
output: true
description: |
The time when the certificate was created.
- !ruby/object:Api::Type::String
name: 'expireTime'
output: true
description: |
The time when the certificate expires.
- !ruby/object:Api::Type::String
name: 'sha1Fingerprint'
output: true
description: |
Sha1 Fingerprint of the certificate.
1 change: 1 addition & 0 deletions mmv1/third_party/terraform/tests/resource_redis_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ resource "google_redis_instance" "test" {
maxmemory-policy = "noeviction"
notify-keyspace-events = ""
}
transit_encryption_mode = "SERVER_AUTHENTICATION"
}
`, name)
}
Expand Down