Skip to content

Commit 83c5c83

Browse files
authored
[Bugfix] Fix ResignJob ID Discovery (#1440)
1 parent 999afcb commit 83c5c83

File tree

5 files changed

+1564
-16
lines changed

5 files changed

+1564
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- (Bugfix) Fix VersionCheck args propagation
1313
- (Feature) EnforcedResignLeadership action
1414
- (Maintenance) Make scale_down_candidate annotation obsolete
15+
- (Bugfix) Fix ResignJob ID propagation
1516

1617
## [1.2.33](https://github.com/arangodb/kube-arangodb/tree/1.2.33) (2023-09-27)
1718
- (Maintenance) Bump golang.org/x/net to v0.13.0
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//
2+
// DISCLAIMER
3+
//
4+
// Copyright 2023 ArangoDB GmbH, Cologne, Germany
5+
//
6+
// Licensed under the Apache License, Version 2.0 (the "License");
7+
// you may not use this file except in compliance with the License.
8+
// You may obtain a copy of the License at
9+
//
10+
// http://www.apache.org/licenses/LICENSE-2.0
11+
//
12+
// Unless required by applicable law or agreed to in writing, software
13+
// distributed under the License is distributed on an "AS IS" BASIS,
14+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
// See the License for the specific language governing permissions and
16+
// limitations under the License.
17+
//
18+
// Copyright holder is ArangoDB GmbH, Cologne, Germany
19+
//
20+
21+
package state
22+
23+
import (
24+
"encoding/json"
25+
"testing"
26+
27+
"github.com/stretchr/testify/require"
28+
)
29+
30+
func Test_JobDiscovery(t *testing.T) {
31+
var s DumpState
32+
require.NoError(t, json.Unmarshal(agencyDump310, &s))
33+
34+
require.Len(t, s.Agency.Arango.Target.JobFinished, 2)
35+
}

pkg/deployment/agency/state/state_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ var agencyDump38 []byte
4040
//go:embed testdata/agency_dump.3.9.json
4141
var agencyDump39 []byte
4242

43+
//go:embed testdata/agency_dump.3.10.json
44+
var agencyDump310 []byte
45+
4346
//go:embed testdata/agency_dump.3.9.satellite.json
4447
var agencyDump39Satellite []byte
4548

0 commit comments

Comments
 (0)