Fix databricks_metastore_data_access and databricks_storage_credential creation on GCP (#2712)

* fix

* fix test

Author: nkvuong

catalog/resource_metastore_data_access.go

@@ -97,6 +97,11 @@ func ResourceMetastoreDataAccess() *schema.Resource {
 			var create catalog.CreateStorageCredential
 			common.DataToStructPointer(d, tmpSchema, &create)
 
+			//manually add empty struct back for databricks_gcp_service_account
+			if _, ok := d.GetOk("databricks_gcp_service_account"); ok {
+				create.DatabricksGcpServiceAccount = struct{}{}
+			}
+
 			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
 				dac, err := acc.StorageCredentials.Create(ctx,
 					catalog.AccountsCreateStorageCredential{

catalog/resource_metastore_data_access_test.go

@@ -129,8 +129,9 @@ func TestCreateDacWithDbGcpSA(t *testing.T) {
 			{
 				Method:   "POST",
 				Resource: "/api/2.1/unity-catalog/storage-credentials",
-				ExpectedRequest: DataAccessConfiguration{
-					Name: "bcd",
+				ExpectedRequest: catalog.CreateStorageCredential{
+					Name:                        "bcd",
+					DatabricksGcpServiceAccount: struct{}{},
 				},
 				Response: catalog.StorageCredentialInfo{
 					Id: "bcd",
@@ -149,9 +150,9 @@ func TestCreateDacWithDbGcpSA(t *testing.T) {
 			{
 				Method:   "GET",
 				Resource: "/api/2.1/unity-catalog/storage-credentials/bcd?",
-				Response: DataAccessConfiguration{
+				Response: catalog.StorageCredentialInfo{
 					Name: "bcd",
-					DBGcpSA: &DbGcpServiceAccount{
+					DatabricksGcpServiceAccount: &catalog.DatabricksGcpServiceAccountResponse{
 						Email: "[email protected]",
 					},
 				},
@@ -314,7 +315,8 @@ func TestCreateAccountDacWithDbGcpSA(t *testing.T) {
 				ExpectedRequest: catalog.AccountsCreateStorageCredential{
 					MetastoreId: "abc",
 					CredentialInfo: &catalog.CreateStorageCredential{
-						Name: "bcd",
+						Name:                        "bcd",
+						DatabricksGcpServiceAccount: struct{}{},
 					},
 				},
 				Response: catalog.AccountsStorageCredentialInfo{

catalog/resource_storage_credential.go

@@ -52,6 +52,11 @@ func ResourceStorageCredential() *schema.Resource {
 			common.DataToStructPointer(d, tmpSchema, &create)
 			common.DataToStructPointer(d, tmpSchema, &update)
 
+			//manually add empty struct back for databricks_gcp_service_account
+			if _, ok := d.GetOk("databricks_gcp_service_account"); ok {
+				create.DatabricksGcpServiceAccount = struct{}{}
+			}
+
 			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
 				storageCredential, err := acc.StorageCredentials.Create(ctx,
 					catalog.AccountsCreateStorageCredential{

catalog/resource_storage_credential_test.go

@@ -323,9 +323,10 @@ func TestCreateStorageCredentialWithDbGcpSA(t *testing.T) {
 			{
 				Method:   "POST",
 				Resource: "/api/2.1/unity-catalog/storage-credentials",
-				ExpectedRequest: StorageCredentialInfo{
-					Name:    "a",
-					Comment: "c",
+				ExpectedRequest: catalog.CreateStorageCredential{
+					Name:                        "a",
+					DatabricksGcpServiceAccount: struct{}{},
+					Comment:                     "c",
 				},
 				Response: catalog.StorageCredentialInfo{
 					Name: "a",