Merge remote-tracking branch 'origin/main' into jjs/presets

This commit is contained in:
Sas Swart
2025-02-07 08:11:01 +00:00
63 changed files with 1287 additions and 482 deletions

View File

@ -11,6 +11,7 @@ import (
"strings"
"testing"
"github.com/google/go-cmp/cmp"
tfjson "github.com/hashicorp/terraform-json"
"github.com/stretchr/testify/require"
protobuf "google.golang.org/protobuf/proto"
@ -924,7 +925,9 @@ func TestConvertResources(t *testing.T) {
var resourcesMap []map[string]interface{}
err = json.Unmarshal(data, &resourcesMap)
require.NoError(t, err)
require.Equal(t, expectedNoMetadataMap, resourcesMap)
if diff := cmp.Diff(expectedNoMetadataMap, resourcesMap); diff != "" {
require.Failf(t, "unexpected resources", "diff (-want +got):\n%s", diff)
}
expectedParams := expected.parameters
if expectedParams == nil {
@ -981,7 +984,9 @@ func TestConvertResources(t *testing.T) {
var resourcesMap []map[string]interface{}
err = json.Unmarshal(data, &resourcesMap)
require.NoError(t, err)
require.Equal(t, expectedMap, resourcesMap)
if diff := cmp.Diff(expectedMap, resourcesMap); diff != "" {
require.Failf(t, "unexpected resources", "diff (-want +got):\n%s", diff)
}
require.ElementsMatch(t, expected.externalAuthProviders, state.ExternalAuthProviders)
require.ElementsMatch(t, expected.Presets, state.Presets)