Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions packages/cdktf/lib/terraform-resource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
processDynamicAttributesForHcl,
} from "./util";
import { ITerraformDependable } from "./terraform-dependable";
import { ref, dependable } from "./tfExpression";
import { ref, dependable, replaceTriggeredBy } from "./tfExpression";
import { IResolvable } from "./tokens/resolvable";
import { IInterpolatingParent } from "./terraform-addressable";
import { ITerraformIterator } from "./terraform-iterator";
Expand Down Expand Up @@ -78,13 +78,9 @@ export function lifecycleToTerraform(
...lifecycle,
...(lifecycle?.replaceTriggeredBy?.length
? {
replaceTriggeredBy: lifecycle?.replaceTriggeredBy?.map((x) => {
if (typeof x === "string") {
return x;
} else {
return x.fqn;
}
}),
replaceTriggeredBy: lifecycle?.replaceTriggeredBy?.map((x) =>
replaceTriggeredBy(x),
),
}
: undefined),
};
Expand Down
28 changes: 28 additions & 0 deletions packages/cdktf/lib/tfExpression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,41 @@ export function dependable(dependable: ITerraformDependable): string {
return Token.asString(new Dependable(dependable));
}

// eslint-disable-next-line jsdoc/require-jsdoc
class ReplaceTriggeredBy extends TFExpression {
constructor(private readonly trigger: ITerraformDependable | string) {
super(trigger);
}

public resolve(context: IResolveContext) {
context.suppressBraces = true;

if (typeof this.trigger === "string") {
return context.resolve(this.trigger);
}
return context.resolve(this.trigger.fqn);
}
}

/**
* Takes either a full resource or a resource property and then
* returns the logical address without braces/interpolation to
* be used in replaceTriggeredBy directives.
*/
export function replaceTriggeredBy(
trigger: ITerraformDependable | string,
): string {
return Token.asString(new ReplaceTriggeredBy(trigger));
}

export type Expression =
| Reference
| FunctionCall
| PropertyAccess
| ConditionalExpression
| OperatorExpression
| Dependable
| ReplaceTriggeredBy
| ForExpression
| string
| string[]
Expand Down
4 changes: 2 additions & 2 deletions packages/cdktf/test/__snapshots__/resource.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,8 @@ exports[`supports resource and attribute references in lifecycle.replaceTriggere
"simple": {
"lifecycle": {
"replace_triggered_by": [
"\${test_resource.other}",
"\${test_resource.other.string_value}"
"test_resource.other",
"test_resource.other.string_value"
]
},
"name": "foo"
Expand Down