style(oci-compute): apply GitHub lint diagnostics

Author: Bill Leoutsakos

apps/sim/blocks/blocks/oci_compute.ts

@@ -683,8 +683,13 @@ export async function executeOciComputeOperation(
       (values.metadata !== undefined || values.extendedMetadata !== undefined)
     ) {
       const current = await client.request({
-        endpoint, method: 'GET', encodedPath: `/20160918/instances/${encodeURIComponent(String(values.instanceId))}`,
-        timeoutMs: 30_000, maxResponseBytes: 2_000_000, signal, retry: { kind: 'safe', maxAttempts: 2 },
+        endpoint,
+        method: 'GET',
+        encodedPath: `/20160918/instances/${encodeURIComponent(String(values.instanceId))}`,
+        timeoutMs: 30_000,
+        maxResponseBytes: 2_000_000,
+        signal,
+        retry: { kind: 'safe', maxAttempts: 2 },
       })
       const existing = parseResource(current.body)
       if (!isPlainRecord(existing)) throw new Error('OCI returned an invalid instance')
@@ -693,48 +698,65 @@ export async function executeOciComputeOperation(
         const before = isPlainRecord(existing[field]) ? existing[field] : {}
         const after = isPlainRecord(values[field]) ? values[field] : {}
         for (const key of ['user_data', 'ssh_authorized_keys']) {
-          if (JSON.stringify(before[key]) !== JSON.stringify(after[key])) throw new Error(`Updating ${field} must preserve existing user_data and ssh_authorized_keys`)
+          if (JSON.stringify(before[key]) !== JSON.stringify(after[key]))
+            throw new Error(
+              `Updating ${field} must preserve existing user_data and ssh_authorized_keys`
+            )
         }
       }
       validateOciComputeMetadata({
         metadata: values.metadata ?? existing.metadata,
         extendedMetadata: values.extendedMetadata ?? existing.extendedMetadata,
       })
       if (!headers['if-match']) {
-        if (!current.headers.etag) throw new Error('OCI did not return an ETag for the metadata update')
+        if (!current.headers.etag)
+          throw new Error('OCI did not return an ETag for the metadata update')
         headers['if-match'] = current.headers.etag
       }
     }
     const path = definition.path.replace(/\{(\w+)\}/g, (_match, key: string) => {
-      const value = operation === 'instance_pool_action' && key === 'action'
-        ? String(values[key]).toLowerCase()
-        : String(values[key])
+      const value =
+        operation === 'instance_pool_action' && key === 'action'
+          ? String(values[key]).toLowerCase()
+          : String(values[key])
       return encodeURIComponent(value)
     })
     const queryPairs: [string, string][] = []
     for (const key of definition.query ?? []) {
       if (values[key] !== undefined) queryPairs.push([key, String(values[key])])
     }
     const base = {
-      endpoint, encodedPath: `/20160918${path}`, queryPairs, headers,
-      timeoutMs: 30_000, maxResponseBytes: 2_000_000, signal,
+      endpoint,
+      encodedPath: `/20160918${path}`,
+      queryPairs,
+      headers,
+      timeoutMs: 30_000,
+      maxResponseBytes: 2_000_000,
+      signal,
       responseHeaders: [
         ...(definition.query?.includes('page') ? ['opc-next-page'] : []),
         ...(definition.work ? ['opc-work-request-id'] : []),
         ...(definition.location ? ['location'] : []),
       ],
     }
     const body = requestBody(operation, values, definition)
-    const request: OciRequest = definition.method === 'GET'
-      ? { ...base, method: 'GET', retry: { kind: 'safe', maxAttempts: 2 } }
-      : definition.method === 'DELETE'
-        ? { ...base, method: 'DELETE' }
-        : {
-            ...base, method: definition.method as 'POST' | 'PUT',
-            body: body === undefined ? new Uint8Array() : new TextEncoder().encode(JSON.stringify(body)),
-            contentType: 'application/json',
-            ...(retryToken ? { retry: { kind: 'tokenized' as const, maxAttempts: 2, retryToken } } : {}),
-          }
+    const request: OciRequest =
+      definition.method === 'GET'
+        ? { ...base, method: 'GET', retry: { kind: 'safe', maxAttempts: 2 } }
+        : definition.method === 'DELETE'
+          ? { ...base, method: 'DELETE' }
+          : {
+              ...base,
+              method: definition.method as 'POST' | 'PUT',
+              body:
+                body === undefined
+                  ? new Uint8Array()
+                  : new TextEncoder().encode(JSON.stringify(body)),
+              contentType: 'application/json',
+              ...(retryToken
+                ? { retry: { kind: 'tokenized' as const, maxAttempts: 2, retryToken } }
+                : {}),
+            }
     signal?.throwIfAborted()
     dispatched = true
     const response = await client.request(request)
