diff --git a/examples/typescript/aws-import/main.ts b/examples/typescript/aws-import/main.ts index 9defc67c50..a76a22da9c 100644 --- a/examples/typescript/aws-import/main.ts +++ b/examples/typescript/aws-import/main.ts @@ -38,7 +38,7 @@ class StackWithImportAndConfigurationGeneration extends TerraformStack { }); // Step 2: Create import block - S3Bucket.importOf(this, "bucket", bucketId); + S3Bucket.importGenerateConfig(this, "bucket", bucketId); // Step 3: Run `cdktf plan` and get the configuration to put in below // Step 4: Remove the `import` call, the resource is now imported diff --git a/packages/@cdktf/cli-core/src/lib/convert.ts b/packages/@cdktf/cli-core/src/lib/convert.ts index face327711..0a24c53107 100644 --- a/packages/@cdktf/cli-core/src/lib/convert.ts +++ b/packages/@cdktf/cli-core/src/lib/convert.ts @@ -7,7 +7,11 @@ import * as hcl2cdk from "@cdktf/hcl2cdk"; import { CdktfConfig } from "./cdktf-config"; import { TerraformProviderConstraint } from "@cdktf/provider-generator"; import { readSchema } from "@cdktf/provider-schema"; -import { Errors, LANGUAGES, ConstructsMakerProviderTarget } from "@cdktf/commons"; +import { + Errors, + LANGUAGES, + ConstructsMakerProviderTarget, +} from "@cdktf/commons"; export async function convertConfigurationFile(configuration: string) { const cfg = CdktfConfig.read(process.cwd()); // TODO: make this the project directory instead of cwd diff --git a/packages/@cdktf/provider-generator/lib/__tests__/provider.test.ts b/packages/@cdktf/provider-generator/lib/__tests__/provider.test.ts index a70106ae0e..2bb29cc98f 100644 --- a/packages/@cdktf/provider-generator/lib/__tests__/provider.test.ts +++ b/packages/@cdktf/provider-generator/lib/__tests__/provider.test.ts @@ -96,7 +96,7 @@ describe("Provider", () => { terraformResourceType = `datadog_${terraformResourceType}`; } expect(snapshot[`providers/datadog/${resource}/index.ts`]).toContain( - `public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider)` + `public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider)` ); expect(snapshot[`providers/datadog/${resource}/index.ts`]).toContain( `return new cdktf.ImportableResource(scope, name, { terraformResourceType: "${terraformResourceType}", importId: id, provider });` diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/complex-computed-types.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/complex-computed-types.test.ts.snap index 99d459c907..36fe3a1290 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/complex-computed-types.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/complex-computed-types.test.ts.snap @@ -214,7 +214,7 @@ export class AcmCertificate extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_acm_certificate", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/description-escaping.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/description-escaping.test.ts.snap index ec5c49346a..81524d50ce 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/description-escaping.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/description-escaping.test.ts.snap @@ -37,7 +37,7 @@ export class DescriptionEscaping extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "description_escaping", importId: id, provider }); } @@ -132,7 +132,7 @@ export class CodeBlocks extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "code_blocks", importId: id, provider }); } @@ -225,7 +225,7 @@ export class CodeBlocks extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "code_blocks", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/export-sharding.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/export-sharding.test.ts.snap index 4c74f9b89a..c21831228b 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/export-sharding.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/export-sharding.test.ts.snap @@ -110,7 +110,7 @@ export class Dashboard extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "datadog_dashboard", importId: id, provider }); } @@ -146871,7 +146871,7 @@ export class Wafv2WebAcl extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_wafv2_web_acl", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/nested-types.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/nested-types.test.ts.snap index f64e89d49e..12151e7fc7 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/nested-types.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/nested-types.test.ts.snap @@ -303,7 +303,7 @@ export class NestedTypesResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "nested_types_resource", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/provider.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/provider.test.ts.snap index 3b8322aa0f..d61157b064 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/provider.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/provider.test.ts.snap @@ -1173,7 +1173,7 @@ export class AwsProvider extends cdktf.TerraformProvider { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws", importId: id, provider }); } @@ -1697,7 +1697,7 @@ export class ElasticstackProvider extends cdktf.TerraformProvider { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "elasticstack", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/resource-types.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/resource-types.test.ts.snap index 31a89ea286..b8d4a540d2 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/resource-types.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/resource-types.test.ts.snap @@ -4023,7 +4023,7 @@ export class CloudfrontDistribution extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_cloudfront_distribution", importId: id, provider }); } @@ -4515,7 +4515,7 @@ export class FmsAdminAccount extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_fms_admin_account", importId: id, provider }); } @@ -7536,7 +7536,7 @@ export class S3Bucket extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_s3_bucket", importId: id, provider }); } @@ -8805,7 +8805,7 @@ export class SecurityGroup extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_security_group", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap index b609531776..c413260aee 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap @@ -691,7 +691,7 @@ export class QuicksightTemplate extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_quicksight_template", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/types.test.ts.snap b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/types.test.ts.snap index 1a798e3c51..d5cce8d29e 100644 --- a/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/types.test.ts.snap +++ b/packages/@cdktf/provider-generator/lib/get/__tests__/generator/__snapshots__/types.test.ts.snap @@ -33,7 +33,7 @@ export class BooleanList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_boolean_list", importId: id, provider }); } @@ -152,7 +152,7 @@ export class BooleanMap extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_boolean_map", importId: id, provider }); } @@ -370,7 +370,7 @@ export class ComputedComplex extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_computed_complex", importId: id, provider }); } @@ -582,7 +582,7 @@ export class ComputedComplexNested extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_computed_complex_nested", importId: id, provider }); } @@ -840,7 +840,7 @@ export class BlockTypeNestedComputedList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_block_type_nested_computed_list", importId: id, provider }); } @@ -1247,7 +1247,7 @@ export class ComputedOptionalComplex extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_computed_optional_complex", importId: id, provider }); } @@ -1534,7 +1534,7 @@ export class DeeplyNestedBlockTypes extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_deeply_nested_block_types", importId: id, provider }); } @@ -1631,7 +1631,7 @@ export class IgnoredAttributes extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_ignored_attributes", importId: id, provider }); } @@ -1746,7 +1746,7 @@ export class IncompatibleAttributeNames extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_incompatible_attribute_names", importId: id, provider }); } @@ -1900,7 +1900,7 @@ export class FunctionResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_function", importId: id, provider }); } @@ -2018,7 +2018,7 @@ export class LicenseResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_license", importId: id, provider }); } @@ -2112,7 +2112,7 @@ export class ObjectResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_object", importId: id, provider }); } @@ -2206,7 +2206,7 @@ export class ProviderResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_provider", importId: id, provider }); } @@ -2300,7 +2300,7 @@ export class StaticResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_static", importId: id, provider }); } @@ -2394,7 +2394,7 @@ export class StringResource extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_string", importId: id, provider }); } @@ -2836,7 +2836,7 @@ export class Complex extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "test_complex", importId: id, provider }); } @@ -3047,7 +3047,7 @@ export class DataAirbyteSourceSchemaCatalog extends cdktf.TerraformDataSource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "airbyte_source_schema_catalog", importId: id, provider }); } @@ -3149,7 +3149,7 @@ export class ListOfStringMap extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_list_of_string_map", importId: id, provider }); } @@ -3251,7 +3251,7 @@ export class MapOfStringList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_map_of_string_list", importId: id, provider }); } @@ -3355,7 +3355,7 @@ export class NumberList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_number_list", importId: id, provider }); } @@ -3468,7 +3468,7 @@ export class NumberMap extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_number_map", importId: id, provider }); } @@ -3594,7 +3594,7 @@ export class PrimitiveBoolean extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_primitive_boolean", importId: id, provider }); } @@ -3734,7 +3734,7 @@ export class PrimitiveDynamic extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_primitive_dynamic", importId: id, provider }); } @@ -3875,7 +3875,7 @@ export class PrimitiveNumber extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_primitive_number", importId: id, provider }); } @@ -4015,7 +4015,7 @@ export class PrimitiveString extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_primitive_string", importId: id, provider }); } @@ -4159,7 +4159,7 @@ export class NameConflict extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_name_conflict", importId: id, provider }); } @@ -4509,7 +4509,7 @@ export class BlockTypeSetList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_block_type_set_list", importId: id, provider }); } @@ -4698,7 +4698,7 @@ export class SingleBlockType extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_single_block_type", importId: id, provider }); } @@ -4800,7 +4800,7 @@ export class StringList extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_string_list", importId: id, provider }); } @@ -4940,7 +4940,7 @@ export class StringMap extends cdktf.TerraformResource { // ============== // STATIC Methods // ============== - public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "aws_string_map", importId: id, provider }); } diff --git a/packages/@cdktf/provider-generator/lib/get/generator/emitter/resource-emitter.ts b/packages/@cdktf/provider-generator/lib/get/generator/emitter/resource-emitter.ts index 4988afcd5c..c61f3fb4aa 100644 --- a/packages/@cdktf/provider-generator/lib/get/generator/emitter/resource-emitter.ts +++ b/packages/@cdktf/provider-generator/lib/get/generator/emitter/resource-emitter.ts @@ -57,7 +57,7 @@ export class ResourceEmitter { private emitStaticMethods(resource: ResourceModel) { this.code.line( - `public static importOf(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { + `public static importGenerateConfig(scope: Construct, name: string, id: string, provider?: cdktf.TerraformProvider) { return new cdktf.ImportableResource(scope, name, { terraformResourceType: "${resource.terraformResourceType}", importId: id, provider }); }` );