fix: output not render error

Signed-off-by: Meng JiaFeng <[email protected]>

Author: steinliber

internal/pkg/pluginengine/outputs.go

@@ -14,12 +14,13 @@ import (
 func HandleOutputsReferences(smgr statemanager.Manager, options configmanager.RawOptions) []error {
 	errorsList := make([]error, 0)
 
-	for optionKey, optionValue := range options {
+	for optionKey, optionInterface := range options {
+		switch optionValue := optionInterface.(type) {
 		// only process string values in the options
 		// since all outputs references are strings, not ints, not booleans, not maps
-		if optionValueStr, ok := optionValue.(string); ok {
-			log.Debugf("Before: %s: %s", optionKey, optionValueStr)
-			match, toolName, instanceID, outputReferenceKey := getToolNamePluginOutputKey(optionValueStr)
+		case string:
+			log.Debugf("Before: %s: %s", optionKey, optionValue)
+			match, toolName, instanceID, outputReferenceKey := getToolNamePluginOutputKey(optionValue)
 			// do nothing, if the value string isn't in the format of a valid output reference
 			if !match {
 				continue
@@ -30,18 +31,17 @@ func HandleOutputsReferences(smgr statemanager.Manager, options configmanager.Ra
 				continue
 			}
 			if val, ok := outputs[outputReferenceKey]; ok {
-				options[optionKey] = replaceOutputKeyWithValue(optionValueStr, val.(string))
+				options[optionKey] = replaceOutputKeyWithValue(optionValue, val.(string))
 				log.Debugf("After: %s: %s", optionKey, options[optionKey])
 			} else {
 				errorsList = append(errorsList, fmt.Errorf("can't find Output reference key %s", outputReferenceKey))
 			}
-		}
-
-		// recursive if the value is a map (which means Tool.Option is a nested map)
-		optionValueMap, ok := optionValue.(map[string]interface{})
-		log.Debugf("Got nested map: %v", optionValueMap)
-		if ok {
-			errorsList = append(errorsList, HandleOutputsReferences(smgr, optionValueMap)...)
+		case configmanager.RawOptions:
+			// recursive if the value is a map (which means Tool.Option is a nested map)
+			log.Debugf("Got nested map: %v", optionValue)
+			errorsList = append(errorsList, HandleOutputsReferences(smgr, optionValue)...)
+		default:
+			log.Warnf("option %+v process output can't get valid type", optionInterface)
 		}
 	}
 

internal/pkg/pluginengine/pluginengine_test.go

@@ -218,12 +218,12 @@ var _ = Describe("Pluginengine", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		dependantOptions := configmanager.RawOptions{
-			"outerKey": map[string]interface{}{
+			"outerKey": configmanager.RawOptions{
 				"innerKey": fmt.Sprintf("${{ %s.%s.outputs.boardId }}", trelloName, trelloInstance),
 			},
 		}
 		expectResult := configmanager.RawOptions{
-			"outerKey": map[string]interface{}{
+			"outerKey": configmanager.RawOptions{
 				"innerKey": expectedBoardId,
 			},
 		}

internal/pkg/statemanager/state.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"sort"
 
+	"golang.org/x/exp/maps"
+
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 
 	"gopkg.in/yaml.v3"
@@ -36,8 +38,14 @@ func (rs ResourceStatus) GetOutputs() ResourceOutputs {
 	if !ok {
 		return nil
 	}
-
-	return outputs.(ResourceOutputs)
+	outputStatus, isStatus := outputs.(ResourceStatus)
+	if !isStatus {
+		return outputs.(ResourceOutputs)
+	}
+	// if outputs type is ResourceStatus, transfer this type to ResourceOutputs
+	outputData := ResourceOutputs{}
+	maps.Copy(outputData, outputStatus)
+	return outputData
 }
 
 type StatesMap struct {