Merge pull request #192 from intelops/add-new-command

Add new command : pullTemplates

Author: mahendraintelops

.github/workflows/ci.yml

@@ -48,6 +48,7 @@ jobs:
           export GOPATH=$HOME/go
           export GOBIN=$GOPATH/bin
           export PATH=$PATH:$GOPATH:$GOBIN:$HOME/ogc
+          go run main.go pullTemplates --all
           go test -v ./... -race -coverprofile=coverage.out -coverpkg=./... -covermode=atomic
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3

.gitmodules

@@ -9,12 +9,6 @@
 version: 1
 project_name: compage
 
-before:
-  hooks:
-    - go mod tidy
-    - go mod download
-    - git submodule update --init --recursive
-
 builds:
   - env:
       - CGO_ENABLED=0
@@ -87,15 +81,4 @@ nfpms:
       Compage installer package. CLI application to generate code for rest and grpc.
     formats:
       - rpm
-      - deb
-
-#blobs:
-#  - extra_files:
-#    # Include specific files or directories from submodules
-#    - templates/compage-template-go/**
-#    - templates/compage-template-java/**
-#    - templates/compage-template-javascript/**
-#    - templates/compage-template-python/**
-#    - templates/compage-template-typescript/**
-#    - templates/compage-template-rust/**
-#    - templates/compage-template-ruby/**
+      - deb

.goreleaser.yaml

@@ -60,7 +60,6 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
 COPY --from=builder /app /
-COPY templates /app/templates
 
 # test if the below command avoids loading the files later.
 RUN go version

Dockerfile

@@ -18,7 +18,8 @@ var generateCmd = &cobra.Command{
 
 Change the file as per your needs and then run the compage generate command to generate the code.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		GenerateCode()
+		err := GenerateCode()
+		cobra.CheckErr(err)
 	},
 }
 
@@ -29,10 +30,10 @@ func init() {
 		log.Errorf("error while getting the current directory [" + err.Error() + "]")
 		return
 	}
-	// set the project folder environment variable, if this is set, then the project will be generated in this folder
-	err = os.Setenv("COMPAGE_GENERATED_PROJECT_FOLDER", wD)
+	// set the project directory environment variable, if this is set, then the project will be generated in this folder
+	err = os.Setenv("COMPAGE_GENERATED_PROJECT_DIRECTORY", wD)
 	if err != nil {
-		log.Errorf("error while setting the project folder [" + err.Error() + "]")
+		log.Errorf("error while setting the project directory [" + err.Error() + "]")
 		return
 	}
 	// Here you will define your flags and configuration settings.
