@@ -223,17 +223,40 @@ func resourceMongoDBAtlasEncryptionAtRestRead(d *schema.ResourceData, meta inter
223223
224224 values = flattenAzureVault (& resp .AzureKeyVault )
225225 if ! counterEmptyValues (values ) {
226+ azure , azureOk := d .GetOk ("azure_key_vault" )
227+ if azureOk {
228+ azure2 := azure .(map [string ]interface {})
229+ values ["secret" ] = cast .ToString (azure2 ["secret" ])
230+ if v , sa := values ["secret" ]; sa {
231+ if v .(string ) == "" {
232+ delete (values , "secret" )
233+ }
234+ }
235+ }
226236 if err = d .Set ("azure_key_vault" , values ); err != nil {
227237 return fmt .Errorf (errorAlertEncryptionAtRestSetting , "azure_key_vault" , d .Id (), err )
228238 }
229239 }
230240
231241 values = flattenGCPKms (& resp .GoogleCloudKms )
232242 if ! counterEmptyValues (values ) {
243+ gcp , gcpOk := d .GetOk ("google_cloud_kms" )
244+ if gcpOk {
245+ gcp2 := gcp .(map [string ]interface {})
246+ values ["service_account_key" ] = cast .ToString (gcp2 ["service_account_key" ])
247+ if v , sa := values ["service_account_key" ]; sa {
248+ if v .(string ) == "" {
249+ delete (values , "service_account_key" )
250+ }
251+ }
252+ }
233253 if err = d .Set ("google_cloud_kms" , values ); err != nil {
234254 return fmt .Errorf (errorAlertEncryptionAtRestSetting , "google_cloud_kms" , d .Id (), err )
235255 }
236256 }
257+ if err = d .Set ("project_id" , d .Id ()); err != nil {
258+ return fmt .Errorf (errorAlertEncryptionAtRestSetting , "project_id" , d .Id (), err )
259+ }
237260
238261 return nil
239262}
0 commit comments