Skip to content

Commit d33e7df

Browse files
Merge pull request #218 from intelops/revert-217-main
Revert "feat: added swagger feature to compage for go-gin-server framework"
2 parents 5f0b10c + 4d393eb commit d33e7df

File tree

5 files changed

+6
-77
lines changed

5 files changed

+6
-77
lines changed

internal/languages/golang/common.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ const SQLServiceFile = "sqls-service.go.tmpl"
4242
const MySQLDaoFile = "mysql-dao.go.tmpl"
4343
const SQLModelFile = "sqls-model.go.tmpl"
4444

45-
// common file for common utility functions in controllers
46-
const ControllersCommonFile = "common.go.tmpl"
47-
4845
const DaoFile = "dao.go.tmpl"
4946
const SQLiteDaoFile = "sqlite-dao.go.tmpl"
5047
const MySQLDBConfigFile = "mysql.go.tmpl"
@@ -475,15 +472,6 @@ func (c *Copier) copyNoSQLDBResourceFiles(resourceName string, filePaths []*stri
475472
}
476473
filePaths = append(filePaths, &targetResourceControllerFileName)
477474

478-
// copy controller common file to a generated project
479-
targetResourceControllerCommonFileName := c.NodeDirectoryName + ControllersPath + "/" + ControllersCommonFile
480-
_, err = utils.CopyFile(targetResourceControllerCommonFileName, c.TemplatesRootPath+ControllersPath+"/"+ControllersCommonFile)
481-
if err != nil {
482-
log.Debugf("error copying controller utils file: %v", err)
483-
return nil, err
484-
}
485-
filePaths = append(filePaths, &targetResourceControllerCommonFileName)
486-
487475
// copy model files to a generated project
488476
targetResourceModelFileName := c.NodeDirectoryName + ModelsPath + "/" + resourceName + "-" + strings.Replace(NoSQLModelFile, "nosqls-", "", 1)
489477
_, err = utils.CopyFile(targetResourceModelFileName, c.TemplatesRootPath+ModelsPath+"/"+NoSQLModelFile)
@@ -527,15 +515,6 @@ func (c *Copier) copySQLDBResourceFiles(resourceName string, filePaths []*string
527515
}
528516
filePaths = append(filePaths, &targetResourceControllerFileName)
529517

530-
// copy controller common file to a generated project
531-
targetResourceControllerCommonFileName := c.NodeDirectoryName + ControllersPath + "/" + ControllersCommonFile
532-
_, err = utils.CopyFile(targetResourceControllerCommonFileName, c.TemplatesRootPath+ControllersPath+"/"+ControllersCommonFile)
533-
if err != nil {
534-
log.Debugf("error copying controller utils file: %v", err)
535-
return nil, err
536-
}
537-
filePaths = append(filePaths, &targetResourceControllerCommonFileName)
538-
539518
// copy service files to a generated project
540519
targetResourceServiceFileName := c.NodeDirectoryName + ServicesPath + "/" + resourceName + "-" + strings.Replace(SQLServiceFile, "sqls-", "", 1)
541520
_, err = utils.CopyFile(targetResourceServiceFileName, c.TemplatesRootPath+ServicesPath+"/"+SQLServiceFile)

internal/languages/golang/generator.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ func Generate(ctx context.Context) error {
6060
return err
6161
}
6262

63-
// RunSwag runs the swag command to generate the swagger documentation
64-
err = RunSwag(goValues.Values.NodeDirectoryName)
65-
if err != nil {
66-
log.Errorf("err : %s", err)
67-
return err
68-
}
69-
7063
return nil
7164
}
7265

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,9 @@ func RunMakeProto(directoryName string) error {
4040
}
4141
return fmt.Errorf("%s command doesn't exist", protocCommand)
4242
}
43+
44+
// as util
45+
func commandExists(cmd string) bool {
46+
_, err := exec.LookPath(cmd)
47+
return err == nil
48+
}

internal/languages/golang/swag-runner.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)