prevent loading additional config for splice clusters in the internal repo and reattach resolved config targets to update-expected targets (#3373)

[static]

Signed-off-by: Mateusz Błażejewski <[email protected]>

Author: mblaze-da

cluster/pulumi/common/src/config/configLoader.ts

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 import * as Yaml from 'js-yaml';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, realpathSync } from 'fs';
 import { merge, mergeWith } from 'lodash';
 import { dirname, join, resolve } from 'path';
 
@@ -129,7 +129,9 @@ export function loadClusterYamlConfig(): unknown {
   );
   // Load an additional common overrides config if it exists;
   // if the file is identical to the base config for some reason, loading it will not change anything.
-  const commonOverridesConfigPath = `${spliceEnvConfig.context.clusterPath()}/../config.yaml`;
+  // It is resolved against the cluster path with expanded symlinks to ensure that additional
+  // overrides from the internal repository are not applied to clusters defined in splice.
+  const commonOverridesConfigPath = `${realpathSync(spliceEnvConfig.context.clusterPath())}/../config.yaml`;
   const commonOverridesConfig = existsSync(commonOverridesConfigPath)
     ? readAndParseYaml(commonOverridesConfigPath)
     : {};

cluster/pulumi/local.mk

@@ -26,12 +26,10 @@ $(dir)/unit-test: $(dir)/.build
 
 pulumi_projects ::= operator deployment gcp infra canton-network sv-runbook validator-runbook multi-validator cluster sv-canton validator1 splitwell
 
-# TODO(#3237) Reattach resolved config targets to test and update-expected after resolving issues
-#             with loading scratchnet configs in the internal repository.
 .PHONY: $(dir)/test $(dir)/update-expected
-$(dir)/test: $(dir)/unit-test $(foreach project,$(pulumi_projects),$(dir)/$(project)/test) # $(deployment_dir)/check-resolved-config 
+$(dir)/test: $(dir)/unit-test $(foreach project,$(pulumi_projects),$(dir)/$(project)/test) $(deployment_dir)/check-resolved-config 
 
 .PHONY: $(dir)/update-expected
-$(dir)/update-expected: $(foreach project,$(pulumi_projects),$(dir)/$(project)/update-expected) # $(deployment_dir)/update-resolved-config
+$(dir)/update-expected: $(foreach project,$(pulumi_projects),$(dir)/$(project)/update-expected) $(deployment_dir)/update-resolved-config
 
 include $(pulumi_projects:%=$(dir)/%/local.mk)