enahancement: added dos2unix command for openapi files

Author: mahendraintelops

.github/workflows/core-ci.yml

@@ -44,6 +44,7 @@ jobs:
       - name: Test
         run: |
           cd core
+          sudo apt install dos2unix -y
           # install openapi-generator-cli
           mkdir -p $HOME/ogc
           curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > $HOME/ogc/openapi-generator-cli && chmod a+x $HOME/ogc/openapi-generator-cli
@@ -145,4 +146,4 @@ jobs:
           format: 'github'
           output: 'dependency-results.sbom.json'
           image-ref: '.'
-          github-pat: ${{ secrets.GH_TOKEN }}
+          github-pat: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -7,6 +7,6 @@
 /app/scratch/
 /core/core
 /.idea
-/core/openapitools.json
 /core/coverage.out
-/app/coverage
+/app/coverage
+openapitools.json

core/Dockerfile

@@ -22,7 +22,7 @@ FROM alpine:3.18.2
 # Create project directory (workdir)
 WORKDIR /app
 
-RUN apk update && apk add protoc && apk add openjdk8 && apk add make && apk add bash && apk add curl && apk add jq && apk add --update go \
+RUN apk update && apk add protoc && apk add dos2unix && apk add openjdk8 && apk add make && apk add bash && apk add curl && apk add jq && apk add --update go \
     && curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh \
     > /app/openapi-generator-cli \
     && chmod a+x /app/openapi-generator-cli

core/internal/languages/openapi-generator-runner.go

@@ -11,7 +11,13 @@ import (
 
 // runs openapi-generator-cli with args passed.
 func runOpenAPIGenerator(args ...string) error {
-	output, err := exec.Command("openapi-generator-cli", args...).Output()
+	path, err := exec.LookPath("openapi-generator-cli")
+	if err != nil {
+		log.Debugf("err : %s", err)
+		return errors.New("'openapi-generator-cli' command doesn't exist")
+	}
+	log.Debugf("openapi-generator-cli is available at %s", path)
+	output, err := exec.Command(path, args...).Output()
 	if err != nil {
 		log.Debugf("Output : %s", string(output))
 		log.Debugf("err : %s", err)
@@ -46,6 +52,12 @@ func ProcessOpenAPITemplate(ctx context.Context) error {
 		return err
 	}
 
+	// dos2unix on the file
+	if err = runDos2Unix(fileName); err != nil {
+		log.Debugf("err : %s", err)
+		return err
+	}
+
 	// generate code by openapi.yaml
 	if err0 := runOpenAPIGenerator("generate", "-i", fileName, "-g", strings.ToLower(values.LanguageNode.RestConfig.Framework), "-o", values.NodeDirectoryName, "--git-user-id", values.TemplateVars[UserName], "--git-repo-id", values.TemplateVars[RepositoryName]+"/"+values.LanguageNode.Name); err0 != nil {
 		log.Debugf("err : %s", err0)
@@ -59,3 +71,20 @@ func ProcessOpenAPITemplate(ctx context.Context) error {
 	}
 	return nil
 }
+
+func runDos2Unix(fileName string) error {
+	path, err := exec.LookPath("dos2unix")
+	if err != nil {
+		log.Debugf("err : %s", err)
+		return errors.New("'dos2unix' command doesn't exist")
+	}
+	log.Debugf("dos2unix is available at %s", path)
+	args := []string{fileName}
+	output, err := exec.Command(path, args...).Output()
+	log.Debugf("Output : %s", string(output))
+	if err != nil {
+		log.Debugf("err : %s", err)
+		return err
+	}
+	return nil
+}