make the location field required in google_storage_bucket (#5352) (…

…#3771) * make location required * updated related tests Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Oct 25, 2021 · 6489fa8 · 6489fa8
1 parent fffcdc1
commit 6489fa8
Show file tree

Hide file tree

Showing 74 changed files with 431 additions and 229 deletions.
diff --git a/.changelog/5352.txt b/.changelog/5352.txt
@@ -0,0 +1,4 @@
+```release-note:breaking-change
+storage: changed the `location` field to `Required` in `google_storage_bucket ` resource
+
+```
diff --git a/google-beta/data_source_google_cloudfunctions_function_test.go b/google-beta/data_source_google_cloudfunctions_function_test.go
@@ -37,7 +37,8 @@ func TestAccDataSourceGoogleCloudFunctionsFunction_basic(t *testing.T) {
 func testAccDataSourceGoogleCloudFunctionsFunctionConfig(functionName, bucketName, zipFilePath string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name     = "%s"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {

diff --git a/google-beta/data_source_google_storage_bucket_test.go b/google-beta/data_source_google_storage_bucket_test.go
@@ -30,7 +30,8 @@ func TestAccDataSourceGoogleStorageBucket_basic(t *testing.T) {
 func testAccDataSourceGoogleStorageBucketConfig(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "foo" {
-  name               = "%s"
+  name     = "%s"
+  location = "US"
 }
 
 data "google_storage_bucket" "bar" {

diff --git a/google-beta/data_source_storage_bucket_object_content_test.go b/google-beta/data_source_storage_bucket_object_content_test.go
@@ -31,18 +31,18 @@ func testAccDataSourceStorageBucketObjectContent_Basic(content, bucket string) s
 	return fmt.Sprintf(`
 data "google_storage_bucket_object_content" "default" {
 	bucket = google_storage_bucket.contenttest.name
-	name = google_storage_bucket_object.object.name      
+	name   = google_storage_bucket_object.object.name      
 }
 
 resource "google_storage_bucket_object" "object" {
-	name = "butterfly01"
+	name    = "butterfly01"
 	content = "%s"
-	bucket = google_storage_bucket.contenttest.name
+	bucket  = google_storage_bucket.contenttest.name
 }
 
 resource "google_storage_bucket" "contenttest" {
-	name = "%s"
-	location = "US"
+	name          = "%s"
+	location      = "US"
 	force_destroy = true
 }`, content, bucket)
 }
diff --git a/google-beta/data_source_storage_object_signed_url_test.go b/google-beta/data_source_storage_object_signed_url_test.go
@@ -228,7 +228,8 @@ data "google_storage_object_signed_url" "blerg" {
 func testAccTestGoogleStorageObjectSignedURL(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name     = "%s"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "story" {

diff --git a/google-beta/iam_cloudfunctions_function_generated_test.go b/google-beta/iam_cloudfunctions_function_generated_test.go
@@ -122,7 +122,8 @@ func TestAccCloudFunctionsCloudFunctionIamPolicyGenerated(t *testing.T) {
 func testAccCloudFunctionsCloudFunctionIamMember_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  name     = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {
@@ -157,7 +158,8 @@ resource "google_cloudfunctions_function_iam_member" "foo" {
 func testAccCloudFunctionsCloudFunctionIamPolicy_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  name     = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {
@@ -198,7 +200,8 @@ resource "google_cloudfunctions_function_iam_policy" "foo" {
 func testAccCloudFunctionsCloudFunctionIamPolicy_emptyBinding(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  name     = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {
@@ -235,7 +238,8 @@ resource "google_cloudfunctions_function_iam_policy" "foo" {
 func testAccCloudFunctionsCloudFunctionIamBinding_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  name     = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {
@@ -270,7 +274,8 @@ resource "google_cloudfunctions_function_iam_binding" "foo" {
 func testAccCloudFunctionsCloudFunctionIamBinding_updateGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  name     = "tf-test-cloudfunctions-function-example-bucket%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "archive" {

diff --git a/google-beta/iam_iap_app_engine_service_generated_test.go b/google-beta/iam_iap_app_engine_service_generated_test.go
@@ -330,8 +330,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -394,8 +395,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -464,8 +466,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -530,8 +533,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -594,8 +598,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -658,8 +663,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -727,8 +733,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -804,8 +811,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -873,8 +881,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -950,8 +959,9 @@ resource "google_app_engine_application" "app" {
 }
 
 resource "google_storage_bucket" "bucket" {
-  project = google_app_engine_application.app.project
-  name    = "appengine-static-content-%{random_suffix}"
+  project  = google_app_engine_application.app.project
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {

diff --git a/google-beta/iam_iap_app_engine_version_generated_test.go b/google-beta/iam_iap_app_engine_version_generated_test.go
@@ -276,7 +276,8 @@ func TestAccIapAppEngineVersionIamPolicyGenerated_withCondition(t *testing.T) {
 func testAccIapAppEngineVersionIamMember_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -317,7 +318,8 @@ resource "google_iap_app_engine_version_iam_member" "foo" {
 func testAccIapAppEngineVersionIamPolicy_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -364,7 +366,8 @@ resource "google_iap_app_engine_version_iam_policy" "foo" {
 func testAccIapAppEngineVersionIamPolicy_emptyBinding(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -407,7 +410,8 @@ resource "google_iap_app_engine_version_iam_policy" "foo" {
 func testAccIapAppEngineVersionIamBinding_basicGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -448,7 +452,8 @@ resource "google_iap_app_engine_version_iam_binding" "foo" {
 func testAccIapAppEngineVersionIamBinding_updateGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -489,7 +494,8 @@ resource "google_iap_app_engine_version_iam_binding" "foo" {
 func testAccIapAppEngineVersionIamBinding_withConditionGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -535,7 +541,8 @@ resource "google_iap_app_engine_version_iam_binding" "foo" {
 func testAccIapAppEngineVersionIamBinding_withAndWithoutConditionGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -590,7 +597,8 @@ resource "google_iap_app_engine_version_iam_binding" "foo2" {
 func testAccIapAppEngineVersionIamMember_withConditionGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -636,7 +644,8 @@ resource "google_iap_app_engine_version_iam_member" "foo" {
 func testAccIapAppEngineVersionIamMember_withAndWithoutConditionGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {
@@ -691,7 +700,8 @@ resource "google_iap_app_engine_version_iam_member" "foo2" {
 func testAccIapAppEngineVersionIamPolicy_withConditionGenerated(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "appengine-static-content-%{random_suffix}"
+  name     = "appengine-static-content-%{random_suffix}"
+  location = "US"
 }
 
 resource "google_storage_bucket_object" "object" {