Skip to content

Commit df90b6d

Browse files
committed
Merge branch 'main' into refactor-error-handle-account-3
# Conflicts: # pkg/account/api/admin_account.go # pkg/account/api/admin_account_test.go # pkg/account/api/api.go # pkg/account/api/api_key.go # pkg/account/api/api_key_test.go # pkg/account/storage/v2/admin_account.go # pkg/account/storage/v2/api_key.go
2 parents 8a9fa45 + d8fa117 commit df90b6d

1,437 files changed

Lines changed: 4899 additions & 336232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ updates:
2727
patterns:
2828
- "*"
2929
- package-ecosystem: "npm"
30-
directory: "/ui/web-v2"
30+
directory: "/ui/dashboard"
3131
schedule:
3232
interval: "monthly"
3333
time: "10:00"
@@ -39,4 +39,3 @@ updates:
3939
dependencies:
4040
patterns:
4141
- "*"
42-

.github/workflows/pr-go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ jobs:
178178
go-version-file: 'go.mod'
179179
cache: true
180180
- name: Install golangci-lint
181-
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
181+
run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
182182
- name: Lint
183183
run: make lint

.github/workflows/pr-ui-web.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/publish_chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- "v*"
1919
paths-ignore:
2020
- "README.md"
21-
- "ui/web-v2/README.md"
21+
- "ui/dashboard/README.md"
2222
- "CLA.md"
2323
- "CONTRIBUTING.md"
2424
- "DEPLOYMENT.md"

.github/workflows/push-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- "v*"
2828
paths-ignore:
2929
- "README.md"
30-
- "ui/web-v2/README.md"
30+
- "ui/dashboard/README.md"
3131
- "CLA.md"
3232
- "CONTRIBUTING.md"
3333
- "DEPLOYMENT.md"

.golangci.yml

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,48 @@
1+
version: "2"
12
run:
23
tests: false
3-
linters-settings:
4-
goimports:
5-
# put imports beginning with prefix after 3rd-party packages;
6-
# it's a comma-separated list of prefixes
7-
local-prefixes: github.com/bucketeer-io/bucketeer
8-
goheader:
9-
# template does not contains the comment indicator '//' or '/*' '*/'
10-
template: |-
11-
Copyright {{mod-year-range}} The Bucketeer Authors.
12-
13-
Licensed under the Apache License, Version 2.0 (the "License");
14-
you may not use this file except in compliance with the License.
15-
You may obtain a copy of the License at
16-
17-
http://www.apache.org/licenses/LICENSE-2.0
18-
19-
Unless required by applicable law or agreed to in writing, software
20-
distributed under the License is distributed on an "AS IS" BASIS,
21-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
22-
See the License for the specific language governing permissions and
23-
limitations under the License.
244
linters:
25-
disable-all: true
5+
default: none
266
enable:
277
- errcheck
288
- goheader
29-
- gosimple
309
- govet
3110
- ineffassign
32-
- typecheck
11+
- lll
12+
- staticcheck
3313
- unused
14+
settings:
15+
goheader:
16+
template: |-
17+
Copyright {{mod-year-range}} The Bucketeer Authors.
18+
19+
Licensed under the Apache License, Version 2.0 (the "License");
20+
you may not use this file except in compliance with the License.
21+
You may obtain a copy of the License at
22+
23+
http://www.apache.org/licenses/LICENSE-2.0
24+
25+
Unless required by applicable law or agreed to in writing, software
26+
distributed under the License is distributed on an "AS IS" BASIS,
27+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
28+
See the License for the specific language governing permissions and
29+
limitations under the License.
30+
staticcheck:
31+
checks: ["all", "-SA1019", "-ST1003","-ST1012"] # ignore deprecated, ignore poorly chosen identifier and ignore poorly chosen name for error variable
32+
exclusions:
33+
generated: lax
34+
presets:
35+
- comments
36+
- common-false-positives
37+
- legacy
38+
- std-error-handling
39+
formatters:
40+
enable:
3441
- gofmt
3542
- goimports
36-
- lll
43+
settings:
44+
goimports:
45+
local-prefixes:
46+
- github.com/bucketeer-io/bucketeer
47+
exclusions:
48+
generated: lax

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "2.0.0"
2+
".": "2.1.1"
33
}

CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
# Changelog
22

