allow fully qualified topic and bucket names (#62)

Author: laurenzlong

src/builders/pubsub-builder.ts

@@ -45,10 +45,21 @@ export default class PubsubBuilder extends FunctionBuilder {
   }
 
   protected _toTrigger(event: string): TriggerDefinition {
+    const format = new RegExp('^(projects/([^/]+)/topics/)?([^/]+)$');
+    let match = this.topic.match(format);
+    if (!match) {
+      const errorString = 'Topic names must either have the format of'
+      + ' "topicId" or "projects/<projectId>/topics/<topicId>".';
+      throw new Error(errorString);
+    }
+    let [,,project, topic] = match;
+    if (project && project !== process.env.GCLOUD_PROJECT) {
+      throw new Error('Cannot use a topic that does not belong to this project.');
+    }
     return {
       eventTrigger: {
         eventType: 'providers/cloud.pubsub/eventTypes/' + event,
-        resource: 'projects/' + process.env.GCLOUD_PROJECT + '/topics/' + this.topic,
+        resource: 'projects/' + process.env.GCLOUD_PROJECT + '/topics/' + topic,
       },
     };
   }

src/builders/storage-builder.ts

@@ -73,10 +73,21 @@ export default class CloudStorageBuilder extends FunctionBuilder {
   }
 
   protected _toTrigger(event: string): TriggerDefinition {
+    let bucket;
+    if (this.bucket) {
+      const format = new RegExp('^(projects/_/buckets/)?([^/]+)$');
+      let match = this.bucket.match(format);
+      if (!match) {
+        const errorString = 'bucket names must either have the format of'
+        + ' "bucketId" or "projects/_/buckets/<bucketId>".';
+        throw new Error(errorString);
+      }
+      bucket = match[2];
+    }
     return {
       eventTrigger: {
         eventType: 'providers/cloud.storage/eventTypes/' + event,
-        resource: this.bucket? 'projects/' + process.env.GCLOUD_PROJECT + '/buckets/' + this.bucket: null,
+        resource: this.bucket? 'projects/_/buckets/' + bucket: null,
       },
     };
   }

test/builders/pubsub-builder.spec.ts

@@ -41,28 +41,61 @@ describe('PubsubMessage', () => {
 describe('CloudPubsubBuilder', () => {
   let subject: CloudPubsubBuilder;
   let env: FakeEnv;
+  let handler: (any) => any;
 
   beforeEach(() => {
     env = new FakeEnv();
     subject = new CloudPubsubBuilder(env, 'toppy');
+    handler = (data: Object) => {
+      return true;
+    };
+    process.env.GCLOUD_PROJECT = 'project1';
+  });
+
+  afterEach(() => {
+    delete process.env.GCLOUD_PROJECT;
   });
 
   describe('#onPublish', () => {
-    it('should return a CloudPubsubTriggerDefinition with appropriate values', () => {
-      let handler = (data: Object) => {
-        return true;
-      };
+    it('should return a TriggerDefinition with appropriate values', () => {
       let result = subject.onPublish(handler);
       expect(result.__trigger).to.deep.equal({
         eventTrigger: {
           eventType: 'providers/cloud.pubsub/eventTypes/topic.publish',
-          resource: 'projects/undefined/topics/toppy',
+          resource: 'projects/project1/topics/toppy',
         },
       });
     });
 
+    it ('should allow fully qualified topic names', () => {
+      let subjectQualified = new CloudPubsubBuilder(env, 'projects/project1/topics/toppy');
+      let result = subjectQualified.onPublish(handler);
+      expect(result.__trigger).to.deep.equal({
+        eventTrigger: {
+          eventType: 'providers/cloud.pubsub/eventTypes/topic.publish',
+          resource: 'projects/project1/topics/toppy',
+        },
+      });
+    });
+
+    it ('should throw with improperly formatted topics', () => {
+      let func = () => {
+        let badSubject = new CloudPubsubBuilder(env, 'bad/topic/format');
+        return badSubject.onPublish(handler);
+      };
+      expect(func).to.throw(Error);
+    });
+
+    it ('should throw with when using topic in another project', () => {
+      let func = () => {
+        let badSubject = new CloudPubsubBuilder(env, 'projects/anotherProject/topics/toppy');
+        return badSubject.onPublish(handler);
+      };
+      expect(func).to.throw(Error);
+    });
+
     it('should properly handle a new-style event', () => {
-      let handler = (ev: Event<PubsubMessage>) => {
+      let handler2 = (ev: Event<PubsubMessage>) => {
         return {
           raw: ev.data.data,
           json: ev.data.json,
@@ -78,7 +111,7 @@ describe('CloudPubsubBuilder', () => {
           },
         },
       };
-      let result = subject.onPublish(handler);
+      let result = subject.onPublish(handler2);
       env.makeReady();
       return expect(result(event)).to.eventually.deep.equal({
         raw,

test/builders/storage-builder.spec.ts

@@ -18,14 +18,41 @@ describe('CloudHttpBuilder', () => {
   });
 
   describe('#onChange', () => {
-    it('should return a CloudStorageTriggerDefinition with appropriate values', () => {
+    it('should return a TriggerDefinition with appropriate values', () => {
       let result = subject.onChange(handler);
       expect(result.__trigger).to.deep.equal({
         eventTrigger: {
           eventType: 'providers/cloud.storage/eventTypes/object.change',
-          resource: 'projects/undefined/buckets/bucky',
+          resource: 'projects/_/buckets/bucky',
         },
       });
     });
+
+    it ('should allow fully qualified bucket names', () => {
+      let subjectQualified = new CloudStorageBuilder(env, 'projects/_/buckets/bucky');
+      let result = subjectQualified.onChange(handler);
+      expect(result.__trigger).to.deep.equal({
+        eventTrigger: {
+          eventType: 'providers/cloud.storage/eventTypes/object.change',
+          resource: 'projects/_/buckets/bucky',
+        },
+      });
+    });
+
+    it ('should throw with improperly formatted buckets', () => {
+      let func = () => {
+        let badSubject = new CloudStorageBuilder(env, 'bad/bucket/format');
+        return badSubject.onChange(handler);
+      };
+      expect(func).to.throw(Error);
+    });
+
+    it ('should throw with when using bucket not in _ project', () => {
+      let func = () => {
+        let badSubject = new CloudStorageBuilder(env, 'projects/anotherProject/buckets/bucky');
+        return badSubject.onChange(handler);
+      };
+      expect(func).to.throw(Error);
+    });
   });
 });