Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into dev_push

� Conflicts:
�	server/datasource/etcd/kv/kv_dao.go
  • Loading branch information
123yangxiong committed Nov 10, 2022
2 parents 1746498 + efee963 commit 025081b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/etcd_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.17
go-version: 1.18
id: go
- name: Checkout Source
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mongo_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.18
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@ require (
sigs.k8s.io/yaml v1.2.0 // indirect
)

go 1.17
go 1.18
2 changes: 1 addition & 1 deletion server/datasource/auth/decision.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func FilterLabel(targetResourceLabel []map[string]string, permLabelList []map[st

func LabelMatched(targetResourceLabel map[string]string, permLabel map[string]string) bool {
for k, v := range permLabel {
if vv, ok := targetResourceLabel[k]; ok && vv != v {
if vv := targetResourceLabel[k]; vv != v {
return false
}
}
Expand Down

0 comments on commit 025081b

Please sign in to comment.