Enable autoTrim behavior by default

README.md

@@ -94,6 +94,34 @@ Try the workshop at https://apprunnerworkshop.com
 Read the docs at https://docs.aws.amazon.com/apprunner
 ```
 
+## AWS Cloud Control AutoNaming Config
+
+Sometimes CDK constructs can create resource names that are too long for the
+[AWS Cloud Control provider](https://www.pulumi.com/registry/packages/aws-native/).
+When this happens you can configure the `autoTrim` feature to have the generated
+names be automatically trimmed to fit within the name requirements. If you are
+not configuring your own `aws-native` provider then this feature is enabled by
+default. If you _are_ configuring your own `aws-native` provider then you will
+have to enable this.
+
+```ts
+const nativeProvider = new aws_native.Provider('cdk-native-provider', {
+  region: 'us-east-2',
+  autoNaming: {
+    autoTrim: true,
+    randomSuffixMinLength: 7,
+  },
+});
+const app = new pulumicdk.App('app', (scope: pulumicdk.App): pulumicdk.AppOutputs => {
+    const stack = new AppRunnerStack('teststack');
+    return {
+        url: stack.url,
+    };
+}, {
+  providers: [ nativeProvider ],
+});
+```
+
 ## Bootstrapping
 
 CDK has the concept of [bootstrapping](https://docs.aws.amazon.com/cdk/v2/guide/bootstrapping.html)

examples/alb/index.ts

@@ -3,7 +3,6 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
 import * as pulumi from '@pulumi/pulumi';
 import * as pulumicdk from '@pulumi/cdk';
-import { CfnOutput } from 'aws-cdk-lib';
 
 class AlbStack extends pulumicdk.Stack {
     url: pulumi.Output<string>;
@@ -28,15 +27,11 @@ class AlbStack extends pulumicdk.Stack {
             port: 80,
         });
 
-        const tg = listener.addTargets('Target', {
+        listener.addTargets('Target', {
             port: 80,
             targets: [asg],
         });
 
-        // workaround for https://github.com/pulumi/pulumi-cdk/issues/62
-        const cfnTargetGroup = tg.node.defaultChild as elbv2.CfnTargetGroup;
-        cfnTargetGroup.overrideLogicalId('LBListenerTG');
-
         listener.connections.allowDefaultPortFromAnyIpv4('Open to the world');
 
         asg.scaleOnRequestCount('AModestLoad', {

integration/apigateway/sfn-api.ts

@@ -1,4 +1,3 @@
-import * as iam from 'aws-cdk-lib/aws-iam';
 import { Construct } from 'constructs';
 import * as sfn from 'aws-cdk-lib/aws-stepfunctions';
 import * as apigw from 'aws-cdk-lib/aws-apigateway';
@@ -15,13 +14,8 @@ export class SfnApi extends Construct {
             stateMachineType: sfn.StateMachineType.EXPRESS,
         });
 
-        // TODO[pulumi/pulumi-cdk#62] The auto created role has too long name
-        const role = new iam.Role(this, 'StartRole', {
-            assumedBy: new iam.ServicePrincipal('apigateway.amazonaws.com'),
-        });
         const api = new apigw.StepFunctionsRestApi(this, 'StepFunctionsRestApi', {
             deploy: false,
-            role,
             stateMachine: stateMachine,
             headers: true,
             path: false,

integration/examples_nodejs_test.go

@@ -148,8 +148,6 @@ func TestCustomResource(t *testing.T) {
 	test := getJSBaseOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: filepath.Join(getCwd(t), "custom-resource"),
-			// Workaround until TODO[pulumi/pulumi-aws-native#1816] is resolved.
-			Env: []string{"PULUMI_CDK_EXPERIMENTAL_MAX_NAME_LENGTH=56"},
 			ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
 				t.Logf("Outputs: %v", stack.Outputs)
 				url := stack.Outputs["websiteUrl"].(string)

src/cfn-resource-mappings.ts

@@ -117,18 +117,7 @@ export function mapToCfnResource(
             const pType = pulumiTypeName(typeName);
             const awsModule = aws as any;
 
-            // Workaround until TODO[pulumi/pulumi-aws-native#1816] is resolved.
-            // Not expected to be exposed to users
-            let name = logicalId;
-            const maxNameLength = process.env.PULUMI_CDK_EXPERIMENTAL_MAX_NAME_LENGTH;
-            if (maxNameLength) {
-                const maxLength = parseInt(maxNameLength, 10);
-                if (name.length > maxLength) {
-                    name = name.substring(0, maxLength);
-                }
-            }
-
-            return new awsModule[mName][pType](name, props, options);
+            return new awsModule[mName][pType](logicalId, props, options);
         }
     }
 }

src/stack.ts

@@ -19,6 +19,7 @@ import { PulumiSynthesizer, PulumiSynthesizerBase } from './synthesizer';
 import { AwsCdkCli, ICloudAssemblyDirectoryProducer } from '@aws-cdk/cli-lib-alpha';
 import { CdkConstruct } from './interop';
 import { makeUniqueId } from './cdk-logical-id';
+import * as native from '@pulumi/aws-native';
 
 export type AppOutputs = { [outputId: string]: pulumi.Output<any> };
 
@@ -93,7 +94,24 @@ export class App
     private appProps?: cdk.AppProps;
 
     constructor(id: string, createFunc: (scope: App) => void | AppOutputs, props?: AppResourceOptions) {
-        super('cdk:index:App', id, props?.appOptions, props);
+        // This matches the logic found in aws-native. If all of these are undefined the provider
+        // will throw an error
+        const region = native.config.region ?? process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION!;
+        // If the user has not provided any providers, we will create an aws-native one by default in order
+        // to enable the autoNaming feature.
+        const providers = props?.providers ?? [
+            new native.Provider('cdk-aws-native', {
+                region: region as native.Region,
+                autoNaming: {
+                    randomSuffixMinLength: 7,
+                    autoTrim: true,
+                },
+            }),
+        ];
+        super('cdk:index:App', id, props?.appOptions, {
+            ...props,
+            providers,
+        });
         this.appOptions = props?.appOptions;
         this.createFunc = createFunc;
         this.component = this;

tests/basic.test.ts

@@ -20,6 +20,13 @@ import { Vpc } from 'aws-cdk-lib/aws-ec2';
 import { aws_ssm } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
+beforeAll(() => {
+    process.env.AWS_REGION = 'us-east-2';
+});
+afterAll(() => {
+    process.env.AWS_REGION = undefined;
+});
+
 describe('Basic tests', () => {
     setMocks();
     test('Checking single resource registration', async () => {

tests/cdk-resource.test.ts

@@ -13,9 +13,13 @@ import { Construct } from 'constructs';
 describe('CDK Construct tests', () => {
     let resources: MockResourceArgs[] = [];
     beforeAll(() => {
+        process.env.AWS_REGION = 'us-east-2';
         resources = [];
         setMocks(resources);
     });
+    afterAll(() => {
+        process.env.AWS_REGION = undefined;
+    });
     // DynamoDB table was previously mapped to the `aws` provider
     // otherwise this level of testing wouldn't be necessary.
     // We also don't need to do this type of testing for _every_ resource

tests/synthesizer.test.ts

@@ -7,6 +7,13 @@ import { asNetworkMode, asPlatforms } from '../src/synthesizer';
 import { NetworkMode, Platform as DockerPlatform } from '@pulumi/docker-build';
 import { DockerImageAsset, Platform, NetworkMode as Network } from 'aws-cdk-lib/aws-ecr-assets';
 
+beforeAll(() => {
+    process.env.AWS_REGION = 'us-east-2';
+});
+afterAll(() => {
+    process.env.AWS_REGION = undefined;
+});
+
 describe('Synthesizer File Assets', () => {
     test('no assets = no staging resources', async () => {
         const resources: MockResourceArgs[] = [];
@@ -16,6 +23,19 @@ describe('Synthesizer File Assets', () => {
             new CfnBucket(scope, 'Bucket');
         });
         expect(resources).toEqual([
+            expect.objectContaining({
+                inputs: {
+                    autoNaming: '{"randomSuffixMinLength":7,"autoTrim":true}',
+                    region: 'us-east-2',
+                    skipCredentialsValidation: 'true',
+                    skipGetEc2Platforms: 'true',
+                    skipMetadataApiCheck: 'true',
+                    skipRegionValidation: 'true',
+                },
+                name: 'cdk-aws-native',
+                provider: '',
+                type: 'pulumi:providers:aws-native',
+            }),
             expect.objectContaining({
                 name: 'staging-stack-project-stack',
                 type: 'cdk:construct:StagingStack',