From 50a125bff1624cd60aca63eb823651badd98cac9 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Tue, 11 Jun 2024 11:59:30 +0100 Subject: [PATCH 1/4] chore(dotnet-sdk): sync dependency updates --- .../template/.github/workflows/main.yaml.mustache | 12 ++++++------ .../dotnet/template/netcore_testproject.mustache | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/clients/dotnet/template/.github/workflows/main.yaml.mustache b/config/clients/dotnet/template/.github/workflows/main.yaml.mustache index b99e86fc..7a726cf3 100644 --- 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 index 3b414c23..6816229c 100644 --- a/config/clients/dotnet/template/netcore_testproject.mustache +++ b/config/clients/dotnet/template/netcore_testproject.mustache @@ -9,10 +9,10 @@ - all + all all - all - + all + all runtime; build; native; contentfiles; analyzers; buildtransitive From 936c6c5c2284b87e13ef1e57651e353d8f26f0ee Mon Sep 17 00:00:00 2001 From: Will Vedder Date: Tue, 11 Jun 2024 12:02:26 +0100 Subject: [PATCH 2/4] chore(go-sdk): sync example changes --- config/clients/go/template/example/example1/example1.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/clients/go/template/example/example1/example1.go b/config/clients/go/template/example/example1/example1.go index 97b06173..d14721fb 100644 --- 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() From 87e1ca0085509d5668e27dc7e882620ba4dc0370 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Tue, 11 Jun 2024 12:15:03 +0100 Subject: [PATCH 3/4] chore(java-sdk): sync dependency updates --- .../java/template/.github/workflows/main.yaml.mustache | 10 +++++----- config/clients/java/template/build.gradle.mustache | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/clients/java/template/.github/workflows/main.yaml.mustache b/config/clients/java/template/.github/workflows/main.yaml.mustache index 4d74a839..ad455a82 100644 --- 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 index e528f5cf..2724e885 100644 --- 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() } From 72f80d2dea675b6ea977b94dcd434ffe00b7badc Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Tue, 11 Jun 2024 12:23:59 +0100 Subject: [PATCH 4/4] chore(js-sdk): sync dependency updates and dependabot ignore --- config/clients/js/template/.github/dependabot.yaml | 6 +++--- .../js/template/.github/workflows/main.yaml.mustache | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/clients/js/template/.github/dependabot.yaml b/config/clients/js/template/.github/dependabot.yaml index 7ce60d74..03a1610e 100644 --- a/config/clients/js/template/.github/dependabot.yaml +++ b/config/clients/js/template/.github/dependabot.yaml @@ -8,6 +8,8 @@ updates: dependencies: patterns: - "*" + exclude-patterns: + - "eslint" - package-ecosystem: "github-actions" directory: "/" schedule: @@ -15,6 +17,4 @@ updates: groups: dependencies: patterns: - - "*" - exclude-patterns: - - "eslint" + - "*" \ No newline at end of file diff --git a/config/clients/js/template/.github/workflows/main.yaml.mustache b/config/clients/js/template/.github/workflows/main.yaml.mustache index ad5435eb..69242d4e 100644 --- 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