Merge branch 'master' into issue-5643-contribute

Author: HugoMario

.github/actions/build/action.yml

@@ -0,0 +1,48 @@
+name: 'Builder'
+description: 'build project'
+inputs:
+  path:
+    description: 'project root path'
+    required: true
+  job-name:
+    description: 'Job name'
+    required: true
+  build-commands:
+    description: 'Build Commands'
+    required: true
+outputs:
+  logs:
+    description: "logs"
+    value: ${{ steps.build.outputs.logs }}
+  path:
+    description: "output path"
+    value: ${{ steps.build.outputs.path }}
+runs:
+  using: "composite"
+  steps:
+    - id: build
+      name: build
+      run: |
+        buildlogfile=${{ inputs.job-name }}-build.log
+        echo "path=$(echo generated/${{ inputs.job-name }})" >> $GITHUB_OUTPUT
+        curdir=$(pwd)
+        echo -e "\n****** BUILD ******\n" >> $curdir/$buildlogfile
+        cd ${{ inputs.path }}
+        echo -e "${{ inputs.build-commands }}" > $curdir/buildcommands.log
+        echo "logs=$(echo $curdir/$buildlogfile)" >> $GITHUB_OUTPUT
+        buildcommands=$(cat $curdir/buildcommands.log)
+
+        while [ "$buildcommands" ] ;do
+            iter=${buildcommands%%__&&__*}
+            echo -e "\n****** executing: $iter ******\n"
+            echo -e "\n****** executing: $iter ******\n" >> $curdir/$buildlogfile
+            $iter  2>&1 | tee --append $curdir/$buildlogfile
+            [ "$buildcommands" = "$iter" ] && \
+                buildcommands='' || \
+                buildcommands="${buildcommands#*__&&__}"
+        done
+        echo -e "\n****** executed all buildcommands ******\n"
+        echo -e "\n****** executed all buildcommand ******\n" >> $curdir/$buildlogfile
+        cd ${curdir}
+        echo "logs=$(echo $curdir/$buildlogfile)" >> $GITHUB_OUTPUT
+      shell: bash

.github/actions/dotnetbuild/action.yml

@@ -29,9 +29,11 @@ runs:
       name: generate
       run: |
         logfile=${{ inputs.job-name }}.log
-        echo "::set-output name=logs::$(echo $logfile)"
         chmod +x ${{ github.action_path }}/generate.sh
+        echo "${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }}"
         echo -e "\n****** generate ******\n" > $logfile
-        ${{ github.action_path }}/generate.sh ${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }} >> $logfile
-        echo "::set-output name=path::$(echo generated/${{ inputs.job-name }})"
+        echo "logs=$(echo $logfile)" >> $GITHUB_OUTPUT
+        ${{ github.action_path }}/generate.sh ${{ inputs.language }} ${{ inputs.job-name }} ${{ inputs.spec-url }} ${{ inputs.options }} 2>&1 | tee --append $logfile
+        echo "path=$(echo generated/${{ inputs.job-name }})" >> $GITHUB_OUTPUT
+        echo "logs=$(echo $logfile)" >> $GITHUB_OUTPUT
       shell: bash

.github/actions/generate/action.yml

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 SCRIPT="$0"
 
@@ -17,18 +17,28 @@ executable="swagger-codegen-cli.jar"
 
 LANG=$1
 
+echo "LANGUAGE $LANG"
+
 JOB_NAME=$2
+
+echo "JOB_NAME $JOB_NAME"
+
 if [ -z "$JOB_NAME" ]
 then
       JOB_NAME=$LANG
 fi
 
 SPEC_URL=$3
+
+echo "SPEC_URL PARAM $SPEC_URL"
+
 if [[ $SPEC_URL == "null" ]];
 then
       SPEC_URL="https://petstore3.swagger.io/api/v3/openapi.json"
 fi
 
+echo "SPEC_URL $SPEC_URL"
+
 shift;
 shift;
 shift;

.github/actions/generate/generate.sh

