Skip to content

Commit ccfbd20

Browse files
committed
refactor: convert requirements.yaml to JSON before unmarshalling in GitOps operations
1 parent cbd83e5 commit ccfbd20

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

pkg/appStore/installedApp/service/FullMode/deployment/InstalledAppGitOpsService.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
"net/http"
4141
"os"
4242
"path/filepath"
43+
"sigs.k8s.io/yaml"
4344
"strconv"
4445
"strings"
4546
)
@@ -453,7 +454,12 @@ func (impl *FullModeDeploymentServiceImpl) shouldMigrateProxyChartDependencies(p
453454
return false, err
454455
}
455456
dependencies := appStoreBean.Dependencies{}
456-
err = json.Unmarshal(requirementsYamlContent, &dependencies)
457+
requirementsJsonContent, err := yaml.YAMLToJSON(requirementsYamlContent)
458+
if err != nil {
459+
impl.Logger.Errorw("error in converting requirements.yaml to json", "appName", pushChartToGitRequest.AppName, "envName", pushChartToGitRequest.EnvName, "err", err)
460+
return false, err
461+
}
462+
err = json.Unmarshal(requirementsJsonContent, &dependencies)
457463
if err != nil {
458464
impl.Logger.Errorw("error in unmarshalling requirements.yaml file", "appName", pushChartToGitRequest.AppName, "envName", pushChartToGitRequest.EnvName, "err", err)
459465
return false, err

0 commit comments

Comments
 (0)