fix(core): arnForXxxx() helpers ignore environments from referenced resources

tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts

@@ -14,6 +14,7 @@ export class CdkCore extends ExternalModule {
   public readonly TagManager = $T(Type.fromName(this, 'TagManager'));
   public readonly TagType = $T(Type.fromName(this, 'TagType'));
   public readonly Fn = $T(Type.fromName(this, 'Fn'));
+  public readonly Aws = $T(Type.fromName(this, 'Aws'));
   public readonly ITaggable = Type.fromName(this, 'ITaggable');
   public readonly ITaggableV2 = Type.fromName(this, 'ITaggableV2');
   public readonly IResolvable = Type.fromName(this, 'IResolvable');

tools/@aws-cdk/spec2cdk/lib/cdk/resource-class.ts

@@ -467,20 +467,24 @@ export class ResourceClass extends ClassType implements Referenceable {
    * Generates a static method that returns the ARN of the provided resource.
    * If the resource's ref interface already has an ARN, that's what's returned:
    *
+   * ```
    *     public static arnForTable(resource: ITableRef): string {
    *       return resource.tableRef.tableArn;
    *     }
+   * ```
    *
    * Otherwise, we fall back to using the ARN template:
    *
+   * ```
    *    public static arnForRestApi(resource: IRestApiRef): string {
    *       return new cfn_parse.TemplateString("arn:${Partition}:apigateway:${Region}::/restapis/${RestApiId}").interpolate({
-   *         "Partition": cdk.Stack.of(resource).partition,
-   *         "Region": cdk.Stack.of(resource).region,
-   *         "Account": cdk.Stack.of(resource).account,
+   *         "Partition": cdk.Stack.of(resource).partition, // Always same partition as our current one, but might be beautified by Stack
+   *         "Region": resource.env.region,
+   *         "Account": resource.env.account,
    *         "RestApiId": resource.restApiRef.restApiId
    *       });
    *     }
+   * ```
    */
   private addArnForResourceMethod(): void {
     // The resource cannot provide us with its ARN
@@ -518,14 +522,13 @@ export class ResourceClass extends ClassType implements Referenceable {
     // Case 2: Interpolate from template
     } else {
       const method = doAddMethod();
-      const resourceIdentifier = expr.ident('resource');
-      const stackOfResource = $T(CDK_CORE.Stack).of(resourceIdentifier);
+      const resourceIdentifier = $E(expr.ident('resource'));
 
       const interpolationVars = {
-        Partition: stackOfResource.prop('partition'),
-        Region: stackOfResource.prop('region'),
-        Account: stackOfResource.prop('account'),
-        ...mapValues(this.decider.resourceReference.arnVariables!, (propName) => $E(resourceIdentifier)[refAttributeName][propName]),
+        Partition: $T(CDK_CORE.Stack).of(resourceIdentifier).prop('partition'),
+        Region: resourceIdentifier.env.region,
+        Account: resourceIdentifier.env.account,
+        ...mapValues(this.decider.resourceReference.arnVariables!, (propName) => resourceIdentifier[refAttributeName][propName]),
       };
 
       const interpolateArn = CDK_CORE.helpers.TemplateString

tools/@aws-cdk/spec2cdk/test/__snapshots__/resources.test.ts.snap

@@ -1374,8 +1374,8 @@ export class CfnResource extends cdk.CfnResource implements cdk.IInspectable, IR
   public static arnForResource(resource: IResourceRef): string {
     return new cfn_parse.TemplateString("arn:\${Partition}:some:\${Region}:\${Account}:resource/\${ResourceId}").interpolate({
       Partition: cdk.Stack.of(resource).partition,
-      Region: cdk.Stack.of(resource).region,
-      Account: cdk.Stack.of(resource).account,
+      Region: resource.env.region,
+      Account: resource.env.account,
       ResourceId: resource.resourceRef.resourceId
     });
   }

tools/@aws-cdk/spec2cdk/test/arnForResource.test.ts

@@ -142,8 +142,8 @@ describe('arnForResource is generated', () => {
 "public static arnForResource(resource: IResourceRef): string {
   return new cfn_parse.TemplateString("arn:\${Partition}:some:\${Region}:\${Account}:resource/\${ResourceId}").interpolate({
     Partition: cdk.Stack.of(resource).partition,
-    Region: cdk.Stack.of(resource).region,
-    Account: cdk.Stack.of(resource).account,
+    Region: resource.env.region,
+    Account: resource.env.account,
     ResourceId: resource.resourceRef.resourceId
   });
 }"
@@ -170,8 +170,8 @@ describe('arnForResource is generated', () => {
 "public static arnForResource(resource: IResourceRef): string {
   return new cfn_parse.TemplateString("arn:\${Partition}:some:\${Region}:\${Account}:resource/\${Team}").interpolate({
     Partition: cdk.Stack.of(resource).partition,
-    Region: cdk.Stack.of(resource).region,
-    Account: cdk.Stack.of(resource).account,
+    Region: resource.env.region,
+    Account: resource.env.account,
     Team: resource.resourceRef.team
   });
 }"
@@ -207,8 +207,8 @@ describe('arnForResource is generated', () => {
 "public static arnForResource(resource: IResourceRef): string {
   return new cfn_parse.TemplateString("arn:\${Partition}:sagemaker:\${Region}:\${Account}:workteam/\${WorkteamName}").interpolate({
     Partition: cdk.Stack.of(resource).partition,
-    Region: cdk.Stack.of(resource).region,
-    Account: cdk.Stack.of(resource).account,
+    Region: resource.env.region,
+    Account: resource.env.account,
     WorkteamName: resource.resourceRef.workteamName
   });
 }"

tools/@aws-cdk/spec2cdk/test/expect-to-contain-code.ts

@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
+
 import { ChangeObject, diffLines } from 'diff';
 
 expect.extend({