osconfig: fix permadiff where patch_config.yum.minimal doesn't send false for empty values (#15046) (#24247)

[upstream:cc70cc8f8613b9382904844bf56032345f83cece]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/15046.txt

@@ -0,0 +1,47 @@
+```release-note:bug
+osconfig: fix permadiff where `patch_config.yum.minimal` doesn't send `false` for empty values
+```
+
+Implemented a specific test to reproduce the permadiff, but I'm fine removing it if it is too much overhead.
+
+**Acceptance tests:**
+
+```
+❮ make testacc TEST=./google/services/osconfig TESTARGS='-run=TestAccOSConfigPatchDeployment_'
+TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google/services/osconfig -v -run=TestAccOSConfigPatchDeployment_ -timeout 240m -ldflags="-X=github.com/hashicorp/terraform-provider-google/version.ProviderVersion=acc"
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeploymentBasicExample
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeploymentBasicExample
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyExample
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyExample
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyMidnightExample
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyMidnightExample
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeploymentInstanceExample
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeploymentInstanceExample
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample
+=== RUN   TestAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic
+=== PAUSE TestAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeploymentBasicExample
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeploymentInstanceExample
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyMidnightExample
+=== CONT  TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyExample
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeploymentBasicExample (5.41s)
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic (5.41s)
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyMidnightExample (5.43s)
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeploymentDailyExample (5.43s)
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample (5.76s)
+--- PASS: TestAccOSConfigPatchDeployment_osConfigPatchDeploymentInstanceExample (128.94s)
+PASS
+ok      github.com/hashicorp/terraform-provider-google/google/services/osconfig 129.689s
+
+```
+
+Had to update the decoder as welll, because even if you provide `false` in the POST for the `patchConfig.yum.minimal`, the GET returns an empty object:
+
+```
+  "patchConfig": {
+    "yum": {}
+  },
+```

google/services/osconfig/resource_os_config_patch_deployment.go

@@ -2358,7 +2358,7 @@ func expandOSConfigPatchDeploymentPatchConfigYum(v interface{}, d tpgresource.Te
 	transformedMinimal, err := expandOSConfigPatchDeploymentPatchConfigYumMinimal(original["minimal"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedMinimal); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+	} else {
 		transformed["minimal"] = transformedMinimal
 	}
 
@@ -3382,6 +3382,14 @@ func resourceOSConfigPatchDeploymentDecoder(d *schema.ResourceData, meta interfa
 			patchConfig["goo"].(map[string]interface{})["enabled"] = true
 			res["patchConfig"] = patchConfig
 		}
+
+		if patchConfig["yum"] != nil {
+			patchConfigYum := patchConfig["yum"].(map[string]interface{})
+			if _, ok := patchConfigYum["minimal"]; !ok {
+				patchConfigYum["minimal"] = false
+			}
+			patchConfig["yum"] = patchConfigYum
+		}
 	}
 
 	return res, nil

google/services/osconfig/resource_os_config_patch_deployment_test.go

@@ -0,0 +1,74 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+// ----------------------------------------------------------------------------
+//
+//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//
+// ----------------------------------------------------------------------------
+//
+//	This code is generated by Magic Modules using the following:
+//
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/osconfig/resource_os_config_patch_deployment_test.go
+//
+//	DO NOT EDIT this file directly. Any changes made to this file will be
+//	overwritten during the next generation cycle.
+//
+// ----------------------------------------------------------------------------
+package osconfig_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+)
+
+func TestAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckOSConfigPatchDeploymentDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic(context),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_os_config_patch_deployment.patch", "patch_config.0.yum.0.minimal", "false"),
+				),
+			},
+			{
+				ResourceName:            "google_os_config_patch_deployment.patch",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"patch_deployment_id"},
+			},
+		},
+	})
+}
+
+func testAccOSConfigPatchDeployment_osConfigPatchDeployment_yum_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_os_config_patch_deployment" "patch" {
+  patch_deployment_id = "tf-test-patch-deploy%{random_suffix}"
+
+  instance_filter {
+    all = true
+  }
+
+  patch_config {
+    yum {
+      minimal = false
+    }
+  }
+
+  one_time_schedule {
+    execute_time = "2999-10-10T10:10:10.045123456Z"
+  }
+}
+`, context)
+}