Fixes errors and resource cycling issues for aws.batch.JobDefinition

Recent changes in hashicorp/terraform-provider-aws#37111 introduced a Diff customizer that leads to errors in the Pulumi version of the provider due to discrepancies in the order in which Diff customizer functions are applied between Pulumi and Terraform. This change fixes the problem by applying the experimental PlanResourceChange flag to the affected resource. A regression test is included. See also: pulumi/pulumi-terraform-bridge#1785
pulumi · May 2, 2024 · 012851c · 012851c
1 parent 86fbe94
commit 012851c
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 1 deletion.
diff --git a/provider/provider_python_test.go b/provider/provider_python_test.go
@@ -36,6 +36,30 @@ func TestRegress3196(t *testing.T) {
 	})
 }
 
+func TestRegress3887(t *testing.T) {
+	if testing.Short() {
+		t.Skipf("Skipping test in -short mode because it needs cloud credentials")
+		return
+	}
+	test := getPythonBaseOptions(t).
+		With(integration.ProgramTestOptions{
+			Quick:       true,
+			SkipRefresh: true,
+			Dir:         filepath.Join("test-programs", "regress-3887"),
+			EditDirs: []integration.EditDir{
+				{
+					Dir:      filepath.Join("test-programs", "regress-3887", "step-1"),
+					Additive: true,
+				},
+				{
+					Dir:      filepath.Join("test-programs", "regress-3887", "step-2"),
+					Additive: true,
+				},
+			},
+		})
+	integration.ProgramTest(t, &test)
+}
+
 func TestRegress1504(t *testing.T) {
 	if testing.Short() {
 		t.Skipf("Skipping test in -short mode because it needs cloud credentials")

diff --git a/provider/resources.go b/provider/resources.go
@@ -803,7 +803,8 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 			switch s {
 			case "aws_ssm_document",
 				"aws_wafv2_web_acl",
-				"aws_launch_template":
+				"aws_launch_template",
+				"aws_batch_job_definition":
 				return true
 			default:
 				return false

diff --git a/provider/test-programs/regress-3887/Pulumi.yaml b/provider/test-programs/regress-3887/Pulumi.yaml
@@ -0,0 +1,5 @@
+name: regress-3887
+runtime:
+  name: python
+  options:
+    virtualenv: venv
diff --git a/provider/test-programs/regress-3887/__main__.py b/provider/test-programs/regress-3887/__main__.py
@@ -0,0 +1,55 @@
+import json
+import pulumi_aws as aws
+
+test = aws.batch.JobDefinition(
+    "test",
+    name="my_test_batch_job_definition",
+    type="container",
+    container_properties=json.dumps(
+        {
+            "command": [
+                "ls",
+                "-la",
+            ],
+            "image": "busybox",
+            "resourceRequirements": [
+                {
+                    "type": "VCPU",
+                    "value": "1",
+                },
+                {
+                    "type": "MEMORY",
+                    "value": "512",
+                },
+            ],
+            "volumes": [
+                {
+                    "host": {
+                        "sourcePath": "/tmp",
+                    },
+                    "name": "tmp",
+                }
+            ],
+            "environment": [
+                {
+                    "name": "VARNAME",
+                    "value": "VARVAL",
+                }
+            ],
+            "mountPoints": [
+                {
+                    "sourceVolume": "tmp",
+                    "containerPath": "/tmp",
+                    "readOnly": False,
+                }
+            ],
+            "ulimits": [
+                {
+                    "hardLimit": 1024,
+                    "name": "nofile",
+                    "softLimit": 1024,
+                }
+            ],
+        }
+    ),
+)
diff --git a/provider/test-programs/regress-3887/requirements.txt b/provider/test-programs/regress-3887/requirements.txt
@@ -0,0 +1,2 @@
+pulumi>=3.0.0,<4.0.0
+pulumi_aws>=6.0.0,<7.0.0
diff --git a/provider/test-programs/regress-3887/step-1/__main__.py b/provider/test-programs/regress-3887/step-1/__main__.py
@@ -0,0 +1,55 @@
+import json
+import pulumi_aws as aws
+
+test = aws.batch.JobDefinition(
+    "test",
+    name="my_test_batch_job_definition",
+    type="container",
+    container_properties=json.dumps(
+        {
+            "command": [
+                "ls",
+                "-la",
+            ],
+            "image": "busybox",
+            "resourceRequirements": [
+                {
+                    "type": "VCPU",
+                    "value": "2",
+                },
+                {
+                    "type": "MEMORY",
+                    "value": "512",
+                },
+            ],
+            "volumes": [
+                {
+                    "host": {
+                        "sourcePath": "/tmp",
+                    },
+                    "name": "tmp",
+                }
+            ],
+            "environment": [
+                {
+                    "name": "VARNAME",
+                    "value": "VARVAL",
+                }
+            ],
+            "mountPoints": [
+                {
+                    "sourceVolume": "tmp",
+                    "containerPath": "/tmp",
+                    "readOnly": False,
+                }
+            ],
+            "ulimits": [
+                {
+                    "hardLimit": 1024,
+                    "name": "nofile",
+                    "softLimit": 1024,
+                }
+            ],
+        }
+    ),
+)
diff --git a/provider/test-programs/regress-3887/step-2/__main__.py b/provider/test-programs/regress-3887/step-2/__main__.py
@@ -0,0 +1,55 @@
+import json
+import pulumi_aws as aws
+
+test = aws.batch.JobDefinition(
+    "test",
+    name="my_test_batch_job_definition",
+    type="container",
+    container_properties=json.dumps(
+        {
+            "command": [
+                "ls",
+                "-la",
+            ],
+            "image": "busybox",
+            "resourceRequirements": [
+                {
+                    "type": "VCPU",
+                    "value": "3",
+                },
+                {
+                    "type": "MEMORY",
+                    "value": "512",
+                },
+            ],
+            "volumes": [
+                {
+                    "host": {
+                        "sourcePath": "/tmp",
+                    },
+                    "name": "tmp",
+                }
+            ],
+            "environment": [
+                {
+                    "name": "VARNAME",
+                    "value": "VARVAL",
+                }
+            ],
+            "mountPoints": [
+                {
+                    "sourceVolume": "tmp",
+                    "containerPath": "/tmp",
+                    "readOnly": False,
+                }
+            ],
+            "ulimits": [
+                {
+                    "hardLimit": 1024,
+                    "name": "nofile",
+                    "softLimit": 1024,
+                }
+            ],
+        }
+    ),
+)