Rename ResolveResourceReferences to mutator.ResolveLookupVariables (#3362)

## Why

ResourceResourceReferences sounds like it would be resolving
${resources...} like references which is also something we do.

Author: denik

acceptance/bundle/debug/direct/out.stderr.txt

@@ -40,7 +40,7 @@
 10:07:59 Debug: Apply pid=12345 mutator=RewriteWorkspacePrefix
 10:07:59 Debug: Apply pid=12345 mutator=SetVariables
 10:07:59 Debug: Apply pid=12345 mutator=ResolveVariableReferences
-10:07:59 Debug: Apply pid=12345 mutator=ResolveResourceReferences
+10:07:59 Debug: Apply pid=12345 mutator=ResolveLookupVariables
 10:07:59 Debug: Apply pid=12345 mutator=ResolveVariableReferences
 10:07:59 Debug: Apply pid=12345 mutator=validate:volume-path
 10:07:59 Debug: Apply pid=12345 mutator=ApplyTargetMode

acceptance/bundle/debug/tf/out.stderr.txt

@@ -38,7 +38,7 @@
 10:07:59 Debug: Apply pid=12345 mutator=RewriteWorkspacePrefix
 10:07:59 Debug: Apply pid=12345 mutator=SetVariables
 10:07:59 Debug: Apply pid=12345 mutator=ResolveVariableReferences
-10:07:59 Debug: Apply pid=12345 mutator=ResolveResourceReferences
+10:07:59 Debug: Apply pid=12345 mutator=ResolveLookupVariables
 10:07:59 Debug: Apply pid=12345 mutator=ResolveVariableReferences
 10:07:59 Debug: Apply pid=12345 mutator=validate:volume-path
 10:07:59 Debug: Apply pid=12345 mutator=ApplyTargetMode

…g/mutator/resolve_resource_references.go …nfig/mutator/resolve_lookup_variables.gobundle/config/mutator/resolve_resource_references.go renamed to bundle/config/mutator/resolve_lookup_variables.go bundle/config/mutator/resolve_resource_references.go renamed to bundle/config/mutator/resolve_lookup_variables.go

@@ -10,13 +10,13 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-type resolveResourceReferences struct{}
+type resolveLookupVariables struct{}
 
-func ResolveResourceReferences() bundle.Mutator {
-	return &resolveResourceReferences{}
+func ResolveLookupVariables() bundle.Mutator {
+	return &resolveLookupVariables{}
 }
 
-func (m *resolveResourceReferences) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
+func (m *resolveLookupVariables) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	errs, errCtx := errgroup.WithContext(ctx)
 
 	for k := range b.Config.Variables {
@@ -44,6 +44,6 @@ func (m *resolveResourceReferences) Apply(ctx context.Context, b *bundle.Bundle)
 	return diag.FromErr(errs.Wait())
 }
 
-func (*resolveResourceReferences) Name() string {
-	return "ResolveResourceReferences"
+func (*resolveLookupVariables) Name() string {
+	return "ResolveLookupVariables"
 }

…ator/resolve_resource_references_test.go …mutator/resolve_lookup_variables_test.gobundle/config/mutator/resolve_resource_references_test.go renamed to bundle/config/mutator/resolve_lookup_variables_test.go bundle/config/mutator/resolve_resource_references_test.go renamed to bundle/config/mutator/resolve_lookup_variables_test.go

@@ -52,7 +52,7 @@ func TestResolveClusterReference(t *testing.T) {
 		{ClusterId: "9876-5432-xywz", ClusterName: clusterRef2},
 	}, nil)
 
-	diags := bundle.Apply(context.Background(), b, ResolveResourceReferences())
+	diags := bundle.Apply(context.Background(), b, ResolveLookupVariables())
 	require.NoError(t, diags.Error())
 	require.Equal(t, "1234-5678-abcd", b.Config.Variables["my-cluster-id-1"].Value)
 	require.Equal(t, "9876-5432-xywz", b.Config.Variables["my-cluster-id-2"].Value)
@@ -87,7 +87,7 @@ func TestResolveNonExistentClusterReference(t *testing.T) {
 		{ClusterId: "1234-5678-abcd", ClusterName: "some other cluster"},
 	}, nil)
 
-	diags := bundle.Apply(context.Background(), b, ResolveResourceReferences())
+	diags := bundle.Apply(context.Background(), b, ResolveLookupVariables())
 	require.ErrorContains(t, diags.Error(), "failed to resolve cluster: Random, err: cluster named 'Random' does not exist")
 }
 
