Merge branch 'main' into feat/abac

# Conflicts: # proto/openfga/v1/openfga_service.pb.go
openfga · Nov 9, 2023 · c85ea63 · c85ea63
2 parents fb9e0a8 + 065343b
commit c85ea63
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 50 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+     dependencies:
+        patterns:
+          - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+     dependencies:
+        patterns:
+          - "*"
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -17,11 +17,14 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+        with:
+          fetch-depth: 0
+
+      - uses: bufbuild/buf-setup-action@a9cf7d0e410e4e9166fd3ffacd119a2cf0d50f2b # v1.27.1-1
         with:
           version: "1.15.1"
-      - uses: bufbuild/buf-push-action@v1
+      - uses: bufbuild/buf-push-action@1c45f6a21ec277ee4c1fa2772e49b9541ea17f38 # v1.1.1
         with:
           buf_token: ${{ secrets.BUF_TOKEN }}
       - name: Send PagerDuty alert on failure

diff --git a/.github/workflows/review.yaml b/.github/workflows/review.yaml
@@ -12,12 +12,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+        with:
+          fetch-depth: 0
+      - uses: bufbuild/buf-setup-action@a9cf7d0e410e4e9166fd3ffacd119a2cf0d50f2b # v1.27.1-1
         with:
           version: "1.15.1"
-      - uses: bufbuild/buf-lint-action@v1
-      - uses: bufbuild/buf-breaking-action@v1
+      - uses: bufbuild/buf-lint-action@044d13acb1f155179c606aaa2e53aea304d22058 # v1.1.0
+      - uses: bufbuild/buf-breaking-action@a074e988ee34efcd4927079e79c611f428354c01 # v1.1.3
         with:
           # The 'main' branch of the GitHub repository that defines the module.
           against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${GITHUB_BASE_REF}"
@@ -26,8 +28,10 @@ jobs:
   diff-openapi:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+        with:
+          fetch-depth: 0
+      - uses: bufbuild/buf-setup-action@a9cf7d0e410e4e9166fd3ffacd119a2cf0d50f2b # v1.27.1-1
         with:
           version: "1.15.1"
       - name: "Generate OpenAPI & Diff"
@@ -39,7 +43,9 @@ jobs:
   validate-openapi:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: char0n/swagger-editor-validate@v1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+        with:
+          fetch-depth: 0
+      - uses: char0n/swagger-editor-validate@65266f9d3147e446b96af879fd317ce6079529ea # v1.3.2
         with:
           definition-file: ./docs/openapiv2/apidocs.swagger.json
diff --git a/docs/openapiv2/apidocs.swagger.json b/docs/openapiv2/apidocs.swagger.json
diff --git a/openfga/v1/openfga_service.proto b/openfga/v1/openfga_service.proto
@@ -664,7 +664,8 @@ service OpenFGAService {
         "The response will contain the related objects in an array in the \"objects\" field of the response and they will "
         "be strings in the object format `<type>:<id>` (e.g. \"document:roadmap\").\n"
         "The number of objects in the response array will be limited by the execution timeout specified in the flag OPENFGA_LIST_OBJECTS_DEADLINE "
-        "and by the upper bound specified in the flag OPENFGA_LIST_OBJECTS_MAX_RESULTS, whichever is hit first."
+        "and by the upper bound specified in the flag OPENFGA_LIST_OBJECTS_MAX_RESULTS, whichever is hit first.\n"
+        "The objects given will not be sorted, and therefore two identical calls can give a given different set of objects."
     };
   }
 }

diff --git a/proto/go.mod b/proto/go.mod
@@ -1,12 +1,12 @@
 module github.com/openfga/api/proto
 
-go 1.20
+go 1.21.3
 
 require (
 	github.com/envoyproxy/protoc-gen-validate v1.0.2
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2
-	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
-	google.golang.org/grpc v1.57.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b
+	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 )
 
@@ -15,6 +15,6 @@ require (
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect
+	google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
 )
diff --git a/proto/go.sum b/proto/go.sum
diff --git a/proto/openfga/v1/openfga_service.pb.go b/proto/openfga/v1/openfga_service.pb.go