Skip to content

Commit acdc050

Browse files
Merge branch 'master' of github.com:jaredhendrickson13/pfsense-api into next_minor
2 parents be9918b + 66b9d4f commit acdc050

21 files changed

Lines changed: 308 additions & 63 deletions

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
FREEBSD_ID: freebsd16
2828

2929
steps:
30-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3131
- name: Setup FreeBSD build VM
3232
run: |
3333
/usr/local/bin/VBoxManage controlvm ${{ matrix.FREEBSD_VERSION }} poweroff || true
@@ -62,7 +62,7 @@ jobs:
6262
- PFSENSE_VERSION: pfSense-2.8.1-RELEASE
6363
FREEBSD_ID: freebsd15
6464
steps:
65-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
65+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6666
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
6767
with:
6868
name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
@@ -112,7 +112,7 @@ jobs:
112112
- PFSENSE_VERSION: pfSense-2.8.1-RELEASE
113113
FREEBSD_ID: freebsd15
114114
steps:
115-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
115+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
116116
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
117117
with:
118118
name: openapi-${{ matrix.PFSENSE_VERSION }}.json
@@ -121,7 +121,7 @@ jobs:
121121
- name: Install Node.js
122122
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
123123
with:
124-
node-version: "20"
124+
node-version: "26"
125125

126126
- name: Install npm dependencies
127127
run: npm i
@@ -142,7 +142,7 @@ jobs:
142142
FREEBSD_ID: freebsd15
143143

144144
steps:
145-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
145+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
146146

147147
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
148148
with:

.github/workflows/quality.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jobs:
55
check_prettier:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
99
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1010
with:
11-
node-version: 20
11+
node-version: 26
1212
- name: Install npm packages
1313
run: npm install
1414
- name: Check Prettier
@@ -17,8 +17,8 @@ jobs:
1717
check_black:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
21-
- uses: psf/black@c6755bb741b6481d6b3d3bb563c83fa060db96c9 # 26.3.1
20+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
21+
- uses: psf/black@87928e6d6761a4a6d22250e1fee5601b3998086e # 26.5.1
2222

2323
lint_php:
2424
runs-on: ubuntu-latest
@@ -27,9 +27,9 @@ jobs:
2727
matrix:
2828
PHP_VERSION: ["8.2"]
2929
steps:
30-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3131
- name: "Setup PHP ${{ matrix.PHP_VERSION }}"
32-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
32+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3333
with:
3434
php-version: "${{ matrix.PHP_VERSION }}"
3535
coverage: "none"
@@ -46,9 +46,9 @@ jobs:
4646
matrix:
4747
PYTHON_VERSION: ["3.10", "3.11"]
4848
steps:
49-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5050
- name: Set up Python ${{ matrix.PYTHON_VERSION }}
51-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
51+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
5252
with:
5353
python-version: ${{ matrix.PYTHON_VERSION }}
5454
- name: Install dependencies
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
needs: ["lint_php"]
6464
steps:
65-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
65+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6666
- name: Check phpdoc build
6767
run: |
6868
wget https://phpdoc.org/phpDocumentor.phar -O phpdoc

.github/workflows/release.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ jobs:
3232
PFSENSE_VERSION: "25.11.1"
3333
- FREEBSD_VERSION: FreeBSD-16.0-CURRENT
3434
PFSENSE_VERSION: "26.03"
35+
- FREEBSD_VERSION: FreeBSD-16.0-CURRENT
36+
PFSENSE_VERSION: "26.03.1"
3537

3638
steps:
37-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3840

3941
- name: Setup FreeBSD build VM
4042
run: |
@@ -60,15 +62,15 @@ jobs:
6062
path: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
6163

6264
- name: Release
63-
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
65+
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
6466
with:
6567
files: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
6668

6769
build_schemas:
6870
runs-on: self-hosted
6971
needs: [release_pkg]
7072
steps:
71-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7274

7375
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
7476
with:
@@ -125,7 +127,7 @@ jobs:
125127
path: schema.graphql
126128

127129
- name: Release schemas
128-
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
130+
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
129131
with:
130132
files: |
131133
native.json
@@ -162,16 +164,16 @@ jobs:
162164
name: github-pages
163165
url: ${{ steps.deployment.outputs.page_url }}
164166
steps:
165-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
167+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
166168

167169
- name: Setup Pages
168-
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
170+
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
169171

170172
- name: Make website directory
171173
run: mkdir ./www
172174

173175
- name: Setup python
174-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
176+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
175177
with:
176178
python-version: ${{ env.PYTHON_VERSION }}
177179

.github/workflows/schedule_weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
env:
1616
DAYS_BEFORE_STALE: 60
1717
steps:
18-
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
18+
- uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
1919
with:
2020
stale-issue-message: |
2121
This issue has been automatically marked as stale because it has had no recent activity in the last ${{ env.DAYS_BEFORE_STALE }} days.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pkg-static add https://github.com/pfrest/pfSense-pkg-RESTAPI/releases/latest/dow
4242
Install on pfSense Plus:
4343

4444
```bash
45-
pkg-static -C /dev/null add https://github.com/pfrest/pfSense-pkg-RESTAPI/releases/latest/download/pfSense-26.03-pkg-RESTAPI.pkg
45+
pkg-static -C /dev/null add https://github.com/pfrest/pfSense-pkg-RESTAPI/releases/latest/download/pfSense-26.03.1-pkg-RESTAPI.pkg
4646
```
4747

4848
> [!WARNING]

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"firebase/php-jwt": "v7.0.*",
3+
"firebase/php-jwt": "v7.1.*",
44
"webonyx/graphql-php": "^15.13"
55
}
66
}

composer.lock

Lines changed: 20 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/INSTALL_AND_CONFIG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ run pfSense. It's recommended to follow Netgate's [minimum hardware requirements
1717
- pfSense CE 2.8.1
1818
- pfSense Plus 25.11.1
1919
- pfSense Plus 26.03
20+
- pfSense Plus 26.03.1
21+
2022

2123
!!! Warning
2224
Installation of the package on unsupported versions of pfSense may result in unexpected behavior and/or system instability.

docs/QUERIES_FILTERS_AND_SORTING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ value array contains a given value for array fields.
5656

5757
Search for objects whose field value is within a given array of values (when the filter value is an array), or search
5858
for objects whose field value is a substring of a given string (when the filter value is a string).
59+
5960
- Name: `in`
6061
- Examples:
61-
- `https://pfsense.example.com/api/v2/examples?fieldname__in=example`
62-
- `https://pfsense.example.com/api/v2/examples?fieldname__in[]=example1&fieldname__in[]=example2`
62+
- `https://pfsense.example.com/api/v2/examples?fieldname__in=example`
63+
- `https://pfsense.example.com/api/v2/examples?fieldname__in[]=example1&fieldname__in[]=example2`
6364

6465
### Less Than (lt)
6566

@@ -95,8 +96,8 @@ Search for objects whose field value matches a given format.
9596

9697
- Name: `format`
9798
- Examples:
98-
- `https://pfsense.example.com/api/v2/examples?fieldname__format=ipv4`
99-
- `https://pfsense.example.com/api/v2/examples?fieldname__format=email`
99+
- `https://pfsense.example.com/api/v2/examples?fieldname__format=ipv4`
100+
- `https://pfsense.example.com/api/v2/examples?fieldname__format=email`
100101

101102
#### Supported Formats
102103

package-lock.json

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)