feat: upgrade deps and add other proto clients (#223)

This upgrades the dependencies, removes renovate (since all deps are wider ranges) and adds other service clients
smartive · Mar 15, 2024 · c1e8bf0 · c1e8bf0
1 parent 3c422e8
commit c1e8bf0
Show file tree

Hide file tree

Showing 23 changed files with 887 additions and 234 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,17 +13,19 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: true
           token: ${{ secrets.DEPLOY_TOKEN }}
       - uses: dart-lang/setup-dart@v1
         with:
           sdk: stable
-      - uses: arduino/setup-protoc@v1
+      - uses: bufbuild/buf-setup-action@v1
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: enable protoc dart
-        run: dart pub global activate protoc_plugin
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: extractions/setup-just@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: just install-tools
       - run: dart pub get
+      - run: just
       - name: release
         uses: cycjimmy/semantic-release-action@v3
         with:

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -7,31 +7,25 @@ on:
 
 jobs:
   lint_and_test:
-    strategy:
-      fail-fast: true
-      matrix:
-        sdk:
-          - 2.18.0
-          - stable
     name: Linting and Testing
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: true
       - uses: dart-lang/setup-dart@v1
         with:
-          sdk: ${{ matrix.sdk }}
+          sdk: stable
+      - uses: bufbuild/buf-setup-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: extractions/setup-just@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: arduino/setup-protoc@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: enable protoc dart
-        run: dart pub global activate protoc_plugin
-      - name: build gRPC
-        run: ./tool/generate_grpc.sh
+      - run: just install-tools
       - run: dart pub get
-      - name: build barrel files
-        run: ./tool/generate_barrel_files.dart
+      - run: just
       - run: dart analyze
       - run: dart test
 
@@ -54,21 +48,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: true
       - uses: dart-lang/setup-dart@v1
         with:
           sdk: stable
+      - uses: bufbuild/buf-setup-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: extractions/setup-just@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: arduino/setup-protoc@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: enable protoc dart
-        run: dart pub global activate protoc_plugin
+      - run: just install-tools
       - run: dart pub get
-      - name: build gRPC
-        run: ./tool/generate_grpc.sh
-      - name: build barrel files
-        run: ./tool/generate_barrel_files.dart
+      - run: just
       - run: echo '### Publish Pub Package Result' >> $GITHUB_STEP_SUMMARY
       - run: dart pub publish --dry-run >> $GITHUB_STEP_SUMMARY
         continue-on-error: true

diff --git a/.gitmodules b/.gitmodules
diff --git a/.pubignore b/.pubignore
@@ -9,4 +9,6 @@ pubspec.lock
 external/
 
 renovate.json
+.releaserc.json
 analysis_options.yaml
+justfile
diff --git a/.releaserc.json b/.releaserc.json
@@ -15,7 +15,7 @@
       "@semantic-release/exec",
       {
         "verifyConditionsCmd": "if [ -z \"$CREDENTIALS\" ]; then exit 1; fi && mkdir -p ~/.config/dart && echo \"$CREDENTIALS\" > ~/.config/dart/pub-credentials.json",
-        "prepareCmd": "./tool/generate_grpc.sh && ./tool/generate_barrel_files.dart && sed -i 's/^version: .*$/version: ${nextRelease.version}/' pubspec.yaml",
+        "prepareCmd": "sed -i 's/^version: .*$/version: ${nextRelease.version}/' pubspec.yaml",
         "publishCmd": "dart pub publish -f"
       }
     ],

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -16,3 +16,4 @@ analyzer:
     - lib/src/grpc/generated
     - external/
     - example/
+    - tool/
diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -0,0 +1,7 @@
+version: v1
+managed:
+  enabled: true
+plugins:
+  - plugin: dart
+    out: lib/src/grpc/generated
+    opt: grpc
diff --git a/external/googleapis b/external/googleapis
diff --git a/external/grpc-gateway b/external/grpc-gateway
diff --git a/external/protobuf b/external/protobuf
diff --git a/external/protoc-gen-validate b/external/protoc-gen-validate
diff --git a/external/zitadel b/external/zitadel
diff --git a/justfile b/justfile
@@ -0,0 +1,15 @@
+proto_dir := "./lib/src/grpc/generated"
+
+default: clean generate-grpc
+
+clean:
+    @rm -rf {{proto_dir}}
+
+generate-grpc: && generate-barrel-files
+    buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel --include-imports --include-wkt
+
+generate-barrel-files:
+    dart tool/barrel_file_generator.dart
+
+install-tools:
+    dart pub global activate protoc_plugin
diff --git a/lib/src/credentials/service_account.dart b/lib/src/credentials/service_account.dart
@@ -50,7 +50,9 @@ class ServiceAccount {
   }
 
   static String _discoveryEndpoint(String endpoint) =>
-      endpoint.endsWith(discoveryEndpointPath) ? endpoint : '$endpoint$discoveryEndpointPath';
+      endpoint.endsWith(discoveryEndpointPath)
+          ? endpoint
+          : '$endpoint$discoveryEndpointPath';
 
   /// Create a JSON map from the application.
   Map<String, dynamic> toJson() => {
@@ -92,7 +94,8 @@ class ServiceAccount {
   ///   'https://issuer.zitadel.ch',
   ///   AuthenticationOptions(apiAccess: true));
   /// ```
-  Future<String> authenticate(String audience, [AuthenticationOptions? options]) async {
+  Future<String> authenticate(String audience,
+      [AuthenticationOptions? options]) async {
     options ??= AuthenticationOptions();
 
     final discoveryResponse = await get(
@@ -114,7 +117,8 @@ class ServiceAccount {
     );
 
     if (response.statusCode > 299) {
-      throw Exception('An error occurred. Status Code: ${response.statusCode}.');
+      throw Exception(
+          'An error occurred. Status Code: ${response.statusCode}.');
     }
 
     final json = jsonDecode(utf8.decode(response.bodyBytes));
@@ -127,13 +131,18 @@ class ServiceAccount {
       'iss': userId,
       'sub': userId,
       'iat': DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000,
-      'exp': DateTime.now().toUtc().add(Duration(hours: 1)).millisecondsSinceEpoch ~/ 1000,
+      'exp': DateTime.now()
+              .toUtc()
+              .add(Duration(hours: 1))
+              .millisecondsSinceEpoch ~/
+          1000,
       'aud': audience,
     });
 
     final builder = JsonWebSignatureBuilder();
     builder.jsonContent = claims.toJson();
-    builder.addRecipient(JsonWebKey.fromPem(key, keyId: keyId), algorithm: 'RS256');
+    builder.addRecipient(JsonWebKey.fromPem(key, keyId: keyId),
+        algorithm: 'RS256');
 
     final signature = builder.build();
 
@@ -181,8 +190,9 @@ class AuthenticationOptions {
   String createScopes() => [
         'openid',
         if (apiAccess) apiAccessScope,
-        for (var scope in additionalScopes) scope,
-        for (var audience in projectAudiences) 'urn:zitadel:iam:org:project:id:$audience:aud',
-        for (var role in roles) 'urn:zitadel:iam:org:project:role:$role',
+        for (final scope in additionalScopes) scope,
+        for (final audience in projectAudiences)
+          'urn:zitadel:iam:org:project:id:$audience:aud',
+        for (final role in roles) 'urn:zitadel:iam:org:project:role:$role',
       ].join(' ');
 }