@@ -5,8 +5,8 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <logger name="io.swagger" level="info"/>
-    <root level="error">
+    <logger name="io.swagger" level="debug"/>
+    <root level="debug">
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>

.github/actions/generate/logback.xml

@@ -0,0 +1,75 @@
+name: Build And Push Docker Release 3.0
+
+on:
+  workflow_dispatch:
+    branches: [ "3.0.0" ]
+    inputs:
+      tag:
+        description: tag/version to release
+        required: true
+jobs:
+  build_push_docker_release_30:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        name: git checkout 3.0.0
+        with:
+          ref: 3.0.0
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: maven
+      - name: preliminary checks
+        run: |
+          docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
+          set -e
+          # fail if templates/generators contain carriage return '\r'
+          /bin/bash ./bin/utils/detect_carriage_return.sh
+          # fail if generators contain merge conflicts
+          /bin/bash ./bin/utils/detect_merge_conflict.sh
+          # fail if generators contain tab '\t'
+          /bin/bash ./bin/utils/detect_tab_in_java_class.sh
+      - uses: s4u/[email protected]
+        name: setup maven settings.xml
+        with:
+          servers: |
+            [{
+                "id": "sonatype-nexus-staging",
+                "username": "${{ secrets.OSSRH_USERNAME }}",
+                "password": "${{ secrets.OSSRH_TOKEN }}"
+            },
+            {
+                "id": "sonatype-nexus-snapshots",
+                "username": "${{ secrets.OSSRH_USERNAME }}",
+                "password": "${{ secrets.OSSRH_TOKEN }}"
+            }]
+      - name: Build with Maven
+        run: |
+          # mvn clean install -U -Pdocker -Plinux -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089
+      - name: docker build and push
+        run: |
+          export DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator-v3-minimal
+          export DOCKER_GENERATOR_FULL_IMAGE_NAME=swaggerapi/swagger-generator-v3
+          export DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME=swaggerapi/swagger-generator-v3-root
+          export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli-v3
+          mvn -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089 clean install -Pdocker -Prelease --settings $HOME/.m2/settings.xml
+          docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} -f ./modules/swagger-generator/Dockerfile_minimal ./modules/swagger-generator
+          docker tag $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_IMAGE_NAME:latest
+          docker push $DOCKER_GENERATOR_IMAGE_NAME:${{ env.TAG }}
+          docker push $DOCKER_GENERATOR_IMAGE_NAME:latest
+          docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} ./modules/swagger-codegen-cli
+          docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }} $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
+          docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:${{ env.TAG }}
+          docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest
+          docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:${{ env.TAG }}
+          docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:latest
+          docker push $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:${{ env.TAG }}
+          docker push $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:latest
+          docker tag $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_FULL_IMAGE_NAME:${{ env.TAG }}-root
+          docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:$${{ env.TAG }}-root
+    env:
+      TAG: ${{ github.event.inputs.tag }}

.github/actions/javabuild/action.yml

@@ -0,0 +1,46 @@
+name: PR build - master
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 11 ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: mvn -B -U verify --file pom.xml
+
+  scan-with-lacework:
+      name: Trigger LaceWork Scanning
+      runs-on: ubuntu-latest
+
+      needs: [ build ]
+      if: success()
+
+      steps:
+        - name: Trigger LaceWork Scanning using a different method
+          run: |
+            docker run -e LW_ACCOUNT_NAME=$LW_ACCOUNT_NAME -e LW_ACCESS_TOKEN=$LW_ACCESS_TOKEN -e LW_SCANNER_SAVE_RESULTS=true -e LW_SCANNER_DISABLE_UPDATES=false -v /var/run/docker.sock:/var/run/docker.sock lacework/lacework-inline-scanner:latest image evaluate swaggerapi/swagger-codegen-cli latest --docker-server index.docker.io --docker-username $docker_user --docker-password $docker_password  > /dev/null 2>&1
+          env:
+            LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
+            LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
+            docker_user: ${{ secrets.DOCKERHUB_SB_USERNAME}}
+            docker_password: ${{ secrets.DOCKERHUB_SB_PASSWORD}}