fix bwd compatibility to infra stack in validator-runbook (#3054)

isegall-da · web-flow · commit e9d43973a9f8 · 2025-11-03T14:41:02.000-05:00
Signed-off-by: Itai Segall &lt;itai.segall@digitalasset.com&gt;
diff --git a/cluster/expected/canton-network/expected.json b/cluster/expected/canton-network/expected.json
@@ -753,6 +753,16 @@
     "provider": "",
     "type": "kubernetes:networking.istio.io/v1alpha3:VirtualService"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/cluster/expected.json b/cluster/expected/cluster/expected.json
@@ -103,5 +103,15 @@
     "name": "hyperdisk-balanced-rwo",
     "provider": "",
     "type": "kubernetes:storage.k8s.io/v1:StorageClass"
+  },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
   }
 ]
diff --git a/cluster/expected/deployment/expected.json b/cluster/expected/deployment/expected.json
@@ -901,6 +901,16 @@
     "provider": "",
     "type": "kubernetes:pulumi.com/v1:Stack"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/gcp/expected.json b/cluster/expected/gcp/expected.json
@@ -236,6 +236,16 @@
     "provider": "",
     "type": "cn:gcp:ImportedSecret"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/infra/expected.json b/cluster/expected/infra/expected.json
@@ -3238,6 +3238,16 @@
     "provider": "",
     "type": "kubernetes:core/v1:Namespace"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/multi-validator/expected.json b/cluster/expected/multi-validator/expected.json
@@ -4743,6 +4743,16 @@
     "provider": "",
     "type": "kubernetes:core/v1:Namespace"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/operator/expected.json b/cluster/expected/operator/expected.json
@@ -569,6 +569,16 @@
     "provider": "",
     "type": "kubernetes:core/v1:Namespace"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/splitwell/expected.json b/cluster/expected/splitwell/expected.json
@@ -227,6 +227,16 @@
     "provider": "",
     "type": "kubernetes:networking.istio.io/v1alpha3:VirtualService"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/sv-runbook/expected.json b/cluster/expected/sv-runbook/expected.json
@@ -511,6 +511,16 @@
     "provider": "",
     "type": "kubernetes:networking.istio.io/v1alpha3:VirtualService"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/validator-runbook/expected.json b/cluster/expected/validator-runbook/expected.json
@@ -285,6 +285,16 @@
     "provider": "",
     "type": "kubernetes:networking.istio.io/v1alpha3:VirtualService"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/expected/validator1/expected.json b/cluster/expected/validator1/expected.json
@@ -277,6 +277,16 @@
     "provider": "",
     "type": "cn:gcp:ServiceAccount"
   },
+  {
+    "custom": true,
+    "id": "organization/infra/infra.mock",
+    "inputs": {
+      "name": "organization/infra/infra.mock"
+    },
+    "name": "organization/infra/infra.mock",
+    "provider": "",
+    "type": "pulumi:pulumi:StackReference"
+  },
   {
     "custom": true,
     "id": "",
diff --git a/cluster/pulumi/common/src/auth0/auth0.ts b/cluster/pulumi/common/src/auth0/auth0.ts
@@ -8,7 +8,8 @@ import { Output } from '@pulumi/pulumi';
 import { AuthenticationClient, ManagementClient, TokenSet } from 'auth0';
 
 import { config, isMainNet } from '../config';
-import { CLUSTER_BASENAME, fixedTokens } from '../utils';
+import { infraStack } from '../stackReferences';
+import { fixedTokens } from '../utils';
 import { DEFAULT_AUDIENCE } from './audiences';
 import type {
   Auth0Client,
@@ -300,8 +301,7 @@ export enum Auth0ClientType {
   MAINSTACK,
 }
 
-function getAuth0ClusterConfig(): Output<Auth0ClusterConfig> {
-  const infraStack = new pulumi.StackReference(`organization/infra/infra.${CLUSTER_BASENAME}`);
+export function getAuth0ClusterConfig(): Output<Auth0ClusterConfig> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const infraOutput: pulumi.Output<any> = infraStack.requireOutput('auth0');
   return infraOutput.apply(output => {
diff --git a/cluster/pulumi/validator-runbook/src/index.ts b/cluster/pulumi/validator-runbook/src/index.ts
@@ -1,8 +1,10 @@
 // Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-import * as pulumi from '@pulumi/pulumi';
-import { Auth0ClusterConfig, Auth0Fetch, config } from '@lfdecentralizedtrust/splice-pulumi-common';
-import { infraStack } from '@lfdecentralizedtrust/splice-pulumi-common/src/stackReferences';
+import {
+  Auth0Fetch,
+  config,
+  getAuth0ClusterConfig,
+} from '@lfdecentralizedtrust/splice-pulumi-common';
 
 import { installNode } from './installNode';
 
@@ -16,7 +18,7 @@ async function auth0CacheAndInstallNode(auth0Fetch: Auth0Fetch) {
 
 // TODO(DACH-NY/canton-network-node#8008): Reduce duplication from sv-runbook stack
 async function main() {
-  const auth0ClusterCfg = infraStack.requireOutput('auth0') as pulumi.Output<Auth0ClusterConfig>;
+  const auth0ClusterCfg = getAuth0ClusterConfig();
   if (!auth0ClusterCfg.validatorRunbook) {
     throw new Error('missing validator runbook auth0 output');
   }