3+
## [2.1.1](https://github.com/bucketeer-io/bucketeer/compare/v2.1.0...v2.1.1) (2025-09-26)
4+
5+
6+
### Bug Fixes
7+
8+
* add v2 module path for Go modules v2+ semantic versioning ([#2137](https://github.com/bucketeer-io/bucketeer/issues/2137)) ([5bde96c](https://github.com/bucketeer-io/bucketeer/commit/5bde96c7920e82cb4407cdbe308d16861d017425))
9+
10+
## [2.1.0](https://github.com/bucketeer-io/bucketeer/compare/v2.0.0...v2.1.0) (2025-09-26)
11+
12+
13+
### Features
14+
15+
* add pprof debug option ([#2083](https://github.com/bucketeer-io/bucketeer/issues/2083)) ([ef15387](https://github.com/bucketeer-io/bucketeer/commit/ef15387c5bf5bae905a1891daf5b6481eb7ac1b3))
16+
* support not equal operator for evaluation ([#2095](https://github.com/bucketeer-io/bucketeer/issues/2095)) ([6b263fc](https://github.com/bucketeer-io/bucketeer/commit/6b263fc6c4cafd894c4643276bb675df60228add))
17+
18+
19+
### Bug Fixes
20+
21+
* change log target to cloned feature ([#2107](https://github.com/bucketeer-io/bucketeer/issues/2107)) ([e2164fd](https://github.com/bucketeer-io/bucketeer/commit/e2164fd8656e69c52ad8e8992d62078934f7d682))
22+
* **dashboard/ui:** new operation progressive rollout ([#2094](https://github.com/bucketeer-io/bucketeer/issues/2094)) ([dc70be2](https://github.com/bucketeer-io/bucketeer/commit/dc70be2370b84853788b67c7b87fe29c4747e910))
23+
* resolve missing dependencies in incremental feature flag evaluation ([#2135](https://github.com/bucketeer-io/bucketeer/issues/2135)) ([7dc9b2b](https://github.com/bucketeer-io/bucketeer/commit/7dc9b2b358e7437d097fb81967b74df6df6b6896))
24+
* **ui/dashboard:** experiment filter search params ([#2123](https://github.com/bucketeer-io/bucketeer/issues/2123)) ([8489257](https://github.com/bucketeer-io/bucketeer/commit/84892578a20c2b411db65f9b86350d1b525288d6))
25+
* **ui/dashboard:** progressive rollout manual validate ([#2111](https://github.com/bucketeer-io/bucketeer/issues/2111)) ([338ac00](https://github.com/bucketeer-io/bucketeer/commit/338ac00561806bced420c5691ca87f472fd0fff5))
26+
27+
28+
### Miscellaneous
29+
30+
* correcting tags for event counter APIs ([#2108](https://github.com/bucketeer-io/bucketeer/issues/2108)) ([2cd751d](https://github.com/bucketeer-io/bucketeer/commit/2cd751d26d81daaf16d95023c3252d8b8a0737eb))
31+
* fix typo in locales ([#2091](https://github.com/bucketeer-io/bucketeer/issues/2091)) ([b998a47](https://github.com/bucketeer-io/bucketeer/commit/b998a479680384b8534904e4d6052f2b0d74110b))
32+
* remove old console ([#2126](https://github.com/bucketeer-io/bucketeer/issues/2126)) ([a87501c](https://github.com/bucketeer-io/bucketeer/commit/a87501c94892943a6db622f5334312ed16b4c195))
33+
* update new url for new console ([#2085](https://github.com/bucketeer-io/bucketeer/issues/2085)) ([a80039b](https://github.com/bucketeer-io/bucketeer/commit/a80039b8e69da41ddf740045bee4c4307114288d))
34+
35+
36+
### Build System
37+
38+
* **deps-dev:** bump vite from 7.0.6 to 7.0.7 in /ui/dashboard ([#2117](https://github.com/bucketeer-io/bucketeer/issues/2117)) ([ec2d34b](https://github.com/bucketeer-io/bucketeer/commit/ec2d34b0f7563a323456aac2fb3e552e4fd384b2))
39+
* **deps:** bump axios from 1.11.0 to 1.12.0 in /ui/dashboard ([#2122](https://github.com/bucketeer-io/bucketeer/issues/2122)) ([c75bc33](https://github.com/bucketeer-io/bucketeer/commit/c75bc33ce1b90405c4190bacf22cb1dbabe5ad4d))
40+
* **deps:** bump the dependencies group with 14 updates ([#2100](https://github.com/bucketeer-io/bucketeer/issues/2100)) ([d62102f](https://github.com/bucketeer-io/bucketeer/commit/d62102fad6c6ca998f7c1015e3f29c156a8fc0e9))
41+
* **deps:** bump the dependencies group with 14 updates ([#2129](https://github.com/bucketeer-io/bucketeer/issues/2129)) ([cd69a01](https://github.com/bucketeer-io/bucketeer/commit/cd69a01030abdf660d653f4b6abdaa6cb8db6f29))
42+
343
## [2.0.0](https://github.com/bucketeer-io/bucketeer/compare/v1.3.0...v2.0.0) (2025-08-27)
444

545

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ proto-all: proto-fmt proto-lock-commit proto-go proto-web proto-openapi-gen
8888
proto-go:
8989
make -C proto go
9090

91-
.PHONY: proto-web
92-
proto-web:
93-
make -C ui/web-v2 gen_proto
94-
9591
.PHONY: proto-go-check
9692
proto-go-check:
9793
make -C proto go-check
@@ -143,16 +139,12 @@ $(GO_APP_BUILD_TARGETS): build-%:
143139

144140
.PHONY: clean-web-console
145141
clean-web-console:
146-
rm -rf ui/web-v2/dist/*
147142
rm -rf ui/dashboard/build/*
148-
touch ui/web-v2/dist/DONT-EDIT-FILES-IN-THIS-DIRECTORY
149143
touch ui/dashboard/build/DONT-EDIT-FILES-IN-THIS-DIRECTORY
150144

151145
.PHONY: build-web-console
152146
build-web-console:
153-
rm -rf ui/web-v2/dist/*
154147
rm -rf ui/dashboard/build/*
155-
make -C ui/web-v2 install build
156148
make -C ui/dashboard install build
157149

158150
.PHONY: build-go

cmd/api/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"log"
1919

20-
"github.com/bucketeer-io/bucketeer/pkg/api/cmd"
21-
"github.com/bucketeer-io/bucketeer/pkg/cli"
20+
"github.com/bucketeer-io/bucketeer/v2/pkg/api/cmd"
21+
"github.com/bucketeer-io/bucketeer/v2/pkg/cli"
2222
)
2323

2424
var (

0 commit comments

Comments
 (0)