Ensure that #170 doesn't regress

examples/examples_nodejs_test.go

@@ -1,4 +1,5 @@
 // Copyright 2016-2020, Pulumi Corporation.  All rights reserved.
+//go:build nodejs || all
 // +build nodejs all
 
 package examples
@@ -19,6 +20,15 @@ func TestNetworkTs(t *testing.T) {
 	integration.ProgramTest(t, &test)
 }
 
+func TestServerTs(t *testing.T) {
+	test := getJSBaseOptions(t).
+		With(integration.ProgramTestOptions{
+			Dir: path.Join(getCwd(t), "server", "ts"),
+		})
+
+	integration.ProgramTest(t, &test)
+}
+
 func getJSBaseOptions(t *testing.T) integration.ProgramTestOptions {
 	base := getBaseOptions(t)
 	baseJS := base.With(integration.ProgramTestOptions{

examples/server/ts/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/node_modules/

examples/server/ts/Pulumi.yaml

@@ -0,0 +1,3 @@
+name: server-ts
+runtime: nodejs
+description: A minimal TypeScript Pulumi program

examples/server/ts/index.ts

@@ -0,0 +1,18 @@
+import * as hcloud from "@pulumi/hcloud";
+
+const network = new hcloud.Network("network", {
+  ipRange: "10.0.1.0/24",
+});
+
+const subnet = new hcloud.NetworkSubnet("subnet", {
+  networkId: network.id.apply(Number),
+  ipRange: "10.0.1.0/24",
+  networkZone: "eu-central",
+  type: "cloud",
+});
+
+new hcloud.Server("server", {
+    serverType: "cx11",
+    image: "ubuntu-22.04",
+    networks: [{ networkId: network.id.apply(Number) }],
+}, {dependsOn: subnet});

examples/server/ts/package.json

@@ -0,0 +1,12 @@
+{
+    "name": "server-ts",
+    "devDependencies": {
+        "@types/node": "^10.0.0"
+    },
+    "dependencies": {
+        "@pulumi/pulumi": "^3.0.0"
+    },
+    "peerDependencies": {
+        "@pulumi/hcloud": "dev"
+    }
+}

examples/server/ts/tsconfig.json

@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "strict": true,
+        "outDir": "bin",
+        "target": "es2016",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "sourceMap": true,
+        "experimentalDecorators": true,
+        "pretty": true,
+        "noFallthroughCasesInSwitch": true,
+        "noImplicitReturns": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.ts"
+    ]
+}

provider/resources.go

@@ -27,6 +27,7 @@ import (
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	tks "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"
 	shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 
 	"github.com/pulumi/pulumi-hcloud/provider/pkg/version"
 )
@@ -65,6 +66,34 @@ func Provider() tfbridge.ProviderInfo {
 					},
 				},
 			},
+			"hcloud_server": {
+				// Work around
+				// https://github.com/hetznercloud/terraform-provider-hcloud/issues/650
+				// by applying the fix described in
+				// https://github.com/hetznercloud/terraform-provider-hcloud/issues/650#issuecomment-1497160625.
+				PreCheckCallback: func(
+					ctx context.Context, config resource.PropertyMap, _ resource.PropertyMap,
+				) (resource.PropertyMap, error) {
+					const debug = "Fixing up for https://github.com/hetznercloud/terraform-provider-hcloud/issues/650"
+					networksProp, ok := config["networks"]
+					if !ok || !networksProp.IsArray() {
+						return config, nil
+					}
+					networks := networksProp.ArrayValue()
+					for _, networkProp := range networks {
+						if !networkProp.IsObject() {
+							continue
+						}
+						const aliasIps = "aliasIps"
+						network := networkProp.ObjectValue()
+						if _, ok := network[aliasIps]; !ok {
+							tfbridge.GetLogger(ctx).Debug(debug)
+							network[aliasIps] = resource.NewProperty([]resource.PropertyValue{})
+						}
+					}
+					return config, nil
+				},
+			},
 		},
 		JavaScript: &tfbridge.JavaScriptInfo{
 			// List any npm dependencies and their versions