@forge/cli-shared 8.23.1-next.6-experimental-5c60439 → 8.24.0-next.7-experimental-04898b4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @forge/cli-shared
 
-## 8.23.1-next.6-experimental-5c60439
+## 8.24.0-next.7-experimental-04898b4
 
 ### Minor Changes
 
@@ -9,6 +9,8 @@
 ### Patch Changes
 
 - 22145f6: Surfacing error messages in the Forge CLI for apps that are missing billing information
+- 8f4ff0a: Remove forge-cli-enable-developer-space-flow feature flag and GA developer space selection. The feature is now always enabled except in FedRAMP environments.
+- 421fa50: Including remote baseUrl hostnames in fetch_backend egress permissions to ensure egress checking is consistent with backend (cs-apps)
 - Updated dependencies [ccdcfc3]
 - Updated dependencies [8197e66]
 - Updated dependencies [723fab8]
@@ -17,7 +19,17 @@
 - Updated dependencies [f1f11f0]
 - Updated dependencies [b7b1f36]
 - Updated dependencies [9f3add6]
-  - @forge/manifest@12.9.0-next.5-experimental-5c60439
+  - @forge/manifest@12.9.0-next.5-experimental-04898b4
+
+## 8.24.0-next.7
+
+### Minor Changes
+
+- 2415638: Prerelease of forge module add command
+
+### Patch Changes
+
+- 8f4ff0a: Remove forge-cli-enable-developer-space-flow feature flag and GA developer space selection. The feature is now always enabled except in FedRAMP environments.
 
 ## 8.23.1-next.6
 

package/out/config/config-file.d.ts

@@ -37,6 +37,7 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
     private assertNoMissingResources;
     private getRemoteFromEgressPermission;
     private instanceOfRemote;
+    private getRemoteBaseUrlHostnames;
     getEgressPermissions(): Promise<{
         type: string;
         domains: string[] | undefined;

package/out/config/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EACL,OAAO,EACP,cAAc,EACd,SAAS,EAOV,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,SAAS,EAAE,eAAe,EAAQ,MAAM,WAAW,CAAC;AAE7D,qBAAa,oBAAqB,SAAQ,eAAe;;CAIxD;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;CAC3C;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AACjE,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,cAAc,CAAC;CAC9B;AAgBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CA6D5D;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IAG3E,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAH7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,gBAAgB;IAKlC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAiBzC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAYrC,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKvD,OAAO,CAAC,kBAAkB;IAoBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,OAAO,CAAC,aAAa;IAIR,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1G,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,6BAA6B;IAkBrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAqClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAsB1E,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CAkCxB"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EACL,OAAO,EACP,cAAc,EACd,SAAS,EAOV,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,SAAS,EAAE,eAAe,EAAQ,MAAM,WAAW,CAAC;AAE7D,qBAAa,oBAAqB,SAAQ,eAAe;;CAIxD;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;CAC3C;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AACjE,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,cAAc,CAAC;CAC9B;AAgBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CA6D5D;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IAG3E,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAH7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,gBAAgB;IAKlC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAiBzC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAYrC,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKvD,OAAO,CAAC,kBAAkB;IAoBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,OAAO,CAAC,aAAa;IAIR,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1G,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,6BAA6B;IAkBrC,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,yBAAyB;IAuBpB,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAmDlF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAsB1E,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CAkCxB"}

package/out/config/config-file.js

@@ -211,13 +211,31 @@ class ConfigFile {
     instanceOfRemote(remote) {
         return typeof remote !== 'string' && 'remote' in remote;
     }
+    getRemoteBaseUrlHostnames(remotes) {
+        if (!remotes) {
+            return [];
+        }
+        return remotes.flatMap((remote) => {
+            const baseUrlField = remote.baseUrl;
+            if (!baseUrlField) {
+                return [];
+            }
+            const urls = typeof baseUrlField === 'string' ? [baseUrlField] : Object.values(baseUrlField);
+            return urls.flatMap((url) => {
+                try {
+                    return [new url_1.URL(url).hostname];
+                }
+                catch (e) {
+                    return [];
+                }
+            });
+        });
+    }
     async getEgressPermissions() {
         const { permissions, remotes } = await this.readConfig();
         const egressPermissions = permissions?.external;
-        if (!egressPermissions) {
-            return [];
-        }
-        const { fetch: fetchEgress, ...otherEgress } = egressPermissions;
+        const remoteBaseUrlHostnames = this.getRemoteBaseUrlHostnames(remotes);
+        const { fetch: fetchEgress, ...otherEgress } = egressPermissions ?? {};
         const getDomainsFromPermissions = (input, typePrefix = undefined) => Object.entries(input)
             .filter((entry) => Array.isArray(entry[1]))
             .map((entry) => ({
@@ -237,6 +255,17 @@ class ConfigFile {
         }));
         const egressUrls = getDomainsFromPermissions(otherEgress);
         const fetchUrls = fetchEgress ? getDomainsFromPermissions(fetchEgress, 'fetch') : [];
+        const existingHostnames = new Set([...egressUrls, ...fetchUrls].flatMap(({ domains }) => domains ?? []));
+        const additionalRemoteHostnames = remoteBaseUrlHostnames.filter((hostname) => !existingHostnames.has(hostname));
+        if (additionalRemoteHostnames.length > 0) {
+            const existingFetchBackend = fetchUrls.find(({ type }) => type === 'fetch_backend');
+            if (existingFetchBackend) {
+                existingFetchBackend.domains = [...(existingFetchBackend.domains ?? []), ...additionalRemoteHostnames];
+            }
+            else {
+                fetchUrls.push({ type: 'fetch_backend', domains: additionalRemoteHostnames });
+            }
+        }
         return [...egressUrls, ...fetchUrls];
     }
     async getAuthProviders() {