Fix the yaml panic (#421)

Fixes #418
pulumi · Oct 7, 2024 · a396a31 · a396a31
1 parent cdc7852
commit a396a31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -2,4 +2,6 @@
 
 ### Bug Fixes
 
+- Fix panic in environment definition [#418](https://github.com/pulumi/pulumi-pulumiservice/issues/418)
+
 ### Miscellaneous
diff --git a/provider/pkg/provider/environment.go b/provider/pkg/provider/environment.go
@@ -238,15 +238,20 @@ func (st *PulumiServiceEnvironmentResource) Check(req *pulumirpc.CheckRequest) (
 		}
 	}
 
-	yamlBytes := []byte{}
-	if !inputMap["yaml"].IsComputed() {
-		yamlBytes, err = getBytesFromAsset(inputMap["yaml"].AssetValue())
-		if err != nil {
-			return nil, err
+	var stringYaml string
+	inputYaml := inputMap["yaml"]
+	if !inputYaml.IsComputed() {
+		if inputYaml.IsAsset() {
+			yamlBytes, err := getBytesFromAsset(inputYaml.AssetValue())
+			if err != nil {
+				return nil, err
+			}
+			stringYaml = string(yamlBytes)
+		} else {
+			stringYaml = inputYaml.StringValue()
 		}
 	}
 
-	stringYaml := string(yamlBytes)
 	trimmedYaml := strings.TrimSpace(stringYaml)
 	inputMap["yaml"] = resource.MakeSecret(resource.NewStringProperty(trimmedYaml))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@

		### Bug Fixes

		- Fix panic in environment definition [#418](https://github.com/pulumi/pulumi-pulumiservice/issues/418)

		### Miscellaneous