From d467fd787f05baa80bc5e0edc31e53f036410769 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Wed, 25 Sep 2024 23:11:01 -0700 Subject: [PATCH] adjust scope and function args --- .../services/container/node_config.go.tmpl | 15 ++++----------- .../resource_container_node_pool.go.tmpl | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/mmv1/third_party/terraform/services/container/node_config.go.tmpl b/mmv1/third_party/terraform/services/container/node_config.go.tmpl index 79a34f88892a..f9508b138415 100644 --- a/mmv1/third_party/terraform/services/container/node_config.go.tmpl +++ b/mmv1/third_party/terraform/services/container/node_config.go.tmpl @@ -1990,23 +1990,16 @@ func flattenHostMaintenancePolicy(c *container.HostMaintenancePolicy) []map[stri // This portion of nodePoolUpdate() is moved here to be shared with // node pool updates in `resource_container_cluster` -func nodePoolNodeConfigUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *NodePoolInformation, prefix string, timeout time.Duration) error { - config := meta.(*transport_tpg.Config) - name := d.Get(prefix + "name").(string) +func nodePoolNodeConfigUpdate(d *schema.ResourceData, config *transport_tpg.Config, nodePoolInfo *NodePoolInformation, prefix, name string, timeout time.Duration) error { + + // Nodepool write-lock will be acquired when update function is called. + npLockKey := nodePoolInfo.nodePoolLockKey(name) userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } - // Acquire read-lock on cluster. - clusterLockKey := nodePoolInfo.clusterLockKey() - transport_tpg.MutexStore.RLock(clusterLockKey) - defer transport_tpg.MutexStore.RUnlock(clusterLockKey) - - // Nodepool write-lock will be acquired when update function is called. - npLockKey := nodePoolInfo.nodePoolLockKey(name) - if d.HasChange(prefix + "node_config") { if d.HasChange(prefix + "node_config.0.logging_variant") { diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl index 8d504f89f09c..4b463e56ab3b 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl @@ -1411,7 +1411,7 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *Node } if d.HasChange(prefix + "node_config") { - nodePoolNodeConfigUpdate(d, meta, nodePoolInfo, prefix, timeout) + nodePoolNodeConfigUpdate(d, config, nodePoolInfo, prefix, name, timeout) } if d.HasChange(prefix + "node_count") {