refactor: Rely on CloudFunctions v1 not v1 beta (#165)

Author: mather

info/lib/displayServiceInfo.js

@@ -37,7 +37,7 @@ module.exports = {
     };
 
     _.forEach(resources.resources, resource => {
-      if (resource.type === 'cloudfunctions.v1beta2.function') {
+      if (resource.type === 'gcp-types/cloudfunctions-v1:projects.locations.functions') {
         const serviceFuncName = getFunctionNameInService(
           resource.name,
           this.serverless.service.service,
@@ -53,7 +53,7 @@ module.exports = {
           const region = this.options.region;
           const project = this.serverless.service.provider.project;
           const baseUrl = `https://${region}-${project}.cloudfunctions.net`;
-          const path = serviceFunc.handler; // NOTE this might change
+          const path = serviceFunc.name; // NOTE this might change
           funcResource = `${baseUrl}/${path}`;
         }
 

info/lib/displayServiceInfo.test.js

@@ -96,8 +96,14 @@ describe('DisplayServiceInfo', () => {
       const resources = {
         resources: [
           { type: 'resource.which.should.be.filterered', name: 'someResource' },
-          { type: 'cloudfunctions.v1beta2.function', name: 'my-service-dev-func1' },
-          { type: 'cloudfunctions.v1beta2.function', name: 'my-service-dev-func2' },
+          {
+            type: 'gcp-types/cloudfunctions-v1:projects.locations.functions',
+            name: 'my-service-dev-func1',
+          },
+          {
+            type: 'gcp-types/cloudfunctions-v1:projects.locations.functions',
+            name: 'my-service-dev-func2',
+          },
         ],
       };
 
@@ -110,7 +116,7 @@ describe('DisplayServiceInfo', () => {
           functions: [
             {
               name: 'func1',
-              resource: 'https://us-central1-my-project.cloudfunctions.net/handler',
+              resource: 'https://us-central1-my-project.cloudfunctions.net/my-service-dev-func1',
             },
             {
               name: 'func2',
@@ -167,7 +173,7 @@ describe('DisplayServiceInfo', () => {
           functions: [
             {
               name: 'func1',
-              resource: 'https://us-central1-my-project.cloudfunctions.net/handler',
+              resource: 'https://us-central1-my-project.cloudfunctions.net/my-service-dev-func1',
             },
             {
               name: 'func2',
@@ -188,7 +194,8 @@ describe('DisplayServiceInfo', () => {
 
       expectedOutput += `${chalk.yellow.underline('Deployed functions')}\n`;
       expectedOutput += `${chalk.yellow('func1')}\n`;
-      expectedOutput += '  https://us-central1-my-project.cloudfunctions.net/handler\n';
+      expectedOutput +=
+        '  https://us-central1-my-project.cloudfunctions.net/my-service-dev-func1\n';
       expectedOutput += `${chalk.yellow('func2')}\n`;
       expectedOutput += '  projects/*/topics/my-test-topic\n';
 

package/lib/compileFunctions.js

@@ -11,6 +11,7 @@ module.exports = {
   compileFunctions() {
     const artifactFilePath = this.serverless.service.package.artifact;
     const fileName = artifactFilePath.split(path.sep).pop();
+    const projectName = _.get(this, 'serverless.service.provider.project');
 
     this.serverless.service.package.artifactFilePath = `${this.serverless.service.package.artifactDirectoryName}/${fileName}`;
 
@@ -25,6 +26,7 @@ module.exports = {
 
       const funcTemplate = getFunctionTemplate(
         funcObject,
+        projectName,
         this.serverless.service.provider.region,
         `gs://${this.serverless.service.provider.deploymentBucketName}/${this.serverless.service.package.artifactFilePath}`
       );
@@ -150,17 +152,18 @@ const validateVpcConnectorProperty = (funcObject, functionName) => {
   }
 };
 
-const getFunctionTemplate = (funcObject, region, sourceArchiveUrl) => {
+const getFunctionTemplate = (funcObject, projectName, region, sourceArchiveUrl) => {
   //eslint-disable-line
   return {
-    type: 'cloudfunctions.v1beta2.function',
+    type: 'gcp-types/cloudfunctions-v1:projects.locations.functions',
     name: funcObject.name,
     properties: {
-      location: region,
+      parent: `projects/${projectName}/locations/${region}`,
       availableMemoryMb: 256,
       runtime: 'nodejs8',
       timeout: '60s',
-      function: funcObject.handler,
+      entryPoint: funcObject.handler,
+      function: funcObject.name,
       sourceArchiveUrl,
     },
   };