@liquidmetal-ai/drizzle 0.4.11 → 0.4.13

package/src/appify/build.ts

@@ -107,6 +107,27 @@ function buildName1(node: StanzaNode): [TokenString, ConfigError[]] {
   return [node.args[0], errors];
 }
 
+// buildOptionalName is a helper function for parsing an optional name from a stanza
+// node arguments. Returns undefined if no name is provided.
+function buildOptionalName(node: StanzaNode): [TokenString | undefined, ConfigError[]] {
+  const errors: ConfigError[] = [];
+  
+  if (node.args.length === 0) {
+    return [undefined, errors];
+  }
+  
+  if (node.args.length > 1) {
+    errors.push({ message: 'unexpected additional args', ...node });
+  }
+  
+  if (node.args[0]?.type !== 'string') {
+    errors.push({ message: 'expected string', ...node.args[0]! });
+    return [undefined, errors];
+  }
+  
+  return [node.args[0], errors];
+}
+
 // buildStanza is a helper to build different stanzas into a parent
 // object.
 function buildStanza<T>(
@@ -219,8 +240,8 @@ export function buildApplication(node: StanzaNode): [Application | undefined, Co
           case 'smartbucket':
             buildStanza(buildSmartBucket, child, app.smartBucket, errors);
             break;
-          case 'agent_memory':
-            buildStanza(buildAgentMemory, child, app.agentMemory, errors);
+          case 'smartmemory':
+            buildStanza(buildSmartMemory, child, app.smartMemory, errors);
             break;
           default:
             errors.push({ message: 'unexpected stanza', ...child });
@@ -476,11 +497,11 @@ function buildSmartBucket(stanza: StanzaNode): [SmartBucket, ConfigError[]] {
   return [smartBucket, errors];
 }
 
-function buildAgentMemory(stanza: StanzaNode): [AgentMemory, ConfigError[]] {
+function buildSmartMemory(stanza: StanzaNode): [SmartMemory, ConfigError[]] {
   const errors: ConfigError[] = [];
   const [name, nameErrors] = buildName1(stanza);
   errors.push(...nameErrors);
-  const agentMemory = new AgentMemory(name, stanza);
+  const smartMemory = new SmartMemory(name, stanza);
   for (const child of stanza.block?.children ?? []) {
     switch (child.type) {
       case 'comment':
@@ -490,7 +511,7 @@ function buildAgentMemory(stanza: StanzaNode): [AgentMemory, ConfigError[]] {
         errors.push({ message: `unexpected ${child.type}`, ...child });
     }
   }
-  return [agentMemory, errors];
+  return [smartMemory, errors];
 }
 
 function buildObserver(stanza: StanzaNode): [Observer, ConfigError[]] {
@@ -547,6 +568,12 @@ function buildActor(stanza: StanzaNode): [Actor, ConfigError[]] {
     switch (child.type) {
       case 'stanza':
         switch (child.name) {
+          case 'route':
+            buildStanza(buildRoute, child, actor.routes, errors);
+            break;
+          case 'domain':
+            buildStanza(buildDomain, child, actor.domains, errors);
+            break;
           case 'binding':
             buildStanza(buildBinding, child, actor.bindings, errors);
             break;
@@ -686,10 +713,9 @@ function buildSource(stanza: StanzaNode): [Source, ConfigError[]] {
 
 function buildRoute(stanza: StanzaNode): [Route | undefined, ConfigError[]] {
   const errors: ConfigError[] = [];
-  if (stanza.args.length > 0) {
-    errors.push({ message: 'unexpected arguments/names', ...stanza });
-  }
-  const route = new Route(stanza);
+  const [name, nameErrors] = buildOptionalName(stanza);
+  errors.push(...nameErrors);
+  const route = new Route(stanza, name);
   for (const child of stanza.block?.children ?? []) {
     if (child.type === 'assignment') {
       switch (child.key.value) {
@@ -718,10 +744,9 @@ function buildRoute(stanza: StanzaNode): [Route | undefined, ConfigError[]] {
 
 function buildDomain(stanza: StanzaNode): [Domain, ConfigError[]] {
   const errors: ConfigError[] = [];
-  if (stanza.args.length > 0) {
-    errors.push({ message: 'unexpected arguments/names', ...stanza });
-  }
-  const domain = new Domain(stanza);
+  const [name, nameErrors] = buildOptionalName(stanza);
+  errors.push(...nameErrors);
+  const domain = new Domain(stanza, name);
   for (const child of stanza.block?.children ?? []) {
     if (child.type === 'assignment') {
       switch (child.key.value) {
@@ -798,7 +823,7 @@ export class Application {
   vectorIndex: VectorIndex[] = [];
   kvStore: KvStore[] = [];
   smartBucket: SmartBucket[] = [];
-  agentMemory: AgentMemory[] = [];
+  smartMemory: SmartMemory[] = [];
   labels: Record<string, string> = {};
 
   constructor(name: TokenString, obj: ConfigObject) {
@@ -831,6 +856,8 @@ export class Service {
 export class Actor {
   obj: ConfigObject;
   name: TokenString;
+  routes: Route[] = [];
+  domains: Domain[] = [];
   bindings: Binding[] = [];
   env: Env[] = [];
   visibility?: TokenString;
@@ -901,23 +928,27 @@ export class Rule {
 
 export class Route {
   obj: ConfigObject;
+  name?: TokenString;
   zone?: TokenString;
   domain?: TokenString;
   cname?: TokenString;
   path?: TokenString;
 
-  constructor(obj: ConfigObject) {
+  constructor(obj: ConfigObject, name?: TokenString) {
     this.obj = obj;
+    this.name = name;
   }
 }
 
 export class Domain {
   obj: ConfigObject;
+  name?: TokenString;
   cname?: TokenString;
   fqdn?: TokenString;
 
-  constructor(obj: ConfigObject) {
+  constructor(obj: ConfigObject, name?: TokenString) {
     this.obj = obj;
+    this.name = name;
   }
 }
 
@@ -1013,7 +1044,7 @@ export class SmartBucket {
   }
 }
 
-export class AgentMemory {
+export class SmartMemory {
   name: TokenString;
   obj: ConfigObject;
 

package/src/appify/validate.test.ts

@@ -86,6 +86,33 @@ application "my-app" {
   ]);
 });
 
+test('domainValidator works for actors', async () => {
+  const manifest = `
+application "my-app" {
+  actor "my-actor" {
+    domain {
+      fqdn = "not-valid.com_foo"
+    }
+  }
+}
+`;
+  const tokenizer = new Tokenizer(manifest);
+  const parser = new Parser(tokenizer);
+  const parsedManifest = parser.parse();
+  const [builtApps] = buildManifest(parsedManifest);
+  const validateErrors = await validate(builtApps, VALIDATORS);
+  expect(validateErrors).toMatchObject([
+    {
+      message: 'domain "not-valid.com_foo" is an invalid domain name',
+      line: 4,
+      column: 5,
+      start: 49,
+      end: 96,
+      severity: 'error',
+    },
+  ]);
+});
+
 test('domainValidator ensures domain.fqdn is valid but ignores variable interpolation', async () => {
   const manifest = `
 application "my-app" {

package/src/appify/validate.ts

@@ -89,6 +89,7 @@ async function validateActors(app: Application, validator: Validator, errors: Va
   for (const actor of app.actor) {
     await validateHelper(validator.onActor, app, actor, errors);
     await validateBindings(app, actor, validator, errors);
+    await validateDomains(app, actor, validator, errors);
     await validateEnvs(app, actor, validator, errors);
   }
 }

package/src/liquidmetal/v1alpha1/bucket_api_pb.ts

@@ -0,0 +1,249 @@
+// @generated by protoc-gen-es v2.2.5 with parameter "target=ts,import_extension=.js"
+// @generated from file liquidmetal/v1alpha1/bucket_api.proto (package liquidmetal.v1alpha1, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file liquidmetal/v1alpha1/bucket_api.proto.
+ */
+export const file_liquidmetal_v1alpha1_bucket_api: GenFile = /*@__PURE__*/
+  fileDesc("CiVsaXF1aWRtZXRhbC92MWFscGhhMS9idWNrZXRfYXBpLnByb3RvEhRsaXF1aWRtZXRhbC52MWFscGhhMSK4AQoMUzNDcmVkZW50aWFsEhIKCmFjY2Vzc19rZXkYASABKAkSEgoKc2VjcmV0X2tleRgCIAEoCRIMCgRuYW1lGAMgASgJEi4KCmNyZWF0ZWRfYXQYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjMKCmV4cGlyZXNfYXQYBSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQFCDQoLX2V4cGlyZXNfYXQiGAoWTGlzdENyZWRlbnRpYWxzUmVxdWVzdCJSChdMaXN0Q3JlZGVudGlhbHNSZXNwb25zZRI3CgtjcmVkZW50aWFscxgBIAMoCzIiLmxpcXVpZG1ldGFsLnYxYWxwaGExLlMzQ3JlZGVudGlhbCJrChdDcmVhdGVDcmVkZW50aWFsUmVxdWVzdBIMCgRuYW1lGAEgASgJEjMKCmV4cGlyZXNfYXQYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSACIAQFCDQoLX2V4cGlyZXNfYXQiUgoYQ3JlYXRlQ3JlZGVudGlhbFJlc3BvbnNlEjYKCmNyZWRlbnRpYWwYASABKAsyIi5saXF1aWRtZXRhbC52MWFscGhhMS5TM0NyZWRlbnRpYWwiKgoUR2V0Q3JlZGVudGlhbFJlcXVlc3QSEgoKYWNjZXNzX2tleRgBIAEoCSJPChVHZXRDcmVkZW50aWFsUmVzcG9uc2USNgoKY3JlZGVudGlhbBgBIAEoCzIiLmxpcXVpZG1ldGFsLnYxYWxwaGExLlMzQ3JlZGVudGlhbCItChdEZWxldGVDcmVkZW50aWFsUmVxdWVzdBISCgphY2Nlc3Nfa2V5GAEgASgJIisKGERlbGV0ZUNyZWRlbnRpYWxSZXNwb25zZRIPCgdkZWxldGVkGAEgASgIMtUDChNTM0NyZWRlbnRpYWxTZXJ2aWNlEm4KD0xpc3RDcmVkZW50aWFscxIsLmxpcXVpZG1ldGFsLnYxYWxwaGExLkxpc3RDcmVkZW50aWFsc1JlcXVlc3QaLS5saXF1aWRtZXRhbC52MWFscGhhMS5MaXN0Q3JlZGVudGlhbHNSZXNwb25zZRJxChBDcmVhdGVDcmVkZW50aWFsEi0ubGlxdWlkbWV0YWwudjFhbHBoYTEuQ3JlYXRlQ3JlZGVudGlhbFJlcXVlc3QaLi5saXF1aWRtZXRhbC52MWFscGhhMS5DcmVhdGVDcmVkZW50aWFsUmVzcG9uc2USaAoNR2V0Q3JlZGVudGlhbBIqLmxpcXVpZG1ldGFsLnYxYWxwaGExLkdldENyZWRlbnRpYWxSZXF1ZXN0GisubGlxdWlkbWV0YWwudjFhbHBoYTEuR2V0Q3JlZGVudGlhbFJlc3BvbnNlEnEKEERlbGV0ZUNyZWRlbnRpYWwSLS5saXF1aWRtZXRhbC52MWFscGhhMS5EZWxldGVDcmVkZW50aWFsUmVxdWVzdBouLmxpcXVpZG1ldGFsLnYxYWxwaGExLkRlbGV0ZUNyZWRlbnRpYWxSZXNwb25zZULpAQoYY29tLmxpcXVpZG1ldGFsLnYxYWxwaGExQg5CdWNrZXRBcGlQcm90b1ABWkxnaXRodWIuY29tL2xpcXVpZG1ldGFsLWFpL3Byb3RvZ2VuMi9saXF1aWRtZXRhbC92MWFscGhhMTtsaXF1aWRtZXRhbHYxYWxwaGExogIDTFhYqgIUTGlxdWlkbWV0YWwuVjFhbHBoYTHKAhRMaXF1aWRtZXRhbFxWMWFscGhhMeICIExpcXVpZG1ldGFsXFYxYWxwaGExXEdQQk1ldGFkYXRh6gIVTGlxdWlkbWV0YWw6OlYxYWxwaGExYgZwcm90bzM", [file_google_protobuf_timestamp]);
+
+/**
+ * S3 credential record
+ *
+ * @generated from message liquidmetal.v1alpha1.S3Credential
+ */
+export type S3Credential = Message<"liquidmetal.v1alpha1.S3Credential"> & {
+  /**
+   * @generated from field: string access_key = 1;
+   */
+  accessKey: string;
+
+  /**
+   * @generated from field: string secret_key = 2;
+   */
+  secretKey: string;
+
+  /**
+   * @generated from field: string name = 3;
+   */
+  name: string;
+
+  /**
+   * @generated from field: google.protobuf.Timestamp created_at = 4;
+   */
+  createdAt?: Timestamp;
+
+  /**
+   * @generated from field: optional google.protobuf.Timestamp expires_at = 5;
+   */
+  expiresAt?: Timestamp;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.S3Credential.
+ * Use `create(S3CredentialSchema)` to create a new message.
+ */
+export const S3CredentialSchema: GenMessage<S3Credential> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 0);
+
+/**
+ * List credentials request
+ *
+ * @generated from message liquidmetal.v1alpha1.ListCredentialsRequest
+ */
+export type ListCredentialsRequest = Message<"liquidmetal.v1alpha1.ListCredentialsRequest"> & {
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.ListCredentialsRequest.
+ * Use `create(ListCredentialsRequestSchema)` to create a new message.
+ */
+export const ListCredentialsRequestSchema: GenMessage<ListCredentialsRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 1);
+
+/**
+ * List credentials response
+ *
+ * @generated from message liquidmetal.v1alpha1.ListCredentialsResponse
+ */
+export type ListCredentialsResponse = Message<"liquidmetal.v1alpha1.ListCredentialsResponse"> & {
+  /**
+   * @generated from field: repeated liquidmetal.v1alpha1.S3Credential credentials = 1;
+   */
+  credentials: S3Credential[];
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.ListCredentialsResponse.
+ * Use `create(ListCredentialsResponseSchema)` to create a new message.
+ */
+export const ListCredentialsResponseSchema: GenMessage<ListCredentialsResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 2);
+
+/**
+ * Create credential request
+ *
+ * @generated from message liquidmetal.v1alpha1.CreateCredentialRequest
+ */
+export type CreateCredentialRequest = Message<"liquidmetal.v1alpha1.CreateCredentialRequest"> & {
+  /**
+   * @generated from field: string name = 1;
+   */
+  name: string;
+
+  /**
+   * @generated from field: optional google.protobuf.Timestamp expires_at = 2;
+   */
+  expiresAt?: Timestamp;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.CreateCredentialRequest.
+ * Use `create(CreateCredentialRequestSchema)` to create a new message.
+ */
+export const CreateCredentialRequestSchema: GenMessage<CreateCredentialRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 3);
+
+/**
+ * Create credential response
+ *
+ * @generated from message liquidmetal.v1alpha1.CreateCredentialResponse
+ */
+export type CreateCredentialResponse = Message<"liquidmetal.v1alpha1.CreateCredentialResponse"> & {
+  /**
+   * @generated from field: liquidmetal.v1alpha1.S3Credential credential = 1;
+   */
+  credential?: S3Credential;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.CreateCredentialResponse.
+ * Use `create(CreateCredentialResponseSchema)` to create a new message.
+ */
+export const CreateCredentialResponseSchema: GenMessage<CreateCredentialResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 4);
+
+/**
+ * Get credential request
+ *
+ * @generated from message liquidmetal.v1alpha1.GetCredentialRequest
+ */
+export type GetCredentialRequest = Message<"liquidmetal.v1alpha1.GetCredentialRequest"> & {
+  /**
+   * @generated from field: string access_key = 1;
+   */
+  accessKey: string;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.GetCredentialRequest.
+ * Use `create(GetCredentialRequestSchema)` to create a new message.
+ */
+export const GetCredentialRequestSchema: GenMessage<GetCredentialRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 5);
+
+/**
+ * Get credential response
+ *
+ * @generated from message liquidmetal.v1alpha1.GetCredentialResponse
+ */
+export type GetCredentialResponse = Message<"liquidmetal.v1alpha1.GetCredentialResponse"> & {
+  /**
+   * @generated from field: liquidmetal.v1alpha1.S3Credential credential = 1;
+   */
+  credential?: S3Credential;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.GetCredentialResponse.
+ * Use `create(GetCredentialResponseSchema)` to create a new message.
+ */
+export const GetCredentialResponseSchema: GenMessage<GetCredentialResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 6);
+
+/**
+ * Delete credential request
+ *
+ * @generated from message liquidmetal.v1alpha1.DeleteCredentialRequest
+ */
+export type DeleteCredentialRequest = Message<"liquidmetal.v1alpha1.DeleteCredentialRequest"> & {
+  /**
+   * @generated from field: string access_key = 1;
+   */
+  accessKey: string;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.DeleteCredentialRequest.
+ * Use `create(DeleteCredentialRequestSchema)` to create a new message.
+ */
+export const DeleteCredentialRequestSchema: GenMessage<DeleteCredentialRequest> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 7);
+
+/**
+ * Delete credential response
+ *
+ * @generated from message liquidmetal.v1alpha1.DeleteCredentialResponse
+ */
+export type DeleteCredentialResponse = Message<"liquidmetal.v1alpha1.DeleteCredentialResponse"> & {
+  /**
+   * @generated from field: bool deleted = 1;
+   */
+  deleted: boolean;
+};
+
+/**
+ * Describes the message liquidmetal.v1alpha1.DeleteCredentialResponse.
+ * Use `create(DeleteCredentialResponseSchema)` to create a new message.
+ */
+export const DeleteCredentialResponseSchema: GenMessage<DeleteCredentialResponse> = /*@__PURE__*/
+  messageDesc(file_liquidmetal_v1alpha1_bucket_api, 8);
+
+/**
+ * S3 credential management service
+ *
+ * @generated from service liquidmetal.v1alpha1.S3CredentialService
+ */
+export const S3CredentialService: GenService<{
+  /**
+   * @generated from rpc liquidmetal.v1alpha1.S3CredentialService.ListCredentials
+   */
+  listCredentials: {
+    methodKind: "unary";
+    input: typeof ListCredentialsRequestSchema;
+    output: typeof ListCredentialsResponseSchema;
+  },
+  /**
+   * @generated from rpc liquidmetal.v1alpha1.S3CredentialService.CreateCredential
+   */
+  createCredential: {
+    methodKind: "unary";
+    input: typeof CreateCredentialRequestSchema;
+    output: typeof CreateCredentialResponseSchema;
+  },
+  /**
+   * @generated from rpc liquidmetal.v1alpha1.S3CredentialService.GetCredential
+   */
+  getCredential: {
+    methodKind: "unary";
+    input: typeof GetCredentialRequestSchema;
+    output: typeof GetCredentialResponseSchema;
+  },
+  /**
+   * @generated from rpc liquidmetal.v1alpha1.S3CredentialService.DeleteCredential
+   */
+  deleteCredential: {
+    methodKind: "unary";
+    input: typeof DeleteCredentialRequestSchema;
+    output: typeof DeleteCredentialResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_liquidmetal_v1alpha1_bucket_api, 0);
+