Cloud Composer - handle "empty changes" to recovery_config (#14604) (#23715)

[upstream:8877ca825f28f962c708a61423324d4fdb4eb352]

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

Author: modular-magician

.changelog/14604.txt

@@ -0,0 +1 @@
+unknown: Cloud Composer - handle "empty changes" to recovery_config

google/services/composer/resource_composer_environment.go

@@ -1530,7 +1530,9 @@ func resourceComposerEnvironmentUpdate(d *schema.ResourceData, meta interface{})
 				patchObj.Config.RecoveryConfig = config.RecoveryConfig
 			}
 			err = resourceComposerEnvironmentPatchField("config.RecoveryConfig.ScheduledSnapshotsConfig", userAgent, patchObj, d, tfConfig)
-			if err != nil {
+			// Empty ScheduledSnapshotsConfig and config with scheduled snapshots explicitly disabled (and nothing else configured) represent in fact the same configuration.
+			// If applying a change fails specifically because it does not bring any actual modification, this error should be silently ignored.
+			if err != nil && !strings.Contains(err.Error(), "No change in configuration.") {
 				return err
 			}
 		}