Sync changes from individual SDK repos (#376)

openfga · Jun 11, 2024 · e5c5adc · e5c5adc
2 parents cefcb01 + 72f80d2
commit e5c5adc
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/config/clients/dotnet/template/.github/workflows/main.yaml.mustache b/config/clients/dotnet/template/.github/workflows/main.yaml.mustache
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 
@@ -30,13 +30,13 @@ jobs:
       - name: Test
         run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
-      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.1
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.1
         with:
           name: nuget-package
           path: src/<%packageName%>/bin/Release/<%packageName%>.*.nupkg
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+        uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -48,7 +48,7 @@ jobs:
     needs: [test]
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 
@@ -66,7 +66,7 @@ jobs:
       - name: Build
         run: dotnet build --no-restore --configuration Release
 
-      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.1
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.1
         with:
           name: nuget-package
           path: src/<%packageName%>/bin/Release/<%packageName%>.*.nupkg
@@ -82,7 +82,7 @@ jobs:
     needs: publish
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 

diff --git a/config/clients/dotnet/template/netcore_testproject.mustache b/config/clients/dotnet/template/netcore_testproject.mustache
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07"><PrivateAssets>all</PrivateAssets></PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"><PrivateAssets>all</PrivateAssets></PackageReference>
     <PackageReference Include="Moq" Version="4.20.70"><PrivateAssets>all</PrivateAssets></PackageReference>
-    <PackageReference Include="xunit" Version="2.8.0"><PrivateAssets>all</PrivateAssets></PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageReference Include="xunit" Version="2.8.1"><PrivateAssets>all</PrivateAssets></PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/config/clients/go/template/example/example1/example1.go b/config/clients/go/template/example/example1/example1.go
@@ -3,10 +3,11 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
+
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/openfga/go-sdk/credentials"
-	"os"
 )
 
 func mainInner() error {
@@ -265,11 +266,11 @@ func mainInner() error {
 	fmt.Println("Listing user who have access to object")
 	listUsersResponse, err := fgaClient.ListUsers(ctx).Body(client.ClientListUsersRequest{
 		Relation: "viewer",
-		Object: openfga.Object{
+		Object: openfga.FgaObject{
 			Type: "document",
 			Id:   "roadmap",
 		},
-		UserFilters: []openfga.ListUsersFilter{{
+		UserFilters: []openfga.UserTypeFilter{{
 			Type: "user",
 		}},
 	}).Execute()

diff --git a/config/clients/java/template/.github/workflows/main.yaml.mustache b/config/clients/java/template/.github/workflows/main.yaml.mustache
@@ -17,7 +17,7 @@ jobs:
         java: [11, 17, 21]
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - name: Set up JDK
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
@@ -35,7 +35,7 @@ jobs:
 
       - if: matrix.java == 11
         name: Upload coverage to Codecov
-        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+        uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -51,7 +51,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - name: Set up JDK
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
@@ -84,7 +84,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - name: Set up JDK
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
@@ -112,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - uses: Roang-zero1/github-create-release-action@57eb9bdce7a964e48788b9e78b5ac766cb684803 # v3.0.1
         with:

diff --git a/config/clients/java/template/build.gradle.mustache b/config/clients/java/template/build.gradle.mustache
@@ -61,7 +61,7 @@ ext {
     {{#swagger2AnnotationLibrary}}
     swagger_annotations_version = "2.2.9"
     {{/swagger2AnnotationLibrary}}
-    jackson_version = "2.17.0"
+    jackson_version = "2.17.1"
     junit_version = "5.10.2"
     {{#hasFormParamsInSpec}}
     httpmime_version = "4.5.13"
@@ -96,7 +96,7 @@ testing {
                 implementation "org.junit.jupiter:junit-jupiter:$junit_version"
                 implementation "org.mockito:mockito-core:5.+"
                 runtimeOnly "org.junit.platform:junit-platform-launcher"
-                implementation "org.wiremock:wiremock:3.5.4"
+                implementation "org.wiremock:wiremock:3.6.0"
 
                 // This test-only dependency is convenient but not widely used.
                 // Review project activity before updating the version here.
@@ -122,8 +122,8 @@ testing {
             dependencies {
                 implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
                 implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
-                implementation "org.testcontainers:junit-jupiter:1.19.7"
-                implementation "org.testcontainers:openfga:1.19.7"
+                implementation "org.testcontainers:junit-jupiter:1.19.8"
+                implementation "org.testcontainers:openfga:1.19.8"
                 implementation project()
             }
 

diff --git a/config/clients/js/template/.github/dependabot.yaml b/config/clients/js/template/.github/dependabot.yaml
@@ -8,13 +8,13 @@ updates:
      dependencies:
         patterns:
           - "*"
+        exclude-patterns:
+          - "eslint"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
      dependencies:
         patterns:
-          - "*"
-        exclude-patterns:
-          - "eslint"
+          - "*"
diff --git a/config/clients/js/template/.github/workflows/main.yaml.mustache b/config/clients/js/template/.github/workflows/main.yaml.mustache
@@ -19,7 +19,7 @@ jobs:
         node-version: [14, 16, 18, 20]
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 
@@ -65,7 +65,7 @@ jobs:
         run: npm test
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+        uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -81,7 +81,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0
 
@@ -111,7 +111,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           fetch-depth: 0