main sync develop

Author: vikramdevtron

pkg/deployment/manifest/ManifestCreationService.go

@@ -474,7 +474,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)

pkg/variables/parsers/VariableTemplateParser.go

@@ -128,6 +128,10 @@ func (impl *VariableTemplateParserImpl) handlePrimitivesForJson(parserRequest Va
 func (impl *VariableTemplateParserImpl) ExtractVariables(template string, templateType VariableTemplateType) ([]string, error) {
 	var variables []string
 
+	if template == "" {
+		return variables, nil
+	}
+
 	if !impl.variableTemplateParserConfig.ScopedVariableEnabled {
 		return variables, nil
 	}