Skip to content

Commit b8b8a7b

Browse files
emilymyemodular-magician
authored andcommitted
Fix error regexp for storage bucket website test
Signed-off-by: Modular Magician <[email protected]>
1 parent fb983ea commit b8b8a7b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

google/resource_storage_bucket_test.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -851,10 +851,7 @@ func TestAccStorageBucket_website(t *testing.T) {
851851
t.Parallel()
852852

853853
bucketSuffix := acctest.RandomWithPrefix("tf-website-test")
854-
855-
websiteKeys := []string{"website.0.main_page_suffix", "website.0.not_found_page"}
856-
errMsg := fmt.Sprintf("one of `%s` must be specified", strings.Join(websiteKeys, ","))
857-
fullErr := fmt.Sprintf("config is invalid: 2 problems:\n\n- \"%s\": %s\n- \"%s\": %s", websiteKeys[0], errMsg, websiteKeys[1], errMsg)
854+
errRe := regexp.MustCompile("one of `(?:website.0.main_page_suffix,website.0.not_found_page)|(?:website.0.not_found_page,website.0.main_page_suffix)`must be specified")
858855

859856
resource.Test(t, resource.TestCase{
860857
PreCheck: func() { testAccPreCheck(t) },
@@ -863,7 +860,7 @@ func TestAccStorageBucket_website(t *testing.T) {
863860
Steps: []resource.TestStep{
864861
{
865862
Config: testAccStorageBucket_websiteNoAttributes(bucketSuffix),
866-
ExpectError: regexp.MustCompile(fullErr),
863+
ExpectError: errRe,
867864
},
868865
{
869866
Config: testAccStorageBucket_websiteOneAttribute(bucketSuffix),

0 commit comments

Comments
 (0)