diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go index ef86b4a6..92d4b8fc 100644 --- a/google/resource_container_node_pool_test.go +++ b/google/resource_container_node_pool_test.go @@ -24,9 +24,10 @@ func TestAccContainerNodePool_basic(t *testing.T) { Config: testAccContainerNodePool_basic(cluster, np), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -49,7 +50,7 @@ func TestAccContainerNodePool_namePrefix(t *testing.T) { ResourceName: "google_container_node_pool.np", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name_prefix"}, + ImportStateVerifyIgnore: []string{"name_prefix", "max_pods_per_node"}, }, }, }) @@ -69,9 +70,10 @@ func TestAccContainerNodePool_noName(t *testing.T) { Config: testAccContainerNodePool_noName(cluster), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -108,7 +110,7 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#"}, + ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, }, }, }) @@ -126,9 +128,10 @@ func TestAccContainerNodePool_withGPU(t *testing.T) { Config: testAccContainerNodePool_withGPU(), }, { - ResourceName: "google_container_node_pool.np_with_gpu", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np_with_gpu", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -162,9 +165,10 @@ func TestAccContainerNodePool_withManagement(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np_with_management", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np_with_management", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_withManagement(cluster, nodePool, management), @@ -178,9 +182,10 @@ func TestAccContainerNodePool_withManagement(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np_with_management", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np_with_management", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -198,9 +203,10 @@ func TestAccContainerNodePool_withNodeConfigScopeAlias(t *testing.T) { Config: testAccContainerNodePool_withNodeConfigScopeAlias(), }, { - ResourceName: "google_container_node_pool.np_with_node_config_scope_alias", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np_with_node_config_scope_alias", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -226,9 +232,10 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_updateAutoscaling(cluster, np), @@ -238,9 +245,10 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_basic(cluster, np), @@ -255,7 +263,7 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#"}, + ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, }, }, }) @@ -280,9 +288,10 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_updateAutoscaling(cluster, np), @@ -292,9 +301,10 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_basic(cluster, np), @@ -309,7 +319,7 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { ImportStateVerify: true, // autoscaling.# = 0 is equivalent to no autoscaling at all, // but will still cause an import diff - ImportStateVerifyIgnore: []string{"autoscaling.#"}, + ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"}, }, }, }) @@ -333,9 +343,10 @@ func TestAccContainerNodePool_resize(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_resize(cluster, np), @@ -344,9 +355,10 @@ func TestAccContainerNodePool_resize(t *testing.T) { ), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, }) @@ -367,25 +379,28 @@ func TestAccContainerNodePool_version(t *testing.T) { Config: testAccContainerNodePool_version(cluster, np), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_updateVersion(cluster, np), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, { Config: testAccContainerNodePool_version(cluster, np), }, { - ResourceName: "google_container_node_pool.np", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_container_node_pool.np", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"max_pods_per_node"}, }, }, })