Specify ComputeID for risk_behavior, access_mutual_tls_hostname_settings (#792)

Fixes #791

Author: iwahbe

examples/regress-791/Pulumi.yaml

@@ -0,0 +1,2 @@
+name: regress-791
+runtime: nodejs

examples/regress-791/index.ts

@@ -0,0 +1,9 @@
+import * as pulumi from "@pulumi/pulumi";
+import * as cloudflare from "@pulumi/cloudflare";
+
+const config = new pulumi.Config();
+const accountId = config.require("accountId");
+
+new cloudflare.RiskBehavior("test", {
+  accountId: accountId,
+});

examples/regress-791/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "cloudflare-record",
+  "version": "0.1.0",
+  "dependencies": {
+    "@pulumi/cloudflare": "^5.0.0",
+    "@pulumi/pulumi": "^3.0.0"
+  }
+}

examples/regress-791/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "outDir": "bin",
+    "target": "es6",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "stripInternal": true,
+    "experimentalDecorators": true,
+    "pretty": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "forceConsistentCasingInFileNames": true,
+    "strictNullChecks": true
+  },
+  "files": [
+    "index.ts"
+  ]
+}

provider/resources.go

@@ -28,6 +28,7 @@ import (
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	tfbridgetokens "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-cloudflare/provider/v5/pkg/version"
 )
@@ -51,6 +52,11 @@ func Provider() tfbridge.ProviderInfo {
 		provShim.PFProvider(),
 	)
 
+	delegateID := func(pulumiField string) tfbridge.ComputeID {
+		return tfbridge.DelegateIDField(resource.PropertyKey(pulumiField),
+			"cloudflare", "https://github.com/pulumi/pulumi-cloudflare")
+	}
+
 	// Create a Pulumi provider mapping
 	prov := tfbridge.ProviderInfo{
 		P:                p,
@@ -115,6 +121,25 @@ func Provider() tfbridge.ProviderInfo {
 			// resource will conflict with the old one. To avoid this, we set
 			// `DeleteBeforeReplace: true`.
 			"cloudflare_record": {DeleteBeforeReplace: true},
+
+			"cloudflare_risk_behavior": {ComputeID: delegateID("accountId")},
+			// cloudflare_access_mutual_tls_hostname_settings has no
+			"cloudflare_access_mutual_tls_hostname_settings": {
+				ComputeID: func(_ context.Context, state resource.PropertyMap) (resource.ID, error) {
+					account, hasAccount := state["accountId"]
+					zone, hasZone := state["zoneId"]
+					switch {
+					case hasAccount && hasZone:
+						return resource.ID(account.StringValue() + "__" + zone.StringValue()), nil
+					case hasAccount:
+						return resource.ID(account.StringValue()), nil
+					case hasZone:
+						return resource.ID(zone.StringValue()), nil
+					default:
+						return "id", nil
+					}
+				},
+			},
 		},
 		JavaScript: &tfbridge.JavaScriptInfo{
 			Dependencies: map[string]string{