From 81bd8299118b4dc655058c917baeadb658d2a790 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 22 Jul 2020 15:23:13 +0200 Subject: [PATCH 1/4] Avoid conflicts with resource attributes called `node` - Fixes #125 --- packages/cdktf/lib/terraform-element.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cdktf/lib/terraform-element.ts b/packages/cdktf/lib/terraform-element.ts index e32509e9b0..0e18b8dc78 100644 --- a/packages/cdktf/lib/terraform-element.ts +++ b/packages/cdktf/lib/terraform-element.ts @@ -14,11 +14,11 @@ export class TerraformElement extends Construct { constructor(scope: Construct, id: string) { super(scope, id) - this.node.addMetadata('stacktrace', 'trace') + this.constructsNode.addMetadata('stacktrace', 'trace') this.stack = TerraformStack.of(this); } - public get node(): Node { + public get constructsNode(): Node { return Node.of(this) } @@ -27,7 +27,7 @@ export class TerraformElement extends Construct { } public get friendlyUniqueId() { - const node = this.node + const node = this.constructsNode const components = node.scopes.slice(1).map(c => Node.of(c).id); return components.length > 0 ? makeUniqueId(components) : ''; } @@ -35,9 +35,9 @@ export class TerraformElement extends Construct { protected get nodeMetadata(): {[key: string]: any} { return { metadata: { - path: this.node.path, + path: this.constructsNode.path, uniqueId: this.friendlyUniqueId, - stackTrace: this.node.metadata.find((e) => e.type === 'stacktrace')?.trace + stackTrace: this.constructsNode.metadata.find((e) => e.type === 'stacktrace')?.trace } as TerraformElementMetadata } } From 0f87ddf3ffa8d7bca5a25f3c93a541c823596c78 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 22 Jul 2020 15:26:22 +0200 Subject: [PATCH 2/4] Singular name --- packages/cdktf/lib/terraform-element.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cdktf/lib/terraform-element.ts b/packages/cdktf/lib/terraform-element.ts index 0e18b8dc78..e36d6840fe 100644 --- a/packages/cdktf/lib/terraform-element.ts +++ b/packages/cdktf/lib/terraform-element.ts @@ -14,11 +14,11 @@ export class TerraformElement extends Construct { constructor(scope: Construct, id: string) { super(scope, id) - this.constructsNode.addMetadata('stacktrace', 'trace') + this.constructNode.addMetadata('stacktrace', 'trace') this.stack = TerraformStack.of(this); } - public get constructsNode(): Node { + public get constructNode(): Node { return Node.of(this) } @@ -27,7 +27,7 @@ export class TerraformElement extends Construct { } public get friendlyUniqueId() { - const node = this.constructsNode + const node = this.constructNode const components = node.scopes.slice(1).map(c => Node.of(c).id); return components.length > 0 ? makeUniqueId(components) : ''; } @@ -35,9 +35,9 @@ export class TerraformElement extends Construct { protected get nodeMetadata(): {[key: string]: any} { return { metadata: { - path: this.constructsNode.path, + path: this.constructNode.path, uniqueId: this.friendlyUniqueId, - stackTrace: this.constructsNode.metadata.find((e) => e.type === 'stacktrace')?.trace + stackTrace: this.constructNode.metadata.find((e) => e.type === 'stacktrace')?.trace } as TerraformElementMetadata } } From e9a4826540b168244f5d59618acb5c9123dbca5c Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 22 Jul 2020 16:31:09 +0200 Subject: [PATCH 3/4] Build consul provider in test --- test/test-providers/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-providers/main.ts b/test/test-providers/main.ts index 90bc889d29..af24c58868 100644 --- a/test/test-providers/main.ts +++ b/test/test-providers/main.ts @@ -11,7 +11,7 @@ import * as Kubernetes from "./.gen/providers/kubernetes"; // // import * as Nomad from "./.gen/providers/nomad"; // import * as Vault from "./.gen/providers/vault"; -// import * as Consul from "./.gen/providers/consul"; +import * as Consul from "./.gen/providers/consul"; export class HelloTerra extends TerraformStack { constructor(scope: Construct, id: string) { @@ -27,7 +27,7 @@ export class HelloTerra extends TerraformStack { }, ]); - [Aws, Azure, Google, Kubernetes]; + [Aws, Azure, Google, Kubernetes, Consul]; } } From 6b351ffcda23e7be906a416af820b93ca0820f89 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Wed, 22 Jul 2020 16:32:01 +0200 Subject: [PATCH 4/4] Drop reference to issue --- test/test-providers/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test-providers/main.ts b/test/test-providers/main.ts index af24c58868..09e322d400 100644 --- a/test/test-providers/main.ts +++ b/test/test-providers/main.ts @@ -6,7 +6,6 @@ import * as Azure from "./.gen/providers/azurerm"; import * as Google from "./.gen/providers/google"; import * as Kubernetes from "./.gen/providers/kubernetes"; // The following providers still have bugs -// - https://github.com/hashicorp/terraform-cdk/issues/125 // - https://github.com/hashicorp/terraform-cdk/issues/124 // // import * as Nomad from "./.gen/providers/nomad";