fix(provider-generator): Render interpolationForAttribute instead of …

…getAnyAttribute for skipped attributes since the latter doesn't actually exist
hashicorp · Sep 9, 2024 · abbb0c1 · abbb0c1
1 parent 549f694
commit abbb0c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...vider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap b/...vider-generator/lib/get/__tests__/generator/__snapshots__/skipped-attributes.test.ts.snap
@@ -211,7 +211,7 @@ export class DataAwsQuicksightAnalysis extends cdktf.TerraformDataSource {
 
   // definition - computed: true, optional: false, required: false
   public get definition() {
-    return this.getAnyAttribute('definition');
+    return this.interpolationForAttribute('definition');
   }
 
   // id - computed: true, optional: true, required: false

diff --git a/packages/@cdktf/provider-generator/lib/get/generator/models/attribute-model.ts b/packages/@cdktf/provider-generator/lib/get/generator/models/attribute-model.ts
@@ -32,6 +32,7 @@ export interface AttributeModelOptions {
   getAttCall?: string;
   provider: boolean;
   required: boolean;
+  forcePlainGetterType?: boolean; // used for skipping attribute type attributes that use the SkippedAttributeTypeModel which returns an interpolation and has no stored type
 }
 
 export function escapeAttributeName(name: string) {
@@ -67,6 +68,7 @@ export class AttributeModel {
   private _description?: string;
   public provider: boolean;
   public required: boolean;
+  public forcePlainGetterType?: boolean;
 
   constructor(options: AttributeModelOptions) {
     this.storageName = options.storageName;
@@ -79,6 +81,7 @@ export class AttributeModel {
     this._description = options.description;
     this.provider = options.provider;
     this.required = options.required;
+    this.forcePlainGetterType = options.forcePlainGetterType;
   }
 
   public get typeDefinition() {
@@ -105,6 +108,10 @@ export class AttributeModel {
   public get getterType(): GetterType {
     let getterType: GetterType = { _type: "plain" };
 
+    if (this.forcePlainGetterType) {
+      return getterType;
+    }
+
     if (this.isProvider) {
       return getterType;
     }

diff --git a/packages/@cdktf/provider-generator/lib/get/generator/resource-parser.ts b/packages/@cdktf/provider-generator/lib/get/generator/resource-parser.ts
@@ -396,8 +396,10 @@ class Parser {
       block.attributes || {}
     )) {
       let type: AttributeTypeModel;
+      let forcePlainGetterType = false;
       if (shouldSkipAttribute(parentType.fullName(terraformAttributeName))) {
-        type = new SimpleAttributeTypeModel("any");
+        type = new SkippedAttributeTypeModel();
+        forcePlainGetterType = true;
       } else {
         type = this.renderAttributeType(
           [
@@ -430,6 +432,7 @@ class Parser {
           type,
           provider: parentType.isProvider,
           required: !!att.required,
+          forcePlainGetterType,
         })
       );
     }