Merge pull request #6263 from devtron-labs/main-nil-check-manifest

prkhrkat · web-flow · commit 3d1946694c9c · 2025-01-08T12:54:14.000+05:30
misc: nil check in envOverride.chart
diff --git a/pkg/deployment/manifest/ManifestCreationService.go b/pkg/deployment/manifest/ManifestCreationService.go
@@ -473,7 +473,9 @@ func (impl *ManifestCreationServiceImpl) getEnvOverrideForLastSavedConfigTrigger
 				return nil, err
 			}
 		}
-		envOverride.Chart = chart
+		if envOverride != nil {
+			envOverride.Chart = chart
+		}
 	} else if envOverride.Id > 0 && !envOverride.IsOverride {
 		_, span = otel.Tracer("orchestrator").Start(ctx, "chartRepository.FindLatestChartForAppByAppId")
 		chart, err = impl.chartRepository.FindLatestChartForAppByAppId(overrideRequest.AppId)

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,9 @@ func (impl *ManifestCreationServiceImpl) getEnvOverrideForLastSavedConfigTrigger`
`473`	`473`	`return nil, err`
`474`	`474`	`}`
`475`	`475`	`}`
`476`		`- envOverride.Chart = chart`
	`476`	`+ if envOverride != nil {`
	`477`	`+ envOverride.Chart = chart`
	`478`	`+ }`
`477`	`479`	`} else if envOverride.Id > 0 && !envOverride.IsOverride {`
`478`	`480`	`_, span = otel.Tracer("orchestrator").Start(ctx, "chartRepository.FindLatestChartForAppByAppId")`
`479`	`481`	`chart, err = impl.chartRepository.FindLatestChartForAppByAppId(overrideRequest.AppId)`