feat: support non-slash resource for Ads

typescript/src/util.ts

@@ -159,12 +159,15 @@ export function getResourceNameByPattern(pattern: string): string {
       const nextEle = elements[0];
       if (nextEle.match(/{[a-zA-Z_]+(?:=.*?)?}/g)) {
         elements.shift();
-        name.push(
-          nextEle.substring(
-            1,
-            nextEle.includes('=') ? nextEle.indexOf('=') : nextEle.length - 1
-          )
-        );
+        const params = nextEle.match(/{[a-zA-Z_]+(?:=.*?)?}/g);
+        if (params!.length === 1) {
+          name.push(getChuckName(nextEle));
+        } else {
+          // For non-slash resource 'organization/{organization}/tasks/{task_id}{task_name}/result'
+          // Take parameters that match pattern [{task_id}, {task_name}] and combine them as part of the name.
+          const params = nextEle.match(/{[a-zA-Z_]+(?:=.*?)?}/g);
+          name.push(params?.map(p => getChuckName(p))?.join('_'));
+        }
       } else {
         if (eleName!.match(/{[a-zA-Z_]+(?:=.*?)?}/g)) {
           continue;
@@ -176,3 +179,10 @@ export function getResourceNameByPattern(pattern: string): string {
   }
   return name.join('_');
 }
+
+function getChuckName(chuck: string): string {
+  return chuck.substring(
+    1,
+    chuck.includes('=') ? chuck.indexOf('=') : chuck.length - 1
+  );
+}

typescript/test/unit/resource-database.ts

@@ -28,6 +28,10 @@ describe('src/schema/resource-database.ts', () => {
   const resourcePatternSpecial1 = 'location/{location}/profile/case/{case_id}';
   const resourcePatternSpecial2 = 'organization/{organization=**}/case';
   const resourcePatternSpecial3 = '{organization=**}/tasks/{task}/result';
+  const nonSlashPatternSpecial =
+    'organization/{organization}/tasks/{taskId}{taskName}/result';
+  const nonSlashPatternSpecial2 =
+    'organization/{organization}/tasks/{taskId=*}{taskName}/result';
   const resourceParameters = ['location', 'example'];
   const parentResourceName = 'Location';
   const parentResourceType = 'locations.googleapis.com/Location';
@@ -108,6 +112,8 @@ describe('src/schema/resource-database.ts', () => {
         resourcePatternSpecial1,
         resourcePatternSpecial2,
         resourcePatternSpecial3,
+        nonSlashPatternSpecial,
+        nonSlashPatternSpecial2,
       ],
     };
     rdb.registerResource(resource, errorLocation);
@@ -138,6 +144,47 @@ describe('src/schema/resource-database.ts', () => {
     );
     assert(registeredResourceByPattern3);
     assert.strictEqual(registeredResourceByPattern3!.name, 'task_result');
+
+    const registeredNonSlashResource = rdb.getResourceByPattern(
+      nonSlashPatternSpecial
+    );
+    assert(registeredNonSlashResource);
+    assert.strictEqual(
+      registeredNonSlashResource!.name,
+      'organization_taskId_taskName_result'
+    );
+
+    const registeredNonSlashResource2 = rdb.getResourceByPattern(
+      nonSlashPatternSpecial2
+    );
+    assert(registeredNonSlashResource2);
+    assert.strictEqual(
+      registeredNonSlashResource2!.name,
+      'organization_taskId_taskName_result'
+    );
+  });
+
+  it('get correct resource name for single non-slash pattern resource', () => {
+    const rdb = new ResourceDatabase();
+    const resource: plugin.google.api.IResourceDescriptor = {
+      type: 'examples.googleapis.com/Case',
+      pattern: [nonSlashPatternSpecial],
+    };
+    rdb.registerResource(resource, errorLocation);
+    const registeredResource = rdb.getResourceByType(
+      'examples.googleapis.com/Case'
+    );
+    assert(registeredResource);
+    assert.strictEqual(
+      registeredResource!.type,
+      'examples.googleapis.com/Case'
+    );
+
+    const registeredNonSlashResource = rdb.getResourceByPattern(
+      nonSlashPatternSpecial
+    );
+    assert(registeredNonSlashResource);
+    assert.strictEqual(registeredNonSlashResource!.name, 'Case');
   });
 
   it('can get registered resource by type', () => {