@@ -46,7 +47,7 @@ func init() {
 	// generateCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
 
-func GenerateCode() {
+func GenerateCode() error {
 	// Read the file from the current directory and convert it to project
 	project, err := models.ReadConfigYAMLFile("config.yaml")
 	cobra.CheckErr(err)
@@ -55,14 +56,32 @@ func GenerateCode() {
 	coreProject, err := cmd.GetProject(project)
 	if err != nil {
 		log.Errorf("error while converting request to project [" + err.Error() + "]")
-		return
+		return err
+	}
+
+	// pull all required templates
+	// pull the common templates
+	err = CloneOrPullRepository("common")
+	if err != nil {
+		log.Errorf("error while pulling the common templates [" + err.Error() + "]")
+		return err
+	}
+	for _, node := range coreProject.CompageJSON.Nodes {
+		// make sure that the latest template is pulled
+		err = CloneOrPullRepository(node.Language)
+		if err != nil {
+			log.Errorf("error while pulling the template [" + err.Error() + "]")
+			return err
+		}
+		log.Debugf("template pulled successfully for language %s", node.Language)
 	}
 
 	// triggers project generation, process the request
 	err0 := handlers.Handle(coreProject)
 	if err0 != nil {
 		log.Errorf("error while generating the project [" + err0.Error() + "]")
-		return
+		return err
 	}
 	log.Infof("project generated successfully at %s", utils.GetProjectDirectoryName(project.Name))
+	return nil
 }

cmd/generate.go

@@ -0,0 +1,100 @@
+package cmd
+
+import (
+	"errors"
+	"github.com/go-git/go-git/v5"
+	"github.com/intelops/compage/internal/utils"
+	log "github.com/sirupsen/logrus"
+	"os"
+)
+
+func CloneOrPullRepository(language string) error {
+	repoURL, repositoryPath, err := getRepositoryURLByLanguage(language)
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	if repoURL == "" || repositoryPath == "" {
+		log.Errorf("language %s not supported", language)
+		return errors.New("language not supported")
+	}
+
+	exists, err := utils.DirectoryExists(repositoryPath)
+	if err != nil {
+		log.Errorf("error checking directory existence: %v", err)
+		return err
+	}
+	if exists {
+		log.Debugf("directory %s exists.\n", repositoryPath)
+		return pullExistingRepository(repositoryPath)
+	}
+	log.Debugf("directory %s does not exist.\n", repositoryPath)
+	log.Infof("cloning repository %s into %s\n", repoURL, repositoryPath)
+	return cloneNewRepository(repoURL, repositoryPath)
+}
+
+func getRepositoryURLByLanguage(language string) (string, string, error) {
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", "", err
+	}
+	repositoryPath := userHomeDir + "/.compage/templates/compage-template-" + language
+	repositoryURL := "https://github.com/intelops/compage-template-" + language + ".git"
+	if language == "common" {
+		repositoryPath = userHomeDir + "/.compage/templates/common-templates"
+		return "https://github.com/intelops/common-templates.git", repositoryPath, nil
+	}
+	return repositoryURL, repositoryPath, nil
+}
+
+func cloneNewRepository(repoURL string, cloneDir string) error {
+	_, err := git.PlainClone(cloneDir, false, &git.CloneOptions{
+		URL:      repoURL,
+		Progress: os.Stdout,
+	})
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	log.Infof("repository[%s] cloned successfully.", repoURL)
+	return nil
+}
+
+func pullExistingRepository(existingRepositoryPath string) error {
+	r, err := git.PlainOpen(existingRepositoryPath)
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	// Get the working directory for the repository
+	w, err := r.Worktree()
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	// Pull the latest changes from the origin remote and merge into the current branch
+	log.Info("git pull origin")
+	err = w.Pull(&git.PullOptions{RemoteName: "origin"})
+	if err != nil {
+		if errors.Is(err, git.NoErrAlreadyUpToDate) {
+			// This is a special error that means we don't have any new changes
+			log.Info(err)
+			return nil
+		}
+		log.Errorf("error:%v", err)
+		return err
+	}
+	// Print the latest commit that was just pulled
+	ref, err := r.Head()
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	commit, err := r.CommitObject(ref.Hash())
+	if err != nil {
+		log.Errorf("error:%v", err)
+		return err
+	}
+	log.Info(commit)
+	return nil
+}

cmd/git-utils.go

@@ -25,36 +25,45 @@ var initCmd = &cobra.Command{
 
 You can change the file as per your needs and then run the compage generate command to generate the code.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		createOrUpdateDefaultConfigFile()
+		err := createOrUpdateDefaultConfigFile()
+		cobra.CheckErr(err)
 	},
 }
 
-func createOrUpdateDefaultConfigFile() {
+func createOrUpdateDefaultConfigFile() error {
 	// create default config file
 	configFilePath := "config.yaml"
 	_, err := os.Stat(configFilePath)
 	if err == nil {
 		log.Warnf("config file already exists at %s", configFilePath)
 		if !overwriteConfigFile {
 			log.Infof("skipping config file creation")
-			return
+			return err
 		}
 		log.Infof("overwriting the config file")
 		err = os.Remove(configFilePath)
 		if err != nil {
-			log.Warnf("error while removing the config file %s", err)
+			log.Errorf("error while removing the config file %s", err)
 			cobra.CheckErr(err)
 		}
 	}
 
 	_, err = os.Create(configFilePath)
-	cobra.CheckErr(err)
+	if err != nil {
+		log.Errorf("error while creating the config file %s", err)
+		return err
+	}
 	contentData, err := Content.ReadFile("config.yaml.tmpl")
-	cobra.CheckErr(err)
+	if err != nil {
+		log.Errorf("error while reading the config file %s", err)
+		return err
+	}
 	// copy the default config file and use go template to replace the values
 	err = os.WriteFile(configFilePath, contentData, 0644)
-	cobra.CheckErr(err)
-
+	if err != nil {
+		log.Errorf("error while creating the config file %s", err)
+		return err
+	}
 	var filePaths []*string
 	filePaths = append(filePaths, &configFilePath)
 	data := make(map[string]interface{})
@@ -78,8 +87,12 @@ func createOrUpdateDefaultConfigFile() {
 		data["IsRestServer"] = true
 	}
 	err = executor.Execute(filePaths, data)
-	cobra.CheckErr(err)
+	if err != nil {
+		log.Errorf("error while creating the config file %s", err)
+		return err
+	}
 	log.Infof("config file created at %s", configFilePath)
+	return nil
 }
 
 func init() {

cmd/init.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 	"os"
 )
@@ -31,12 +32,14 @@ type Project struct {
 func ReadConfigYAMLFile(configFile string) (*Project, error) {
 	data, err := os.ReadFile(configFile)
 	if err != nil {
+		log.Errorf("error reading config file: %v", err)
 		return nil, err
 	}
 
 	var project Project
 	// Unmarshal YAML data into the provided struct
 	if err := yaml.Unmarshal(data, &project); err != nil {
+		log.Errorf("error unmarshalling YAML data: %v", err)
 		return nil, err
 	}