saving work

Author: EMaher

src/lib/resource-path.ts

@@ -369,6 +369,11 @@ export function parseArtifactPath(
     return undefined;
   }
 
+  const workspaceContainer = parseWorkspaceContainerDescriptor(fileName, workspace);
+  if (workspaceContainer) {
+    return workspaceContainer;
+  }
+
   // Try to match against each resource type's pattern
   for (const [typeKey, metadata] of Object.entries(RESOURCE_TYPE_METADATA)) {
     const type = typeKey as ResourceType;
@@ -396,6 +401,24 @@ export function parseArtifactPath(
   return undefined;
 }
 
+function parseWorkspaceContainerDescriptor(
+  fileName: string,
+  workspace?: string
+): ResourceDescriptor | undefined {
+  // Workspace container descriptors are stored at:
+  //   workspaces/{workspace}/workspaceInformation.json
+  // and are not workspace-scoped children. Return a top-level Workspace
+  // descriptor so publish can create the container before workspace children.
+  if (fileName === 'workspaceInformation.json' && workspace) {
+    return {
+      type: ResourceType.Workspace,
+      nameParts: [workspace],
+    };
+  }
+
+  return undefined;
+}
+
 /**
  * Parse a changed artifact file path into a ResourceDescriptor.
  *

src/services/resource-publisher.ts

@@ -15,6 +15,7 @@ import { ResourceType } from '../models/resource-types.js';
 import { applyOverrides } from './override-merger.js';
 import { checkKeyVaultSecretAccess } from './keyvault-checker.js';
 import { getNamePart } from '../lib/resource-path.js';
+import { isAutoGeneratedId } from '../lib/auto-generated.js';
 
 export interface ResourcePublishResult {
   descriptor: ResourceDescriptor;
@@ -148,6 +149,7 @@ export async function publishResource(
     if (descriptor.type === ResourceType.Subscription) {
       const props = json.properties as Record<string, unknown> | undefined;
       const scope = props?.scope as string | undefined;
+      const subscriptionName = getNamePart(descriptor.nameParts, 0);
 
       // Built-in master subscription has scope ending with the service path (no /apis or /products suffix)
       // Skip it since APIM doesn't allow updates to built-in subscriptions
@@ -159,6 +161,14 @@ export async function publishResource(
         };
       }
 
+      if (isAutoGeneratedProductSubscription(subscriptionName, scope)) {
+        return {
+          descriptor,
+          status: 'skipped',
+          action: 'noop',
+        };
+      }
+
       json = normalizeSubscriptionScope(json, context);
     }
 
@@ -491,3 +501,14 @@ function normalizeMcpToolOperationIds(
     },
   };
 }
+
+function isAutoGeneratedProductSubscription(
+  subscriptionName: string,
+  scope?: string
+): boolean {
+  if (!scope || !isAutoGeneratedId(subscriptionName)) {
+    return false;
+  }
+
+  return scope.includes('/products/');
+}

tests/unit/lib/resource-path.test.ts

@@ -293,6 +293,15 @@ describe('parseArtifactPath', () => {
     expect(result!.nameParts[0]).toBe('ws-api');
   });
 
+  it('should parse workspace container descriptor', () => {
+    const filePath = path.join(baseDir, 'workspaces', 'ws1', 'workspaceInformation.json');
+    const result = parseArtifactPath(baseDir, filePath);
+    expect(result).toBeDefined();
+    expect(result!.type).toBe(ResourceType.Workspace);
+    expect(result!.nameParts).toEqual(['ws1']);
+    expect(result!.workspace).toBeUndefined();
+  });
+
   it('should parse ApiDiagnostic info file (nameParts[0]=apiName, nameParts[1]=diagName)', () => {
     const filePath = path.join(baseDir, 'apis', 'my-api', 'diagnostics', 'applicationinsights', 'diagnosticInformation.json');
     const result = parseArtifactPath(baseDir, filePath);

tests/unit/services/resource-publisher.test.ts

@@ -645,7 +645,7 @@ describe('resource-publisher', () => {
       expect(client.putResource).not.toHaveBeenCalled();
     });
 
-    it('should publish product subscription with empty displayName', async () => {
+    it('should skip auto-generated product subscription with empty displayName', async () => {
       const client = createMockClient();
       const store = createMockStore();
       const autoGeneratedId = generatedSubscriptionId('a');
@@ -671,12 +671,12 @@ describe('resource-publisher', () => {
 
       const result = await publishResource(client, store, testContext, descriptor, testConfig);
 
-      expect(result.status).toBe('success');
-      expect(result.action).toBe('put');
-      expect(client.putResource).toHaveBeenCalledTimes(1);
+      expect(result.status).toBe('skipped');
+      expect(result.action).toBe('noop');
+      expect(client.putResource).not.toHaveBeenCalled();
     });
 
-    it('should publish product subscription when displayName is set', async () => {
+    it('should skip auto-generated product subscription when displayName is set', async () => {
       const client = createMockClient();
       const store = createMockStore();
       const autoGeneratedId = generatedSubscriptionId('b');
@@ -701,6 +701,35 @@ describe('resource-publisher', () => {
 
       const result = await publishResource(client, store, testContext, descriptor, testConfig);
 
+      expect(result.status).toBe('skipped');
+      expect(result.action).toBe('noop');
+      expect(client.putResource).not.toHaveBeenCalled();
+    });
+
+    it('should publish user-defined product subscription', async () => {
+      const client = createMockClient();
+      const store = createMockStore();
+
+      const armScopePrefix =
+        '/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.ApiManagement/service/apim-1';
+
+      const subscriptionJson = {
+        name: 'team-a-product-sub',
+        properties: {
+          scope: `${armScopePrefix}/products/starter`,
+          displayName: 'Team A starter product',
+          state: 'active',
+        },
+      };
+      store.readResource.mockResolvedValue(subscriptionJson);
+
+      const descriptor: ResourceDescriptor = {
+        type: ResourceType.Subscription,
+        nameParts: ['team-a-product-sub'],
+      };
+
+      const result = await publishResource(client, store, testContext, descriptor, testConfig);
+
       expect(result.status).toBe('success');
       expect(result.action).toBe('put');
       expect(client.putResource).toHaveBeenCalledTimes(1);