From 3c20d16bdfb372f83436af86de4f57959b6d625e Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Tue, 3 Dec 2019 17:20:11 -0800 Subject: [PATCH] Fix regex that changed due to backtick vs double quote (#2777) Merged PR #2777. --- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- third_party/terraform/utils/kms_utils.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/terraform b/build/terraform index d0d6a895805f..b100586a6366 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit d0d6a895805f97bdf2a53197d325a2cf19f68c9b +Subproject commit b100586a6366c6a716b8e52158811a231a8d6c17 diff --git a/build/terraform-beta b/build/terraform-beta index d127be5f02d4..42edd4e7bf22 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit d127be5f02d46ecb60f3631f28049de137c20907 +Subproject commit 42edd4e7bf22ca2d808db0cf3a43991807cc5568 diff --git a/build/terraform-mapper b/build/terraform-mapper index 5dedd6c7d6a8..7add15334616 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit 5dedd6c7d6a8c1a7faf909ad5c64bac27791ab31 +Subproject commit 7add15334616591b0a6758869d6140d1db869e5e diff --git a/third_party/terraform/utils/kms_utils.go b/third_party/terraform/utils/kms_utils.go index 08756354551d..5e12d30aeb26 100644 --- a/third_party/terraform/utils/kms_utils.go +++ b/third_party/terraform/utils/kms_utils.go @@ -87,7 +87,7 @@ func (s *kmsCryptoKeyId) terraformId() string { func validateKmsCryptoKeyRotationPeriod(value interface{}, _ string) (ws []string, errors []error) { period := value.(string) - pattern := regexp.MustCompile(`^([0-9.]*\\d)s$`) + pattern := regexp.MustCompile(`^([0-9.]*\d)s$`) match := pattern.FindStringSubmatch(period) if len(match) == 0 {