@@ -111,7 +111,7 @@ func TestNoLookupIfVariableIsSet(t *testing.T) {
 	err := b.Config.Variables["my-cluster-id"].Set("random value")
 	require.NoError(t, err)
 
-	diags := bundle.Apply(context.Background(), b, ResolveResourceReferences())
+	diags := bundle.Apply(context.Background(), b, ResolveLookupVariables())
 	require.NoError(t, diags.Error())
 	require.Equal(t, "random value", b.Config.Variables["my-cluster-id"].Value)
 }
@@ -138,7 +138,7 @@ func TestResolveServicePrincipal(t *testing.T) {
 		ApplicationId: "app-1234",
 	}, nil)
 
-	diags := bundle.Apply(context.Background(), b, ResolveResourceReferences())
+	diags := bundle.Apply(context.Background(), b, ResolveLookupVariables())
 	require.NoError(t, diags.Error())
 	require.Equal(t, "app-1234", b.Config.Variables["my-sp"].Value)
 }
@@ -176,7 +176,7 @@ func TestResolveVariableReferencesInVariableLookups(t *testing.T) {
 		{ClusterId: "9876-5432-xywz", ClusterName: "some other cluster"},
 	}, nil)
 
-	diags := bundle.ApplySeq(context.Background(), b, ResolveVariableReferencesInLookup(), ResolveResourceReferences())
+	diags := bundle.ApplySeq(context.Background(), b, ResolveVariableReferencesInLookup(), ResolveLookupVariables())
 	require.NoError(t, diags.Error())
 	require.Equal(t, "cluster-bar-dev", b.Config.Variables["lookup"].Lookup.Cluster)
 	require.Equal(t, "1234-5678-abcd", b.Config.Variables["lookup"].Value)
@@ -203,7 +203,7 @@ func TestResolveLookupVariableReferencesInVariableLookups(t *testing.T) {
 	m := mocks.NewMockWorkspaceClient(t)
 	b.SetWorkpaceClient(m.WorkspaceClient)
 
-	diags := bundle.ApplySeq(context.Background(), b, ResolveVariableReferencesInLookup(), ResolveResourceReferences())
+	diags := bundle.ApplySeq(context.Background(), b, ResolveVariableReferencesInLookup(), ResolveLookupVariables())
 	require.ErrorContains(t, diags.Error(), "lookup variables cannot contain references to another lookup variables")
 }
 
@@ -229,7 +229,7 @@ func TestNoResolveLookupIfVariableSetWithEnvVariable(t *testing.T) {
 	ctx := context.Background()
 	ctx = env.Set(ctx, "BUNDLE_VAR_lookup", "1234-5678-abcd")
 
-	diags := bundle.ApplySeq(ctx, b, SetVariables(), ResolveVariableReferencesInLookup(), ResolveResourceReferences())
+	diags := bundle.ApplySeq(ctx, b, SetVariables(), ResolveVariableReferencesInLookup(), ResolveLookupVariables())
 	require.NoError(t, diags.Error())
 	require.Equal(t, "1234-5678-abcd", b.Config.Variables["lookup"].Value)
 }

bundle/phases/initialize.go

@@ -113,7 +113,7 @@ func Initialize(ctx context.Context, b *bundle.Bundle) {
 
 		// Reads (dynamic): variables.*.lookup (checks for variables with lookup fields)
 		// Updates (dynamic): variables.*.value (sets values based on resolved lookups)
-		mutator.ResolveResourceReferences(),
+		mutator.ResolveLookupVariables(),
 
 		// Reads (dynamic): * (strings) (searches for variable references in string values)
 		// Updates (dynamic): * (except 'resources') (strings) (resolves variable references to their actual values)