@@ -744,29 +766,37 @@ export async function executeOciComputeOperation(
       status: response.status,
       requestId: response.opcRequestId ?? response.headers['opc-request-id'] ?? null,
       etag: response.headers.etag ?? null,
-      ...(definition.query?.includes('page') ? { nextPage: response.headers['opc-next-page'] ?? null } : {}),
-      ...(definition.work ? { workRequestId: response.headers['opc-work-request-id'] ?? null } : {}),
+      ...(definition.query?.includes('page')
+        ? { nextPage: response.headers['opc-next-page'] ?? null }
+        : {}),
+      ...(definition.work
+        ? { workRequestId: response.headers['opc-work-request-id'] ?? null }
+        : {}),
       ...(definition.location ? { location: response.headers.location ?? null } : {}),
       ...(retryToken ? { retryToken } : {}),
     }
     if (definition.output && definition.projection) {
       const data = parseResource(response.body)
-      if (definition.list && (!Array.isArray(data) || data.length > 100)) throw new Error('OCI returned an invalid or oversized resource page')
-      const resource = definition.list && Array.isArray(data)
-        ? data.map((entry) => projectOciComputeResource(entry, definition.projection ?? {}))
-        : projectOciComputeResource(data, definition.projection)
+      if (definition.list && (!Array.isArray(data) || data.length > 100))
+        throw new Error('OCI returned an invalid or oversized resource page')
+      const resource =
+        definition.list && Array.isArray(data)
+          ? data.map((entry) => projectOciComputeResource(entry, definition.projection ?? {}))
+          : projectOciComputeResource(data, definition.projection)
       Object.assign(output, { [definition.output]: resource })
     }
     return { success: true, output }
   } catch (error) {
     const providerError = error instanceof OciClientError ? error : undefined
-    const rejected = !dispatched || (providerError?.status !== undefined && providerError.status < 500)
+    const rejected =
+      !dispatched || (providerError?.status !== undefined && providerError.status < 500)
     return {
       success: false,
       retryable: definition.method === 'GET',
-      error: providerError?.status === 412
-        ? 'The resource changed. Read its current state and ETag before submitting another update.'
-        : getErrorMessage(error, 'OCI Compute operation failed'),
+      error:
+        providerError?.status === 412
+          ? 'The resource changed. Read its current state and ETag before submitting another update.'
+          : getErrorMessage(error, 'OCI Compute operation failed'),
       output: {
         status: providerError?.status ?? receivedStatus ?? 0,
         requestId: providerError?.opcRequestId ?? receivedRequestId ?? null,

apps/sim/lib/internal/oci-compute/operations.ts

@@ -224,18 +224,40 @@ const placement = z
   })
   .strict()
 
-const common = z.object({
-  oauthCredential: id,
-  region: name.refine((region) => OCI_REGION_IDS.includes(region), 'Unrecognized OCI region'),
-  deliveryIdentity: z.object({ executionId: name, blockId: name, invocationId: name }).strict().optional(),
-}).strict()
-const paging = { limit: z.number().int().min(1).max(100).default(50), page: z.string().min(1).max(4096).optional() }
-const sorting = { sortBy: z.enum(['TIMECREATED', 'DISPLAYNAME']).optional(), sortOrder: z.enum(['ASC', 'DESC']).optional() }
+const common = z
+  .object({
+    oauthCredential: id,
+    region: name.refine((region) => OCI_REGION_IDS.includes(region), 'Unrecognized OCI region'),
+    deliveryIdentity: z
+      .object({ executionId: name, blockId: name, invocationId: name })
+      .strict()
+      .optional(),
+  })
+  .strict()
+const paging = {
+  limit: z.number().int().min(1).max(100).default(50),
+  page: z.string().min(1).max(4096).optional(),
+}
+const sorting = {
+  sortBy: z.enum(['TIMECREATED', 'DISPLAYNAME']).optional(),
+  sortOrder: z.enum(['ASC', 'DESC']).optional(),
+}
 const listing = { compartmentId: id, ...paging }
 const namedListing = { ...listing, ...sorting, displayName: name.optional() }
 const match = { ifMatch: z.string().min(1).max(1024).optional() }
-const token = { retryToken: z.string().min(1).max(64).regex(/^[\x21-\x7e]+$/, 'Retry token must use printable ASCII').optional() }
-const resourceTags = { displayName: name.optional(), freeformTags: json(tags).optional(), definedTags: json(definedTags).optional() }
+const token = {
+  retryToken: z
+    .string()
+    .min(1)
+    .max(64)
+    .regex(/^[\x21-\x7e]+$/, 'Retry token must use printable ASCII')
+    .optional(),
+}
+const resourceTags = {
+  displayName: name.optional(),
+  freeformTags: json(tags).optional(),
+  definedTags: json(definedTags).optional(),
+}
 const instance = { instanceId: id }
 const image = { imageId: id }
 const configuration = { instanceConfigurationId: id }
@@ -253,7 +275,12 @@ const source = {
 
 /** Only documented fields belonging to the selected operation are accepted. */
 export const ociComputeSchemas = {
-  list_instances: common.extend({ ...namedListing, availabilityDomain: name.optional(), lifecycleState: name.optional(), capacityReservationId: id.optional() }),
+  list_instances: common.extend({
+    ...namedListing,
+    availabilityDomain: name.optional(),
+    lifecycleState: name.optional(),
+    capacityReservationId: id.optional(),
+  }),
   get_instance: common.extend(instance),
   launch_instance: common.extend({
     compartmentId: id, availabilityDomain: name, shape: name, ...source, ...resourceTags, ...token,

apps/sim/lib/internal/oci-compute/schema.ts

@@ -169,10 +169,18 @@ describe('OCI Compute selectors', () => {
         nextPage: 'next',
       },
     })
-    expect(await execute(args({
-      selectorKey: 'oci_compute.subnets',
-      context: { region: 'us-ashburn-1', compartmentId: 'compartment', availabilityDomain: 'selected' },
-    }))).toEqual({ kind: 'list', items: [], nextCursor: 'next' })
+    expect(
+      await execute(
+        args({
+          selectorKey: 'oci_compute.subnets',
+          context: {
+            region: 'us-ashburn-1',
+            compartmentId: 'compartment',
+            availabilityDomain: 'selected',
+          },
+        })
+      )
+    ).toEqual({ kind: 'list', items: [], nextCursor: 'next' })
     expect(mocks.execute.mock.calls[0][2]).not.toHaveProperty('availabilityDomain')
   })
 

apps/sim/lib/selectors/server/providers/oci-compute.test.ts

@@ -1,8 +1,8 @@
 import {
   type OciComputeAttachInstancePoolInstanceParams,
   type OciComputeResponse,
-  POOL_INSTANCE_OUTPUT_PROPERTIES,
   ociComputeOperationInput,
+  POOL_INSTANCE_OUTPUT_PROPERTIES,
 } from '@/tools/oci_compute/types'
 import type { InternalToolConfig } from '@/tools/types'
 
@@ -56,11 +56,7 @@ export const ociComputeAttachInstancePoolInstanceTool: InternalToolConfig<
   },
   operation: {
     input: (params) =>
-      ociComputeOperationInput(params, [
-        'instancePoolId',
-        'instanceId',
-        'retryToken',
-      ]),
+      ociComputeOperationInput(params, ['instancePoolId', 'instanceId', 'retryToken']),
   },
   outputs: {
     status: { type: 'number', description: 'OCI HTTP response status' },

apps/sim/tools/oci_compute/attach_instance_pool_instance.ts

@@ -63,12 +63,7 @@ export const ociComputeChangeImageCompartmentTool: InternalToolConfig<
   },
   operation: {
     input: (params) =>
-      ociComputeOperationInput(params, [
-        'imageId',
-        'ifMatch',
-        'compartmentId',
-        'retryToken',
-      ]),
+      ociComputeOperationInput(params, ['imageId', 'ifMatch', 'compartmentId', 'retryToken']),
   },
   outputs: {
     status: { type: 'number', description: 'OCI HTTP response status' },

apps/sim/tools/oci_compute/change_image_compartment.ts

@@ -63,12 +63,7 @@ export const ociComputeChangeInstanceCompartmentTool: InternalToolConfig<
   },
   operation: {
     input: (params) =>
-      ociComputeOperationInput(params, [
-        'instanceId',
-        'ifMatch',
-        'compartmentId',
-        'retryToken',
-      ]),
+      ociComputeOperationInput(params, ['instanceId', 'ifMatch', 'compartmentId', 'retryToken']),
   },
   outputs: {
     status: { type: 'number', description: 'OCI HTTP response status' },

apps/sim/tools/oci_compute/change_instance_compartment.ts

@@ -1,8 +1,8 @@
 import {
   type OciComputeGetInstancePoolInstanceParams,
   type OciComputeResponse,
-  POOL_INSTANCE_OUTPUT_PROPERTIES,
   ociComputeOperationInput,
+  POOL_INSTANCE_OUTPUT_PROPERTIES,
 } from '@/tools/oci_compute/types'
 import type { InternalToolConfig } from '@/tools/types'
 

apps/sim/tools/oci_compute/get_instance_pool_instance.ts

@@ -1,8 +1,8 @@
 import {
   type OciComputeGetSubnetParams,
   type OciComputeResponse,
-  SUBNET_OUTPUT_PROPERTIES,
   ociComputeOperationInput,
+  SUBNET_OUTPUT_PROPERTIES,
 } from '@/tools/oci_compute/types'
 import type { InternalToolConfig } from '@/tools/types'
 

apps/sim/tools/oci_compute/get_subnet.ts

@@ -1,8 +1,8 @@
 import {
   type OciComputeGetVnicParams,
   type OciComputeResponse,
-  VNIC_OUTPUT_PROPERTIES,
   ociComputeOperationInput,
+  VNIC_OUTPUT_PROPERTIES,
 } from '@/tools/oci_compute/types'
 import type { InternalToolConfig } from '@/tools/types'