Skip to content

Commit f46a3aa

Browse files
authored
Merge branch 'master' into add-topic-set-replication-clusters-cmd
2 parents 1441aa8 + 90df904 commit f46a3aa

39 files changed

Lines changed: 790 additions & 55 deletions

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @mattisonchao @zymap @nlu90
1+
* @mattisonchao @zymap @nlu90 @streamnative/platform @streamnative/compute

.github/workflows/ci-bookie-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
bookie-ut-tests:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Set up Go 1.25
14+
- name: Set up Go 1.25.8
1515
uses: actions/setup-go@v6
1616
with:
17-
go-version: 1.25
17+
go-version: 1.25.8
1818
id: go
1919
- name: Check out code into the Go module directory
2020
uses: actions/checkout@v2

.github/workflows/ci-functions-checks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- name: Login SN docker hub
1515
run: docker login -u="${{ secrets.DOCKER_USER }}" -p="${{ secrets.DOCKER_PASSWORD}}"
16-
- name: Set up Go 1.25
16+
- name: Set up Go 1.25.8
1717
uses: actions/setup-go@v6
1818
with:
19-
go-version: 1.25
19+
go-version: 1.25.8
2020
id: go
2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v2
@@ -30,10 +30,10 @@ jobs:
3030
steps:
3131
- name: Login SN docker hub
3232
run: docker login -u="${{ secrets.DOCKER_USER }}" -p="${{ secrets.DOCKER_PASSWORD}}"
33-
- name: Set up Go 1.25
33+
- name: Set up Go 1.25.8
3434
uses: actions/setup-go@v6
3535
with:
36-
go-version: 1.25
36+
go-version: 1.25.8
3737
id: go
3838
- name: Check out code into the Go module directory
3939
uses: actions/checkout@v2
@@ -44,10 +44,10 @@ jobs:
4444
steps:
4545
- name: Login SN docker hub
4646
run: docker login -u="${{ secrets.DOCKER_USER }}" -p="${{ secrets.DOCKER_PASSWORD}}"
47-
- name: Set up Go 1.25
47+
- name: Set up Go 1.25.8
4848
uses: actions/setup-go@v6
4949
with:
50-
go-version: 1.25
50+
go-version: 1.25.8
5151
id: go
5252
- name: Check out code into the Go module directory
5353
uses: actions/checkout@v2

.github/workflows/ci-packages-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- name: Login SN docker hub
1515
run: docker login -u="${{ secrets.DOCKER_USER }}" -p="${{ secrets.DOCKER_PASSWORD}}"
16-
- name: Set up Go 1.25
16+
- name: Set up Go 1.25.8
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.25
19+
go-version: 1.25.8
2020
id: go
2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v2

.github/workflows/ci-release-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
go-version: [ 1.25 ]
17+
go-version: [ 1.25.8 ]
1818
steps:
1919
- uses: actions/checkout@v2
2020
- uses: actions/setup-go@v5

.github/workflows/ci-style-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
style-check:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Set up Go 1.25
14+
- name: Set up Go 1.25.8
1515
uses: actions/setup-go@v5
1616
with:
17-
go-version: 1.25
17+
go-version: 1.25.8
1818
id: go
1919
- name: Check out code into the Go module directory
2020
uses: actions/checkout@v2

.github/workflows/ci-trivy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
scan-vulnerabilities:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Set up Go 1.25
15+
- name: Set up Go 1.25.8
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.25
18+
go-version: 1.25.8
1919
id: go
2020

2121
- name: Check out code into the Go module directory
@@ -34,4 +34,4 @@ jobs:
3434
format: 'table'
3535
exit-code: '1'
3636
severity: "MEDIUM,HIGH,CRITICAL"
37-
vuln-type: "library"
37+
vuln-type: "library"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/streamnative/pulsarctl
22

3-
go 1.25.5
3+
go 1.25.8
44

55
require (
66
github.com/apache/pulsar-client-go v0.18.0-candidate-1.0.20251222030102-3bb7d4eff361

pkg/ctl/namespace/clear_backlog_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ func TestClearBacklogOnNonExistingNs(t *testing.T) {
7272
args := []string{"clear-backlog", "-f", "--bundle", "0xc0000000_0xffffffff", ns}
7373
_, execErr, _, _ := TestNamespaceCommands(ClearBacklogCmd, args)
7474
assert.NotNil(t, execErr)
75-
assert.Equal(t, "code: 404 reason: Namespace does not exist", execErr.Error())
75+
assertNamespaceNotExistError(t, execErr)
7676

7777
args = []string{"clear-backlog", "-f", "--sub", "sub", "--bundle", "0xc0000000_0xffffffff", ns}
7878
_, execErr, _, _ = TestNamespaceCommands(ClearBacklogCmd, args)
7979
assert.NotNil(t, execErr)
80-
assert.Equal(t, "code: 404 reason: Namespace does not exist", execErr.Error())
80+
assertNamespaceNotExistError(t, execErr)
8181
}

pkg/ctl/namespace/compaction_threshold_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ func TestSetCompactionThresholdOnNonExistingNs(t *testing.T) {
5858
args := []string{"set-compaction-threshold", "--size", "10m", ns}
5959
_, execErr, _, _ := TestNamespaceCommands(SetCompactionThresholdCmd, args)
6060
assert.NotNil(t, execErr)
61-
assert.Equal(t, "code: 404 reason: Namespace does not exist", execErr.Error())
61+
assertNamespaceNotExistError(t, execErr)
6262
}
6363

6464
func TestGetCompactionThresholdOnNonExistingNs(t *testing.T) {
6565
ns := "public/non-existing-namespace"
6666
args := []string{"get-compaction-threshold", ns}
6767
_, execErr, _, _ := TestNamespaceCommands(GetCompactionThresholdCmd, args)
6868
assert.NotNil(t, execErr)
69-
assert.Equal(t, "code: 404 reason: Namespace does not exist", execErr.Error())
69+
assertNamespaceNotExistError(t, execErr)
7070
}

0 commit comments

Comments
 (0)