amplify push fails after removing a model from schema.graphql

Describe the bug Can not remove a model from schema.graphql after it was pushed/deployed.

To Reproduce Steps to reproduce the behavior:

1. Initial schema.graphql

   type User @model {
     id: ID!
     invitations: [Invitation] @connection(name: "UserInvitations")
     last_name: String
     first_name: String
   }
   
   type Invitation @model {
     id: ID!
     date: String
     sentTo: User @connection(name: "UserInvitations")
     state: String
   }
   

2. amplify push
3. Update schema.graphql and remove Invitation

   type User @model {
     id: ID!
     last_name: String
     first_name: String
   }
   

4. amplify push
5. Update failed with the following error

   Embedded stack [ARN of User stack] was not successfully updated. Currently in 
   UPDATE_ROLLBACK_IN_PROGRESS with reason: Export ******************:GetAtt:UserDataSource:Name 
   cannot be deleted as it is in use by [NAME of ConnectionStack stack]
   

Expected behavior Be able to remove models from schema.graphql and push/publish the changes.

Additional context Tested using the AWS Amplify Console deploy and amplify-cli locally, version 1.1.6.

[zenbakiak]

We’re waiting for this fix, I hope @kstro21 's solution works 😃

[kstro21]

@kaustavghosh06 I’ve added a PR #1182 that will solve this one.