From afd60c7373350b9678bb0659c1979a3c6cecc216 Mon Sep 17 00:00:00 2001 From: Miles Yucht Date: Wed, 14 Aug 2024 13:53:56 +0200 Subject: [PATCH 1/2] work --- internal/acceptance/mws_network_connectivity_config_test.go | 1 + internal/acceptance/sql_endpoint_test.go | 4 ++-- internal/acceptance/workspace_conf_test.go | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/acceptance/mws_network_connectivity_config_test.go b/internal/acceptance/mws_network_connectivity_config_test.go index 1e19e657fd..0358fa7701 100644 --- a/internal/acceptance/mws_network_connectivity_config_test.go +++ b/internal/acceptance/mws_network_connectivity_config_test.go @@ -5,6 +5,7 @@ import ( ) func TestMwsAccNetworkConnectivityConfig(t *testing.T) { + loadDebugEnvIfRunsFromIDE(t, "account") if isAzure(t) { accountLevel(t, step{ Template: ` diff --git a/internal/acceptance/sql_endpoint_test.go b/internal/acceptance/sql_endpoint_test.go index 66bdbea5cb..ace170ff66 100644 --- a/internal/acceptance/sql_endpoint_test.go +++ b/internal/acceptance/sql_endpoint_test.go @@ -21,7 +21,7 @@ func TestAccSQLEndpoint(t *testing.T) { tags { custom_tags { key = "Owner" - value = "eng-dev-ecosystem-team@databricks.com" + value = "eng-dev-ecosystem-team_at_databricks.com" } } }`, @@ -37,7 +37,7 @@ func TestAccSQLEndpoint(t *testing.T) { tags { custom_tags { key = "Owner" - value = "eng-dev-ecosystem-team@databricks.com" + value = "eng-dev-ecosystem-team_at_databricks.com" } } }`, diff --git a/internal/acceptance/workspace_conf_test.go b/internal/acceptance/workspace_conf_test.go index 24fa145679..e2e23c7221 100644 --- a/internal/acceptance/workspace_conf_test.go +++ b/internal/acceptance/workspace_conf_test.go @@ -20,7 +20,7 @@ func assertEnableIpAccessList(t *testing.T, expected string) { }) require.NoError(t, err) assert.Len(t, *conf, 1) - assert.Equal(t, (*conf)["enableIpAccessLists"], expected) + assert.Equal(t, expected, (*conf)["enableIpAccessLists"]) } func TestAccWorkspaceConfFullLifecycle(t *testing.T) { @@ -70,11 +70,11 @@ func TestAccWorkspaceConfFullLifecycle(t *testing.T) { }`, Check: func(s *terraform.State) error { // Assert server side configuration is updated - assertEnableIpAccessList(t, "true") + assertEnableIpAccessList(t, "TRue") // Assert state is persisted conf := s.RootModule().Resources["databricks_workspace_conf.this"] - assert.Equal(t, "true", conf.Primary.Attributes["custom_config.enableIpAccessLists"]) + assert.Equal(t, "TRue", conf.Primary.Attributes["custom_config.enableIpAccessLists"]) return nil }, }) From bbd642949637f6c764bccbbd296c2f442e3fe833 Mon Sep 17 00:00:00 2001 From: Miles Yucht Date: Wed, 14 Aug 2024 13:55:56 +0200 Subject: [PATCH 2/2] fix --- internal/acceptance/mws_network_connectivity_config_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/acceptance/mws_network_connectivity_config_test.go b/internal/acceptance/mws_network_connectivity_config_test.go index 0358fa7701..1e19e657fd 100644 --- a/internal/acceptance/mws_network_connectivity_config_test.go +++ b/internal/acceptance/mws_network_connectivity_config_test.go @@ -5,7 +5,6 @@ import ( ) func TestMwsAccNetworkConnectivityConfig(t *testing.T) { - loadDebugEnvIfRunsFromIDE(t, "account") if isAzure(t) { accountLevel(t, step{ Template: `