Merge pull request #218 from intelops/revert-217-main

Revert "feat: added swagger feature to compage for go-gin-server framework"

internal/languages/golang/frameworks/go-gin-server/copier.go

@@ -42,9 +42,6 @@ const SQLServiceFile = "sqls-service.go.tmpl"
 const MySQLDaoFile = "mysql-dao.go.tmpl"
 const SQLModelFile = "sqls-model.go.tmpl"
 
-// common file for common utility functions in controllers 
-const ControllersCommonFile = "common.go.tmpl"
-
 const DaoFile = "dao.go.tmpl"
 const SQLiteDaoFile = "sqlite-dao.go.tmpl"
 const MySQLDBConfigFile = "mysql.go.tmpl"
@@ -475,15 +472,6 @@ func (c *Copier) copyNoSQLDBResourceFiles(resourceName string, filePaths []*stri
 	}
 	filePaths = append(filePaths, &targetResourceControllerFileName)
 
-	// copy controller common file to a generated project
-	targetResourceControllerCommonFileName := c.NodeDirectoryName + ControllersPath + "/" + ControllersCommonFile
-	_, err = utils.CopyFile(targetResourceControllerCommonFileName, c.TemplatesRootPath+ControllersPath+"/"+ControllersCommonFile)
-	if err != nil {
-		log.Debugf("error copying controller utils file: %v", err)
-		return nil, err
-	}
-	filePaths = append(filePaths, &targetResourceControllerCommonFileName)
-
 	// copy model files to a generated project
 	targetResourceModelFileName := c.NodeDirectoryName + ModelsPath + "/" + resourceName + "-" + strings.Replace(NoSQLModelFile, "nosqls-", "", 1)
 	_, err = utils.CopyFile(targetResourceModelFileName, c.TemplatesRootPath+ModelsPath+"/"+NoSQLModelFile)
@@ -527,15 +515,6 @@ func (c *Copier) copySQLDBResourceFiles(resourceName string, filePaths []*string
 	}
 	filePaths = append(filePaths, &targetResourceControllerFileName)
 
-	// copy controller common file to a generated project
-	targetResourceControllerCommonFileName := c.NodeDirectoryName + ControllersPath + "/" + ControllersCommonFile
-	_, err = utils.CopyFile(targetResourceControllerCommonFileName, c.TemplatesRootPath+ControllersPath+"/"+ControllersCommonFile)
-	if err != nil {
-		log.Debugf("error copying controller utils file: %v", err)
-		return nil, err
-	}
-	filePaths = append(filePaths, &targetResourceControllerCommonFileName)
-
 	// copy service files to a generated project
 	targetResourceServiceFileName := c.NodeDirectoryName + ServicesPath + "/" + resourceName + "-" + strings.Replace(SQLServiceFile, "sqls-", "", 1)
 	_, err = utils.CopyFile(targetResourceServiceFileName, c.TemplatesRootPath+ServicesPath+"/"+SQLServiceFile)

internal/languages/golang/generator.go

@@ -60,13 +60,6 @@ func Generate(ctx context.Context) error {
 		return err
 	}
 
-	// RunSwag runs the swag command to generate the swagger documentation
-	err = RunSwag(goValues.Values.NodeDirectoryName)
-	if err != nil {
-		log.Errorf("err : %s", err)
-		return err
-	}
-
 	return nil
 }
 

internal/languages/golang/make-proto-runner.go

@@ -40,3 +40,9 @@ func RunMakeProto(directoryName string) error {
 	}
 	return fmt.Errorf("%s command doesn't exist", protocCommand)
 }
+
+// as util
+func commandExists(cmd string) bool {
+	_, err := exec.LookPath(cmd)
+	return err == nil
+}