Merge pull request #190 from intelops/change-folder-for-generated-pro…

…ject

enhancement: changed the folder for generated project and fixed the g…

.github/workflows/release.yml

@@ -4,7 +4,10 @@ on:
     tags:
       - "v*.*.*"
 permissions:
-  contents: write
+  contents: write # needed to write releases
+  id-token: write # needed for keyless signing
+  packages: write # needed for ghcr access
+
 jobs:
   push_to_registry:
     name: Build and push Docker image github container registry.

README.md

@@ -134,10 +134,10 @@ git clone https://github.com/intelops/compage.git
 cd compage
 go build -o compage .
 ## initialize the config.yaml file
-./compage init
+./compage init --serverType grpc
 ## edit the config.yaml file as per your requirement
 ## generate the code. Below command accepts serverType [rest, grpc and rest-grpc] 
-./compage generate grpc
+./compage generate
 ```
 
 ## Contributing

cmd/generate.go

@@ -7,6 +7,7 @@ import (
 	"github.com/intelops/compage/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"os"
 )
 
 // generateCmd represents the generate command
@@ -23,7 +24,17 @@ Change the file as per your needs and then run the compage generate command to g
 
 func init() {
 	rootCmd.AddCommand(generateCmd)
-
+	wD, err := os.Getwd()
+	if err != nil {
+		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)
+	if err != nil {
+		log.Errorf("error while setting the project folder [" + err.Error() + "]")
+		return
+	}
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

cmd/init.go

@@ -39,6 +39,7 @@ func createOrUpdateDefaultConfigFile() {
 			log.Infof("skipping config file creation")
 			return
 		}
+		log.Infof("overwriting the config file")
 		err = os.Remove(configFilePath)
 		if err != nil {
 			log.Warnf("error while removing the config file %s", err)

internal/utils/fileUtils.go

@@ -11,6 +11,11 @@ import (
 
 // GetProjectDirectoryName returns tarFile parent path
 func GetProjectDirectoryName(name string) string {
+	projectDirectoryName := os.Getenv("COMPAGE_GENERATED_PROJECT_FOLDER")
+	if projectDirectoryName != "" {
+		return projectDirectoryName + "/" + name
+	}
+
 	userHomeDir, err := os.UserHomeDir()
 	if err != nil {
 		log.Debugf("Error getting user home directory: %s", err)