kubernetes_cron_job should not force new (#1212)

* kubernetes_cron_job should not force new

Author: jrhouston

kubernetes/resource_kubernetes_cron_job_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestAccKubernetesCronJob_basic(t *testing.T) {
-	var conf v1beta1.CronJob
+	var conf1, conf2 v1beta1.CronJob
 	name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	imageName := alpineImageVersion
 
@@ -26,7 +26,7 @@ func TestAccKubernetesCronJob_basic(t *testing.T) {
 			{
 				Config: testAccKubernetesCronJobConfig_basic(name, imageName),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckKubernetesCronJobExists("kubernetes_cron_job.test", &conf),
+					testAccCheckKubernetesCronJobExists("kubernetes_cron_job.test", &conf1),
 					resource.TestCheckResourceAttr("kubernetes_cron_job.test", "metadata.0.name", name),
 					resource.TestCheckResourceAttrSet("kubernetes_cron_job.test", "metadata.0.generation"),
 					resource.TestCheckResourceAttrSet("kubernetes_cron_job.test", "metadata.0.resource_version"),
@@ -46,9 +46,9 @@ func TestAccKubernetesCronJob_basic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccKubernetesCronJobConfig_modified(name, imageName),
+				Config: testAccKubernetesCronJobConfig_modified(name, "test"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckKubernetesCronJobExists("kubernetes_cron_job.test", &conf),
+					testAccCheckKubernetesCronJobExists("kubernetes_cron_job.test", &conf2),
 					resource.TestCheckResourceAttr("kubernetes_cron_job.test", "metadata.0.name", name),
 					resource.TestCheckResourceAttrSet("kubernetes_cron_job.test", "metadata.0.generation"),
 					resource.TestCheckResourceAttrSet("kubernetes_cron_job.test", "metadata.0.resource_version"),
@@ -65,6 +65,7 @@ func TestAccKubernetesCronJob_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("kubernetes_cron_job.test", "spec.0.job_template.0.spec.0.template.0.spec.0.container.0.name", "hello"),
 					resource.TestCheckResourceAttr("kubernetes_cron_job.test", "spec.0.job_template.0.spec.0.template.0.metadata.#", "1"),
 					resource.TestCheckResourceAttr("kubernetes_cron_job.test", "spec.0.job_template.0.spec.0.template.0.metadata.0.labels.%", "1"),
+					testAccCheckKubernetesCronJobForceNew(&conf1, &conf2, false),
 				),
 			},
 		},
@@ -293,3 +294,18 @@ func testAccKubernetesCronJobConfig_extraModified(name, imageName string) string
   }
 }`, name, imageName)
 }
+
+func testAccCheckKubernetesCronJobForceNew(old, new *v1beta1.CronJob, wantNew bool) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if wantNew {
+			if old.ObjectMeta.UID != new.ObjectMeta.UID {
+				return fmt.Errorf("Expecting forced replacement")
+			}
+		} else {
+			if old.ObjectMeta.UID != new.ObjectMeta.UID {
+				return fmt.Errorf("Unexpected forced replacement")
+			}
+		}
+		return nil
+	}
+}

kubernetes/resource_kubernetes_job.go

@@ -54,7 +54,7 @@ func resourceKubernetesJobSchemaV1() map[string]*schema.Schema {
 			MaxItems:    1,
 			ForceNew:    false,
 			Elem: &schema.Resource{
-				Schema: jobSpecFields(),
+				Schema: jobSpecFields(false),
 			},
 		},
 		"wait_for_completion": {

kubernetes/schema_cron_job_spec.go

@@ -37,7 +37,7 @@ func cronJobSpecFields() map[string]*schema.Schema {
 						Required:    true,
 						MaxItems:    1,
 						Elem: &schema.Resource{
-							Schema: jobSpecFields(),
+							Schema: jobSpecFields(true),
 						},
 					},
 				},

kubernetes/schema_job_spec.go

@@ -2,8 +2,9 @@ package kubernetes
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func jobMetadataSchema() *schema.Schema {
@@ -13,7 +14,7 @@ func jobMetadataSchema() *schema.Schema {
 	return m
 }
 
-func jobSpecFields() map[string]*schema.Schema {
+func jobSpecFields(specUpdatable bool) map[string]*schema.Schema {
 	podTemplateFields := map[string]*schema.Schema{
 		"metadata": metadataSchema("job", true),
 		"spec": {
@@ -23,7 +24,7 @@ func jobSpecFields() map[string]*schema.Schema {
 			ForceNew:    true,
 			MaxItems:    1,
 			Elem: &schema.Resource{
-				Schema: podSpecFields(false, false),
+				Schema: podSpecFields(specUpdatable, false),
 			},
 		},
 	}