feat: added changes to read templates from version folder

mahendraintelops · mahendraintelops · commit 288fbda8ef47 · 2024-03-17T19:02:03.000+05:30
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
       "mode": "debug",
       "program": "${workspaceRoot}/main.go",
       "cwd": "${workspaceRoot}",
-      "args": ["init", "--language","dotnet"]
+      "args": ["pullTemplates"]
     }
   ]
 }
diff --git a/internal/converter/cmd/converter.go b/internal/converter/cmd/converter.go
@@ -20,6 +20,7 @@ func GetProject(input *models.Project) (*core.Project, error) {
 	return &core.Project{
 		CompageJSON:         compageJSON,
 		Name:                input.Name,
+		Version:             input.Version,
 		GitPlatformName:     input.GitDetails.Platform.Name,
 		GitPlatformURL:      input.GitDetails.Platform.URL,
 		GitPlatformUserName: input.GitDetails.Platform.UserName,
diff --git a/internal/converter/grpc/converter.go b/internal/converter/grpc/converter.go
@@ -17,8 +17,10 @@ func GetProject(input *project.GenerateCodeRequest) (*core.Project, error) {
 	}
 
 	return &core.Project{
-		CompageJSON:         compageJSON,
-		Name:                input.ProjectName,
+		CompageJSON: compageJSON,
+		Name:        input.ProjectName,
+		// latest is the tag for every ui based request
+		Version:             "latest",
 		GitRepositoryName:   input.GitRepositoryName,
 		GitPlatformUserName: input.GitPlatformUserName,
 		GitPlatformURL:      input.GitPlatformURL,
diff --git a/internal/core/models.go b/internal/core/models.go
@@ -18,6 +18,7 @@ type ModificationDetails struct {
 // It has a single compage.json and can have multiple nodes and edges (projects and connections) internally.
 type Project struct {
 	Name                string                 `json:"name"`
+	Version             string                 `json:"version"`
 	CompageJSON         *CompageJSON           `json:"compageJSON"`
 	GitRepositoryName   string                 `json:"gitRepositoryName"`
 	GitRepositoryURL    string                 `json:"gitRepositoryURL"`
diff --git a/internal/integrations/deepsource/copier.go b/internal/integrations/deepsource/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates")
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/integrations/license/copier.go b/internal/integrations/license/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates")
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/integrations/readme/copier.go b/internal/integrations/readme/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates")
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/languages/context.go b/internal/languages/context.go
@@ -29,6 +29,7 @@ const (
 type Values struct {
 	TemplateVars      map[TemplateVarKey]string
 	ProjectName       string
+	Version           string
 	NodeDirectoryName string
 	LanguageNode      *LanguageNode
 }
@@ -55,6 +56,7 @@ func AddValuesToContext(ctx context.Context, project *core.Project, languageNode
 		},
 		NodeDirectoryName: nodeDirectoryName,
 		ProjectName:       project.Name,
+		Version:           project.Version,
 		LanguageNode:      languageNode,
 	}
 
diff --git a/internal/languages/dotnet/generator.go b/internal/languages/dotnet/generator.go
@@ -65,7 +65,7 @@ func generateRESTConfig(_ context.Context, dotNetValues *DotNetValues) error {
 }
 
 func getDotNetCleanArchitectureCopier(dotNetValues *DotNetValues) (*dotnetcleanarchitecture.Copier, error) {
-	dotNetTemplatesRootPath := GetDotNetTemplatesRootPath()
+	dotNetTemplatesRootPath := GetDotNetTemplatesRootPath(dotNetValues.Values.Version)
 	if dotNetTemplatesRootPath == "" {
 		return nil, errors.New("dotnet templates root path is empty")
 	}
@@ -138,7 +138,7 @@ func generateIntegrationConfig(dotNetValues *DotNetValues) error {
 }
 
 func getIntegrationsCopier(dotNetValues *DotNetValues) (map[string]interface{}, error) {
-	dotNetTemplatesRootPath := GetDotNetTemplatesRootPath()
+	dotNetTemplatesRootPath := GetDotNetTemplatesRootPath(dotNetValues.Values.Version)
 	if dotNetTemplatesRootPath == "" {
 		return nil, errors.New("dotnet templates root path is empty")
 	}
diff --git a/internal/languages/dotnet/models.go b/internal/languages/dotnet/models.go
@@ -38,8 +38,8 @@ func (n *LDotNetLangNode) FillDefaults() error {
 	return nil
 }
 
-func GetDotNetTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetDotNetTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/golang/generator.go b/internal/languages/golang/generator.go
@@ -205,7 +205,7 @@ func generateRESTConfig(ctx context.Context, goValues *GoValues) error {
 }
 
 func getCommonFilesCopier(goValues GoValues) (*commonfiles.Copier, error) {
-	goTemplatesRootPath := GetGoTemplatesRootPath()
+	goTemplatesRootPath := GetGoTemplatesRootPath(goValues.Values.Version)
 	if goTemplatesRootPath == "" {
 		return nil, errors.New("go templates root path is empty")
 	}
@@ -275,7 +275,7 @@ func getCommonFilesCopier(goValues GoValues) (*commonfiles.Copier, error) {
 }
 
 func getGoGrpcServerCopier(goValues *GoValues) (*gogrpcserver.Copier, error) {
-	goTemplatesRootPath := GetGoTemplatesRootPath()
+	goTemplatesRootPath := GetGoTemplatesRootPath(goValues.Values.Version)
 	if goTemplatesRootPath == "" {
 		return nil, errors.New("go templates root path is empty")
 	}
@@ -317,7 +317,7 @@ func getGoGrpcServerCopier(goValues *GoValues) (*gogrpcserver.Copier, error) {
 }
 
 func getGoGinServerCopier(goValues *GoValues) (*goginserver.Copier, error) {
-	goTemplatesRootPath := GetGoTemplatesRootPath()
+	goTemplatesRootPath := GetGoTemplatesRootPath(goValues.Values.Version)
 	if goTemplatesRootPath == "" {
 		return nil, errors.New("go templates root path is empty")
 	}
@@ -359,7 +359,7 @@ func getGoGinServerCopier(goValues *GoValues) (*goginserver.Copier, error) {
 }
 
 func getIntegrationsCopier(goValues *GoValues) (map[string]interface{}, error) {
-	goTemplatesRootPath := GetGoTemplatesRootPath()
+	goTemplatesRootPath := GetGoTemplatesRootPath(goValues.Values.Version)
 	if goTemplatesRootPath == "" {
 		return nil, errors.New("go templates root path is empty")
 	}
diff --git a/internal/languages/golang/models.go b/internal/languages/golang/models.go
@@ -56,8 +56,8 @@ func (n *LGolangNode) FillDefaults() error {
 	return nil
 }
 
-func GetGoTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetGoTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/java/generator.go b/internal/languages/java/generator.go
@@ -73,7 +73,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(javaValues Values) (map[string]interface{}, error) {
-	javaTemplatesRootPath := GetJavaTemplatesRootPath()
+	javaTemplatesRootPath := GetJavaTemplatesRootPath(javaValues.Values.Version)
 	if javaTemplatesRootPath == "" {
 		return nil, errors.New("java templates root path is empty")
 	}
diff --git a/internal/languages/java/models.go b/internal/languages/java/models.go
@@ -26,8 +26,8 @@ func (n *LJavaNode) FillDefaults() error {
 	return nil
 }
 
-func GetJavaTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetJavaTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/javascript/generator.go b/internal/languages/javascript/generator.go
@@ -81,7 +81,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(javascriptValues Values) (map[string]interface{}, error) {
-	javaScriptTemplatesRootPath := GetJavaScriptTemplatesRootPath()
+	javaScriptTemplatesRootPath := GetJavaScriptTemplatesRootPath(javascriptValues.Values.Version)
 	if javaScriptTemplatesRootPath == "" {
 		return nil, errors.New("javascript templates root path is empty")
 	}
diff --git a/internal/languages/javascript/models.go b/internal/languages/javascript/models.go
@@ -19,8 +19,8 @@ func (n *LJavaScriptNode) FillDefaults() error {
 	return nil
 }
 
-func GetJavaScriptTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetJavaScriptTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/python/generator.go b/internal/languages/python/generator.go
@@ -66,7 +66,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(pythonValues Values) (map[string]interface{}, error) {
-	pythonTemplatesRootPath := GetPythonTemplatesRootPath()
+	pythonTemplatesRootPath := GetPythonTemplatesRootPath(pythonValues.Values.Version)
 	if pythonTemplatesRootPath == "" {
 		return nil, errors.New("python templates root path is empty")
 	}
diff --git a/internal/languages/python/models.go b/internal/languages/python/models.go
@@ -19,8 +19,8 @@ func (n *LPythonNode) FillDefaults() error {
 	return nil
 }
 
-func GetPythonTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetPythonTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/ruby/generator.go b/internal/languages/ruby/generator.go
@@ -66,7 +66,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(rubyValues Values) (map[string]interface{}, error) {
-	rubyTemplatesRootPath := GetRubyTemplatesRootPath()
+	rubyTemplatesRootPath := GetRubyTemplatesRootPath(rubyValues.Values.Version)
 	if rubyTemplatesRootPath == "" {
 		return nil, errors.New("ruby templates root path is empty")
 	}
diff --git a/internal/languages/ruby/models.go b/internal/languages/ruby/models.go
@@ -19,8 +19,8 @@ func (n *LRubyNode) FillDefaults() error {
 	return nil
 }
 
-func GetRubyTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetRubyTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/rust/generator.go b/internal/languages/rust/generator.go
@@ -58,7 +58,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(rustValues Values) (map[string]interface{}, error) {
-	rustTemplatesRootPath := GetRustTemplatesRootPath()
+	rustTemplatesRootPath := GetRustTemplatesRootPath(rustValues.Values.Version)
 	if rustTemplatesRootPath == "" {
 		return nil, errors.New("rust templates root path is empty")
 	}
diff --git a/internal/languages/rust/models.go b/internal/languages/rust/models.go
@@ -19,8 +19,8 @@ func (n *LRustNode) FillDefaults() error {
 	return nil
 }
 
-func GetRustTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetRustTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/languages/typescript/generator.go b/internal/languages/typescript/generator.go
@@ -56,7 +56,7 @@ func Generate(ctx context.Context) error {
 }
 
 func getIntegrationsCopier(typescriptValues Values) (map[string]interface{}, error) {
-	typeScriptTemplatesRootPath := GetTypeScriptTemplatesRootPath()
+	typeScriptTemplatesRootPath := GetTypeScriptTemplatesRootPath(typescriptValues.Values.Version)
 	if typeScriptTemplatesRootPath == "" {
 		return nil, errors.New("typescript templates root path is empty")
 	}
diff --git a/internal/languages/typescript/models.go b/internal/languages/typescript/models.go
@@ -19,8 +19,8 @@ func (n *LTypeScriptNode) FillDefaults() error {
 	return nil
 }
 
-func GetTypeScriptTemplatesRootPath() string {
-	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName)
+func GetTypeScriptTemplatesRootPath(version string) string {
+	templatesRootPath, err := utils.GetTemplatesRootPath(TemplateDirectoryName, version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return ""
diff --git a/internal/utils/templatePathUtils.go b/internal/utils/templatePathUtils.go
@@ -16,11 +16,11 @@ func GetBaseTemplateRootPath() (string, error) {
 }
 
 // GetTemplatesRootPath returns a root path of the language template passed.
-func GetTemplatesRootPath(languageTemplateDirectoryName string) (string, error) {
+func GetTemplatesRootPath(languageTemplateDirectoryName, version string) (string, error) {
 	baseTemplateRootPath, err := GetBaseTemplateRootPath()
 	if err != nil {
 		log.Errorf("error while getting the base template root path [" + err.Error() + "]")
 		return "", err
 	}
-	return baseTemplateRootPath + "/" + languageTemplateDirectoryName, nil
+	return baseTemplateRootPath + "/" + languageTemplateDirectoryName + "/" + version, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"mode": "debug",`
`9`	`9`	`"program": "${workspaceRoot}/main.go",`
`10`	`10`	`"cwd": "${workspaceRoot}",`
`11`		`- "args": ["init", "--language","dotnet"]`
	`11`	`+ "args": ["pullTemplates"]`
`12`	`12`	`}`
`13`	`13`	`]`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewCopier(project core.Project) (Copier, error) {`
`26`	`26`	`"GitPlatformUserName": project.GitPlatformUserName,`
`27`	`27`	`}`
`28`	`28`
`29`		`- templatesRootPath, err := utils.GetTemplatesRootPath("common-templates")`
	`29`	`+ templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)`
`30`	`30`	`if err != nil {`
`31`	`31`	`log.Errorf("error while getting the project root path [" + err.Error() + "]")`
`32`	`32`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ const (`
`29`	`29`	`type Values struct {`
`30`	`30`	`TemplateVars map[TemplateVarKey]string`
`31`	`31`	`ProjectName string`
	`32`	`+ Version string`
`32`	`33`	`NodeDirectoryName string`
`33`	`34`	`LanguageNode *LanguageNode`
`34`	`35`	`}`
`@@ -55,6 +56,7 @@ func AddValuesToContext(ctx context.Context, project *core.Project, languageNode`
`55`	`56`	`},`
`56`	`57`	`NodeDirectoryName: nodeDirectoryName,`
`57`	`58`	`ProjectName: project.Name,`
	`59`	`+ Version: project.Version,`
`58`	`60`	`LanguageNode: languageNode,`
`59`	`61`	`}`
`60`	`62`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func generateRESTConfig(_ context.Context, dotNetValues *DotNetValues) error {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func getDotNetCleanArchitectureCopier(dotNetValues DotNetValues) (dotnetcleanarchitecture.Copier, error) {`
`68`		`- dotNetTemplatesRootPath := GetDotNetTemplatesRootPath()`
	`68`	`+ dotNetTemplatesRootPath := GetDotNetTemplatesRootPath(dotNetValues.Values.Version)`
`69`	`69`	`if dotNetTemplatesRootPath == "" {`
`70`	`70`	`return nil, errors.New("dotnet templates root path is empty")`
`71`	`71`	`}`
`@@ -138,7 +138,7 @@ func generateIntegrationConfig(dotNetValues *DotNetValues) error {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`func getIntegrationsCopier(dotNetValues *DotNetValues) (map[string]interface{}, error) {`
`141`		`- dotNetTemplatesRootPath := GetDotNetTemplatesRootPath()`
	`141`	`+ dotNetTemplatesRootPath := GetDotNetTemplatesRootPath(dotNetValues.Values.Version)`
`142`	`142`	`if dotNetTemplatesRootPath == "" {`
`143`	`143`	`return nil, errors.New("dotnet templates root path is empty")`
`144`	`144`	`}`