From 7a20d68df693af11daf2aae5ad6a4febc17acb12 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Fri, 15 Nov 2024 15:11:29 +0000 Subject: [PATCH] Enable more tests (#685) Enable the l2-map-keys, l2-failed-create-continue-on-error, and l2-invoke-dependencies tests. Not sure what fixed these but they seem to run fine now. --- cmd/pulumi-language-yaml/language_test.go | 3 - .../Main.yaml | 28 ++++ .../Pulumi.yaml | 2 + .../sdks/fail_on_create.yaml | 3 + .../sdks/simple.yaml | 3 + .../projects/l2-invoke-dependencies/Main.yaml | 17 +++ .../l2-invoke-dependencies/Pulumi.yaml | 2 + .../sdks/simple-invoke.yaml | 3 + .../l2-invoke-dependencies/sdks/simple.yaml | 3 + .../testdata/projects/l2-map-keys/Main.yaml | 128 ++++++++++++++++++ .../testdata/projects/l2-map-keys/Pulumi.yaml | 2 + .../projects/l2-map-keys/sdks/plain.yaml | 3 + .../l2-map-keys/sdks/primitive-ref.yaml | 3 + .../projects/l2-map-keys/sdks/primitive.yaml | 3 + .../projects/l2-map-keys/sdks/ref-ref.yaml | 3 + .../fail_on_create-4.0.0.yaml | 3 + 16 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Main.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Pulumi.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/fail_on_create.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/simple.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Main.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Pulumi.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple-invoke.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Main.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Pulumi.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/plain.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive-ref.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/ref-ref.yaml create mode 100644 cmd/pulumi-language-yaml/testdata/sdks/fail_on_create-4.0.0/fail_on_create-4.0.0.yaml diff --git a/cmd/pulumi-language-yaml/language_test.go b/cmd/pulumi-language-yaml/language_test.go index 2076bc3a..b41e71c4 100644 --- a/cmd/pulumi-language-yaml/language_test.go +++ b/cmd/pulumi-language-yaml/language_test.go @@ -174,11 +174,8 @@ func runTestingHost(t *testing.T) (string, testingrpc.LanguageTestClient) { var expectedFailures = map[string]string{ "l1-stack-reference": "YAML does not support fn::getOutput", "l2-invoke-options": "cannot assign expression", - "l2-map-keys": "missing expected dependency primitive", "l2-provider-grpc-config-schema-secret": "Detected a secret leak in state", "l2-parameterized-resource": "could not load schema for subpackage, provider not known", - "l2-failed-create-continue-on-error": "missing expected dependency fail_on_create", - "l2-invoke-dependencies": "missing expected dependency simple-invoke", "l2-resource-asset-archive": "Argument must be a constant or contained in the project dir", } diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Main.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Main.yaml new file mode 100644 index 00000000..890bf649 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Main.yaml @@ -0,0 +1,28 @@ +resources: + failing: + type: fail_on_create:Resource + properties: + value: false + dependent: + type: simple:Resource + properties: + value: true + options: + dependson: + - ${failing} + dependent_on_output: + type: simple:Resource + properties: + value: ${failing.value} + independent: + type: simple:Resource + properties: + value: true + double_dependency: + type: simple:Resource + properties: + value: true + options: + dependson: + - ${independent} + - ${dependent_on_output} diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Pulumi.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Pulumi.yaml new file mode 100644 index 00000000..80153e8e --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/Pulumi.yaml @@ -0,0 +1,2 @@ +name: l2-failed-create-continue-on-error +runtime: yaml diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/fail_on_create.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/fail_on_create.yaml new file mode 100644 index 00000000..a74d51f1 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/fail_on_create.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: fail_on_create +version: 4.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/simple.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/simple.yaml new file mode 100644 index 00000000..f357f94b --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-failed-create-continue-on-error/sdks/simple.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: simple +version: 2.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Main.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Main.yaml new file mode 100644 index 00000000..cbd5ce40 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Main.yaml @@ -0,0 +1,17 @@ +resources: + first: + type: simple:Resource + properties: + value: false + # assert that resource second depends on resource first + # // because it uses .secret from the invoke which depends on first + second: + type: simple:Resource + properties: + value: + fn::invoke: + Function: simple-invoke:secretInvoke + Arguments: + value: hello + secretResponse: ${first.value} + Return: secret diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Pulumi.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Pulumi.yaml new file mode 100644 index 00000000..e79c13fc --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/Pulumi.yaml @@ -0,0 +1,2 @@ +name: l2-invoke-dependencies +runtime: yaml diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple-invoke.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple-invoke.yaml new file mode 100644 index 00000000..edbd5f88 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple-invoke.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: simple-invoke +version: 10.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple.yaml new file mode 100644 index 00000000..f357f94b --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-invoke-dependencies/sdks/simple.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: simple +version: 2.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Main.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Main.yaml new file mode 100644 index 00000000..df4e5f47 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Main.yaml @@ -0,0 +1,128 @@ +resources: + prim: + type: primitive:Resource + properties: + boolean: false + float: 2.17 + integer: -12 + string: Goodbye + numberArray: + - 0 + - 1 + booleanMap: + my key: false + my.key: true + my-key: false + my_key: true + MY_KEY: false + myKey: true + ref: + type: primitive-ref:Resource + properties: + data: + boolean: false + float: 2.17 + integer: -12 + string: Goodbye + boolArray: + - false + - true + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + rref: + type: ref-ref:Resource + properties: + data: + innerData: + boolean: false + float: -2.17 + integer: 123 + string: Goodbye + boolArray: [] + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + boolean: true + float: 4.5 + integer: 1024 + string: Hello + boolArray: [] + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + plains: + type: plain:Resource + properties: + data: + innerData: + boolean: false + float: 2.17 + integer: -12 + string: Goodbye + boolArray: + - false + - true + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + boolean: true + float: 4.5 + integer: 1024 + string: Hello + boolArray: + - true + - false + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + nonPlainData: + innerData: + boolean: false + float: 2.17 + integer: -12 + string: Goodbye + boolArray: + - false + - true + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six + boolean: true + float: 4.5 + integer: 1024 + string: Hello + boolArray: + - true + - false + stringMap: + my key: one + my.key: two + my-key: three + my_key: four + MY_KEY: five + myKey: six diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Pulumi.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Pulumi.yaml new file mode 100644 index 00000000..0b24b648 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/Pulumi.yaml @@ -0,0 +1,2 @@ +name: l2-map-keys +runtime: yaml diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/plain.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/plain.yaml new file mode 100644 index 00000000..651813bc --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/plain.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: plain +version: 13.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive-ref.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive-ref.yaml new file mode 100644 index 00000000..e151bfd5 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive-ref.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: primitive-ref +version: 11.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive.yaml new file mode 100644 index 00000000..21416cf2 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/primitive.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: primitive +version: 7.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/ref-ref.yaml b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/ref-ref.yaml new file mode 100644 index 00000000..a5f71028 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/projects/l2-map-keys/sdks/ref-ref.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: ref-ref +version: 12.0.0 diff --git a/cmd/pulumi-language-yaml/testdata/sdks/fail_on_create-4.0.0/fail_on_create-4.0.0.yaml b/cmd/pulumi-language-yaml/testdata/sdks/fail_on_create-4.0.0/fail_on_create-4.0.0.yaml new file mode 100644 index 00000000..a74d51f1 --- /dev/null +++ b/cmd/pulumi-language-yaml/testdata/sdks/fail_on_create-4.0.0/fail_on_create-4.0.0.yaml @@ -0,0 +1,3 @@ +packageDeclarationVersion: 1 +name: fail_on_create +version: 4.0.0