Fix update protos workflow (#385)

Author: njooma

.github/workflows/update_protos.yml

@@ -21,8 +21,6 @@ jobs:
       - name: Update api
         run: |
           echo ${{ github.event.client_payload.tag }} > api_version.lock
-          sudo chown -R testbot .
-          sudo -u testbot bash -lc 'make update-buf'
 
       - name: Add + Commit + Open PR
         uses: peter-evans/create-pull-request@v6

Makefile

@@ -54,9 +54,9 @@ update-buf: $(node_modules)
 
 .PHONY: build-buf
 build-buf: $(node_modules) clean-buf
-	$(buf) generate $$(./scripts/get-buf-lock-version.js buf.build/googleapis/googleapis)
+	$(buf) generate buf.build/googleapis/googleapis
 	$(buf) generate buf.build/viamrobotics/api:$$(cat api_version.lock) --path common,component,robot,service,app,provisioning,tagger,stream
-	$(buf) generate $$(./scripts/get-buf-lock-version.js buf.build/viamrobotics/goutils)
+	$(buf) generate buf.build/viamrobotics/goutils
 
 # js targets
 

api_version.lock

@@ -1 +1 @@
-v0.1.345
+v0.1.347

buf.gen.yaml

@@ -1,8 +1,8 @@
-version: v1
+version: v2
 managed:
   enabled: true
 plugins:
-  - plugin: buf.build/connectrpc/es:v1.5.0
+  - remote: buf.build/connectrpc/es:v1.5.0
     out: src/gen
-  - plugin: buf.build/bufbuild/es:v1.10.0
+  - remote: buf.build/bufbuild/es:v1.10.0
     out: src/gen

buf.lock

@@ -51,10 +51,10 @@
   },
   "homepage": "https://github.com/viamrobotics/viam-typescript-sdk#readme",
   "dependencies": {
-    "exponential-backoff": "^3.1.1",
     "@bufbuild/protobuf": "^1.10.0",
-    "@connectrpc/connect": "^1.5.0",
-    "@connectrpc/connect-web": "^1.5.0"
+    "@connectrpc/connect": "^1.6.0",
+    "@connectrpc/connect-web": "^1.6.0",
+    "exponential-backoff": "^3.1.1"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.15.0-1",

buf.yaml

@@ -10,6 +10,11 @@ import {
   GetInvoicePdfResponse,
   GetInvoicesSummaryResponse,
   PaymentMethodType,
+  ResourceUsageCosts,
+  ResourceUsageCostsBySource,
+  SourceType,
+  UsageCost,
+  UsageCostType,
 } from '../gen/app/v1/billing_pb';
 import {
   BillingClient,
@@ -38,6 +43,17 @@ const testMonthUsage: GetCurrentMonthUsageResponse = {
   binaryDataCloudStorageUsageCost: 9,
   otherCloudStorageUsageCost: 10,
   perMachineUsageCost: 11,
+  subtotal: 12,
+  resourceUsageCostsBySource: [
+    new ResourceUsageCostsBySource({
+      sourceType: SourceType.ORG,
+      resourceUsageCosts: new ResourceUsageCosts({
+        usageCosts: [
+          new UsageCost({ resourceType: UsageCostType.UNSPECIFIED, cost: 13 }),
+        ],
+      }),
+    }),
+  ],
   startDate: testStartDate,
   endDate: testEndDate,
   start: new Date(SECONDS * 1000 + NANOS / 1_000_000),
@@ -81,6 +97,20 @@ describe('BillingClient tests', () => {
             binaryDataCloudStorageUsageCost: 9,
             otherCloudStorageUsageCost: 10,
             perMachineUsageCost: 11,
+            subtotal: 12,
+            resourceUsageCostsBySource: [
+              new ResourceUsageCostsBySource({
+                sourceType: SourceType.ORG,
+                resourceUsageCosts: new ResourceUsageCosts({
+                  usageCosts: [
+                    new UsageCost({
+                      resourceType: UsageCostType.UNSPECIFIED,
+                      cost: 13,
+                    }),
+                  ],
+                }),
+              }),
+            ],
             startDate: testStartDate,
             endDate: testEndDate,
           } as GetCurrentMonthUsageResponse;