Skip to content

Commit

Permalink
chore: Use Go 1.22 (#1982)
Browse files Browse the repository at this point in the history
Signed-off-by: Charith Ellawala <charith@cerbos.dev>

---------

Signed-off-by: Charith Ellawala <charith@cerbos.dev>
  • Loading branch information
charithe committed Feb 12, 2024
1 parent e510788 commit d022db1
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-go/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
cache: false
check-latest: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
check-latest: true
cache: false
- name: golangci-lint
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '>=1.21'
go-version: '1.22.x'

- name: Test Helm chart
run: ./deploy/charts/validate.sh
16 changes: 8 additions & 8 deletions internal/test/testdata/.jsonschema/ProtoYamlTestCase.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"variables": {
"$ref": "#/definitions/cerbos.policy.v1.Variables"
Expand All @@ -75,7 +75,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
}
}
},
Expand Down Expand Up @@ -356,7 +356,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand All @@ -375,7 +375,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down Expand Up @@ -429,7 +429,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -442,7 +442,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down Expand Up @@ -470,7 +470,7 @@
},
"name": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"parentRoles": {
"type": "array",
Expand Down Expand Up @@ -549,7 +549,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down
16 changes: 8 additions & 8 deletions internal/test/testdata/.jsonschema/ServerTestCase.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"variables": {
"$ref": "#/definitions/cerbos.policy.v1.Variables"
Expand All @@ -367,7 +367,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
}
}
},
Expand Down Expand Up @@ -648,7 +648,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand All @@ -667,7 +667,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down Expand Up @@ -721,7 +721,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -734,7 +734,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down Expand Up @@ -762,7 +762,7 @@
},
"name": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"parentRoles": {
"type": "array",
Expand Down Expand Up @@ -1081,7 +1081,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down
6 changes: 3 additions & 3 deletions schema/jsonschema/cerbos/policy/v1/DerivedRoles.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},
"name": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"parentRoles": {
"type": "array",
Expand All @@ -134,7 +134,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down Expand Up @@ -164,7 +164,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"variables": {
"$ref": "#/definitions/cerbos.policy.v1.Variables"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
}
}
}
16 changes: 8 additions & 8 deletions schema/jsonschema/cerbos/policy/v1/Policy.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"variables": {
"$ref": "#/definitions/cerbos.policy.v1.Variables"
Expand All @@ -75,7 +75,7 @@
"name": {
"type": "string",
"minLength": 1,
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
}
}
},
Expand Down Expand Up @@ -281,7 +281,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand All @@ -300,7 +300,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down Expand Up @@ -354,7 +354,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -367,7 +367,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down Expand Up @@ -395,7 +395,7 @@
},
"name": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"parentRoles": {
"type": "array",
Expand Down Expand Up @@ -474,7 +474,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand All @@ -184,7 +184,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down
8 changes: 4 additions & 4 deletions schema/jsonschema/cerbos/policy/v1/ResourcePolicy.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -161,7 +161,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down Expand Up @@ -230,7 +230,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -254,7 +254,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down
4 changes: 2 additions & 2 deletions schema/jsonschema/cerbos/policy/v1/ResourceRule.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand All @@ -161,7 +161,7 @@
},
"name": {
"type": "string",
"pattern": "^([A-Za-z][\\--\\.0-9@-Z_a-z]*)*$"
"pattern": "^([A-Za-z][\\-\\.0-9@-Z_a-z]*)*$"
},
"output": {
"$ref": "#/definitions/cerbos.policy.v1.Output"
Expand Down
2 changes: 1 addition & 1 deletion schema/jsonschema/cerbos/policy/v1/RoleDef.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},
"name": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"parentRoles": {
"type": "array",
Expand Down
2 changes: 1 addition & 1 deletion schema/jsonschema/cerbos/policy/v1/Variables.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\--\\.0-9A-Z_a-z]+$"
"pattern": "^[\\-\\.0-9A-Z_a-z]+$"
},
"uniqueItems": true
},
Expand Down

0 comments on commit d022db1

Please sign in to comment.