@cdktn/provider-schema 0.25.0-pre.2 → 0.25.0-pre.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdktn/provider-schema",
-  "version": "0.25.0-pre.2",
+  "version": "0.25.0-pre.21",
   "publishConfig": {
     "access": "public"
   },
@@ -32,15 +32,16 @@
     "deepmerge": "4.3.1",
     "fs-extra": "11.3.6",
     "semver": "7.8.5",
-    "@cdktn/commons": "0.25.0-pre.2",
-    "@cdktn/hcl2json": "0.25.0-pre.2"
+    "@cdktn/commons": "0.25.0-pre.21",
+    "@cdktn/hcl2json": "0.25.0-pre.21"
   },
   "devDependencies": {
+    "@types/node": "22.20.1",
     "@types/fs-extra": "11.0.4",
     "@types/semver": "7.7.1",
     "safe-stable-stringify": "2.5.0",
     "tsc-files": "1.1.4",
-    "typescript": "^5.0.4"
+    "typescript": "~6.0.0"
   },
   "lint-staged": {
     "src/**/*.{ts,tsx}": "tsc-files ambient.d.ts --noEmit"
@@ -50,8 +51,8 @@
     "watch": "tsc -w",
     "watch-preserve-output": "tsc -w --preserveWatchOutput",
     "test:update": "jest -u",
-    "package": "./package.sh",
+    "package": "bash package.sh",
     "dist-clean": "rm -rf dist",
-    "package:js": "./package.sh"
+    "package:js": "bash package.sh"
   }
 }

package/src/__tests__/__snapshots__/provider-schema.test.ts.snap

@@ -30,6 +30,29 @@ exports[`readSchema generates a local json module 1`] = `
 }"
 `;
 
+exports[`readSchema generates a local json module that requires provider configuration aliases 1`] = `
+"{
+  "format_version": "STUBBED VERSION",
+  "local_module": {
+    "inputs": [
+      {
+        "default": "module",
+        "description": "Name of the DigitalOcean static site",
+        "name": "name",
+        "required": false,
+        "type": "any"
+      }
+    ],
+    "name": "local_module",
+    "outputs": [
+      {
+        "name": "uri"
+      }
+    ]
+  }
+}"
+`;
+
 exports[`readSchema generates a local module 1`] = `
 "{
   "format_version": "STUBBED VERSION",
@@ -68,6 +91,52 @@ exports[`readSchema generates a local module 1`] = `
 }"
 `;
 
+exports[`readSchema generates a local module that declares provider configuration aliases across .tf and .tf.json files 1`] = `
+"{
+  "format_version": "STUBBED VERSION",
+  "local_module": {
+    "inputs": [
+      {
+        "description": "Name of the s3 bucket. Must be unique.",
+        "name": "bucket_name",
+        "required": true,
+        "type": "string"
+      }
+    ],
+    "name": "local_module",
+    "outputs": [
+      {
+        "description": "ARN of the bucket",
+        "name": "arn"
+      }
+    ]
+  }
+}"
+`;
+
+exports[`readSchema generates a local module that requires provider configuration aliases 1`] = `
+"{
+  "format_version": "STUBBED VERSION",
+  "local_module": {
+    "inputs": [
+      {
+        "description": "Name of the s3 bucket. Must be unique.",
+        "name": "bucket_name",
+        "required": true,
+        "type": "string"
+      }
+    ],
+    "name": "local_module",
+    "outputs": [
+      {
+        "description": "ARN of the bucket",
+        "name": "arn"
+      }
+    ]
+  }
+}"
+`;
+
 exports[`readSchema generates a local module with inline comments in type constraints 1`] = `
 "{
   "format_version": "STUBBED VERSION",

package/src/__tests__/fixtures/local-json-module-provider-aliases/module.tf.json

@@ -0,0 +1,21 @@
+{
+  "terraform": {
+    "required_providers": {
+      "null": {
+        "source": "hashicorp/null",
+        "configuration_aliases": ["null.extra"]
+      }
+    }
+  },
+  "variable": {
+    "name": {
+      "default": "module",
+      "description": "Name of the DigitalOcean static site"
+    }
+  },
+  "output": {
+    "uri": {
+      "value": "${digitalocean_app.static_site}"
+    }
+  }
+}

package/src/__tests__/fixtures/local-mixed-module-provider-aliases/aliases.tf.json

@@ -0,0 +1,10 @@
+{
+  "terraform": {
+    "required_providers": {
+      "null": {
+        "source": "hashicorp/null",
+        "configuration_aliases": ["null.extra"]
+      }
+    }
+  }
+}

package/src/__tests__/fixtures/local-mixed-module-provider-aliases/module.tf

@@ -0,0 +1,22 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+# One half of a module that spreads its terraform settings across .tf and
+# .tf.json files. Terraform allows several terraform blocks but only one
+# required_providers configuration, so the provider requirements live in the
+# .tf.json half - which hcl2json merges into a shape that hides them from a
+# plain walk over the parsed terraform blocks.
+
+terraform {
+  required_version = ">= 1.0"
+}
+
+variable "bucket_name" {
+  description = "Name of the s3 bucket. Must be unique."
+  type        = string
+}
+
+output "arn" {
+  description = "ARN of the bucket"
+  value       = aws_s3_bucket.s3_bucket.arn
+}

package/src/__tests__/fixtures/local-module-provider-aliases/module.tf

@@ -0,0 +1,24 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+# A module that expects its caller to hand it extra provider configurations,
+# the way multi-region AWS modules do.
+
+terraform {
+  required_providers {
+    aws = {
+      source                = "hashicorp/aws"
+      configuration_aliases = [aws.global_region, aws.secondary_region]
+    }
+  }
+}
+
+variable "bucket_name" {
+  description = "Name of the s3 bucket. Must be unique."
+  type        = string
+}
+
+output "arn" {
+  description = "ARN of the bucket"
+  value       = aws_s3_bucket.s3_bucket.arn
+}