INFRA-13891 Pull upstream changes

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,41 @@
+{{ if .Versions -}}
+<a name="unreleased"></a>
+## [Unreleased]
+
+{{ if .Unreleased.CommitGroups -}}
+{{ range .Unreleased.CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{ range .Versions }}
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+{{ range .CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{- if .Versions }}
+[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
+{{ range .Versions -}}
+{{ if .Tag.Previous -}}
+[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.chglog/RELNOTES.tmpl

@@ -0,0 +1,20 @@
+{{ range .Versions -}}
+Release {{ .Tag.Name}}
+
+Release {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+{{ range .CommitGroups -}}
+** {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+** {{ .Title }}
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.chglog/config.yml

@@ -0,0 +1,27 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/vozlt/nginx-module-vts
+options:
+  commits:
+    # filters:
+    #   Type:
+    #     - feat
+    #     - fix
+    #     - perf
+    #     - refactor
+  commit_groups:
+    # title_maps:
+    #   feat: Features
+    #   fix: Bug Fixes
+    #   perf: Performance Improvements
+    #   refactor: Code Refactoring
+  header:
+    pattern: "^(\\w*)\\:\\s(.*)$"
+    pattern_maps:
+      - Type
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,57 @@
+name: Bug Report
+description: Report incorrect behavior in this module
+title: "BUG: "
+labels: [bug]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: module version checks
+      options:
+        - label: >
+            I have checked that this issue has not already been reported.
+          required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Issue Description
+      description: >
+        Please provide a description of the issue shown in the reproducible example.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: >
+        Please describe or show a code example of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Installed Versions
+      placeholder: >
+        % sudo /usr/local/nginx/sbin/nginx -V
+        nginx version: nginx/1.27.0
+        built by gcc 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) 
+        configure arguments: --add-module=../nginx-module-vts
+      description: >	
+        Please paste the output of ``nginx -V``
+      value: >
+        <details>
+
+
+        Replace this line with the output of nginx -V
+
+
+        </details>
+    validations:
+      required: true
+  - type: textarea
+    id: conf
+    attributes:
+      label: Reproducible Example nginx.conf
+      description: >	
+        Please paste the reproducible nginx.conf

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,42 @@
+name: Feature Request
+description: Suggest an idea for this module
+title: "ENH: "
+labels: [enhancement]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Feature Type
+      description: Please check what type of feature request you would like to propose.
+      options:
+        - label: >
+            Adding new functionality to this module
+        - label: >
+            Changing existing functionality in this module
+        - label: >
+            Removing existing functionality in this module
+  - type: textarea
+    id: description
+    attributes:
+      label: Problem Description
+      description: >
+        Please describe what problem the feature would solve, e.g. "I wish I could use this module to ..."
+      placeholder: >
+        I wish I could use this module...
+    validations:
+      required: true
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature Description
+      description: >
+        Please describe how the new feature would be implemented, using psudocode if relevant.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: >
+        Please provide any relevant GitHub issues, code examples or references that help describe and support the feature request.

.github/ISSUE_TEMPLATE/submit_question.yaml

@@ -0,0 +1,35 @@
+name: Submit Question
+description: Ask a general question about this module
+title: "QST: "
+labels: [question]
+
+body:
+  - type: textarea
+    id: question
+    attributes:
+      label: Question about this module
+  - type: textarea
+    id: version
+    attributes:
+      label: Installed Versions
+      placeholder: >
+        % sudo /usr/local/nginx/sbin/nginx -V
+        nginx version: nginx/1.27.0
+        built by gcc 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) 
+        configure arguments: --add-module=../nginx-module-vts
+      description: >	
+        Please paste the output of ``nginx -V``
+      value: >
+        <details>
+
+
+        Replace this line with the output of nginx -V
+
+
+        </details>
+  - type: textarea
+    id: conf
+    attributes:
+      label: Reproducible Example nginx.conf
+      description: >	
+        Please paste the reproducible nginx.conf

.github/workflows/ci.yml

@@ -0,0 +1,129 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    name: 'build'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: 'checkout'
+        uses: actions/checkout@v3
+        with:
+          path: nginx-module-vts
+      - name: 'checkout nginx'
+        uses: actions/checkout@v3
+        with:
+          repository: nginx/nginx
+          path: nginx
+      - name: 'checkout freenginx'
+        uses: actions/checkout@v3
+        with:
+          repository: freenginx/nginx
+          path: freenginx
+      - name: 'checkout luajit2'
+        uses: actions/checkout@v3
+        with:
+          repository: openresty/luajit2
+          path: luajit2
+      - name: 'checkout ngx_devel_kit'
+        uses: actions/checkout@v3
+        with:
+          repository: vision5/ngx_devel_kit
+          path: ngx_devel_kit
+      - name: 'checkout lua-nginx-module'
+        uses: actions/checkout@v3
+        with:
+          repository: openresty/lua-nginx-module
+          path: lua-nginx-module
+      - name: 'checkout lua-resty-core'
+        uses: actions/checkout@v3
+        with:
+          repository: openresty/lua-resty-core
+          path: lua-resty-core
+      - name: 'checkout lua-resty-lrucache'
+        uses: actions/checkout@v3
+        with:
+          repository: openresty/lua-resty-lrucache
+          path: lua-resty-lrucache
+      - name: 'build luajit2'
+        working-directory: luajit2
+        run: |
+          make
+          sudo make install
+          sudo mkdir /usr/local/share/lua/5.1/resty
+      - name: 'link resty lib'
+        working-directory: /usr/local/share/lua/5.1/resty
+        run: |
+          sudo ln -s /home/runner/work/nginx-module-vts/nginx-module-vts/lua-resty-core/lib/resty/core core
+          sudo ln -s /home/runner/work/nginx-module-vts/nginx-module-vts/lua-resty-core/lib/resty/core.lua core.lua
+          sudo ln -s /home/runner/work/nginx-module-vts/nginx-module-vts/lua-resty-lrucache/lib/resty/lrucache lrucache
+          sudo ln -s /home/runner/work/nginx-module-vts/nginx-module-vts/lua-resty-lrucache/lib/resty/lrucache.lua lrucache.lua
+      - name: 'prepare nginx_upstream_check'
+        uses: actions/checkout@v3
+        with:
+          repository: yaoweibin/nginx_upstream_check_module
+          path: nginx_upstream_check
+
+      - name: 'patch upstream_check'
+        working-directory: nginx
+        run: |
+          patch -p1 < /home/runner/work/nginx-module-vts/nginx-module-vts/nginx_upstream_check/check_1.20.1+.patch
+      - name: 'patch upstream_check for freenginx'
+        working-directory: freenginx
+        run: |
+          patch -p1 < /home/runner/work/nginx-module-vts/nginx-module-vts/nginx_upstream_check/check_1.20.1+.patch
+      - name: 'build nginx'
+        working-directory: nginx
+        run: |
+          ./auto/configure --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/ngx_devel_kit --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/lua-nginx-module --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/nginx-module-vts --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/nginx_upstream_check
+          make
+          sudo make install
+          /usr/local/nginx/sbin/nginx -V
+        env:
+          LUAJIT_LIB: /usr/local/lib
+          LUAJIT_INC: /usr/local/include/luajit-2.1
+      - name: 'build freenginx'
+        working-directory: freenginx
+        run: |
+          ./auto/configure --prefix=/usr/local/freenginx --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/ngx_devel_kit --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/lua-nginx-module --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/nginx-module-vts --add-module=/home/runner/work/nginx-module-vts/nginx-module-vts/nginx_upstream_check
+          make
+          sudo make install
+          /usr/local/freenginx/sbin/nginx -V
+        env:
+          LUAJIT_LIB: /usr/local/lib
+          LUAJIT_INC: /usr/local/include/luajit-2.1
+      - name: 'prepare cpanm'
+        run: |
+          sudo apt install -y cpanminus
+          sudo cpanm --notest Test::Nginx::Socket > build.log 2>&1 || (cat build.log && exit 1)
+      - name: 'prepare promtool'
+        run: |
+          sudo apt-get update && sudo apt-get install -y curl
+          curl -L $(curl -s https://api.github.com/repos/prometheus/prometheus/releases/latest | grep browser_download_url | grep linux-amd64 | cut -d '"' -f 4) -o prometheus-latest.tar.gz
+          tar xvf prometheus-latest.tar.gz
+          sudo mv prometheus-*/promtool /usr/local/bin
+      - name: 'test'
+        working-directory: nginx-module-vts
+        run: |
+          echo "/usr/local/nginx/sbin/" >> $GITHUB_PATH
+          sudo PATH=/usr/local/nginx/sbin:$PATH prove -r t
+      - name: 'test upstream check'
+        working-directory: nginx-module-vts
+        run: |
+          echo "/usr/local/nginx/sbin/" >> $GITHUB_PATH
+          sudo TEST_UPSTREAM_CHECK=1 TEST_NGINX_SLEEP=1 PATH=/usr/local/nginx/sbin:$PATH prove t/024.upstream_check.t
+      - name: 'test freenginx'
+        working-directory: nginx-module-vts
+        run: |
+          echo "/usr/local/freenginx/sbin/" >> $GITHUB_PATH
+          sudo PATH=/usr/local/freenginx/sbin:$PATH prove -r t
+      - name: 'test upstream check for freenginx'
+        working-directory: nginx-module-vts
+        run: |
+          echo "/usr/local/freenginx/sbin/" >> $GITHUB_PATH
+          sudo TEST_UPSTREAM_CHECK=1 TEST_NGINX_SLEEP=1 PATH=/usr/local/freenginx/sbin:$PATH prove t/024.upstream_check.t

.gitignore

@@ -0,0 +1 @@
+t/servroot