diff --git a/.changelog/5416.txt b/.changelog/5416.txt new file mode 100644 index 0000000000..b8434d81c1 --- /dev/null +++ b/.changelog/5416.txt @@ -0,0 +1,3 @@ +```release-note:bug +logging: fixed a bug with updating `description` on `google_logging_project_sink`, `google_logging_folder_sink` and `google_logging_organization_sink` +``` diff --git a/google-beta/resource_logging_project_sink_test.go b/google-beta/resource_logging_project_sink_test.go index b871b5d564..e64820995b 100644 --- a/google-beta/resource_logging_project_sink_test.go +++ b/google-beta/resource_logging_project_sink_test.go @@ -54,6 +54,37 @@ func TestAccLoggingProjectSink_described(t *testing.T) { }) } +func TestAccLoggingProjectSink_described_update(t *testing.T) { + t.Parallel() + + sinkName := "tf-test-sink-" + randString(t, 10) + bucketName := "tf-test-sink-bucket-" + randString(t, 10) + + vcrTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckLoggingProjectSinkDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccLoggingProjectSink_described(sinkName, getTestProjectFromEnv(), bucketName), + }, + { + ResourceName: "google_logging_project_sink.described", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccLoggingProjectSink_described_update(sinkName, getTestProjectFromEnv(), bucketName), + }, + { + ResourceName: "google_logging_project_sink.described", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccLoggingProjectSink_disabled(t *testing.T) { t.Parallel() @@ -347,6 +378,25 @@ resource "google_storage_bucket" "log-bucket" { `, name, project, project, bucketName) } +func testAccLoggingProjectSink_described_update(name, project, bucketName string) string { + return fmt.Sprintf(` +resource "google_logging_project_sink" "described" { + name = "%s" + project = "%s" + destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}" + filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR" + description = "description updated" + + unique_writer_identity = false +} + +resource "google_storage_bucket" "log-bucket" { + name = "%s" + location = "US" +} +`, name, project, project, bucketName) +} + func testAccLoggingProjectSink_disabled(name, project, bucketName string) string { return fmt.Sprintf(` resource "google_logging_project_sink" "disabled" { diff --git a/google-beta/resource_logging_sink.go b/google-beta/resource_logging_sink.go index f6d6f905d1..83cbf8b259 100644 --- a/google-beta/resource_logging_sink.go +++ b/google-beta/resource_logging_sink.go @@ -153,6 +153,7 @@ func expandResourceLoggingSinkForUpdate(d *schema.ResourceData) (sink *logging.L Destination: d.Get("destination").(string), Filter: d.Get("filter").(string), Disabled: d.Get("disabled").(bool), + Description: d.Get("description").(string), ForceSendFields: []string{"Destination", "Filter", "Disabled"}, }