Issue Summary

External Import can't be executed when object type contains externalId, like:

{
"$schema": "https://api.atlassian.com/jsm/assets/imports/external/schema/versions/2021_09_15",
"schema": {
"objectSchema": {
"name": "test schema",
"description": "",
"objectTypes": [
{
"externalId": "object-type/test",
"name": "test-object-type",
"description": "",
"attributes": [

,
...

Steps to Reproduce

1. Follow this doc to create an external import on a BYOK site. https://developer.atlassian.com/cloud/assets/imports-rest-api-guide/workflow/
2. It failed at step 5a 'Submit schema and mapping configuration'

Expected Results

Step 5a should create object types and object type attributes.

Actual Results

Received 500 error.

The below exception is thrown in the log:

Unsafe merge attempted from entity in state=ENCRYPTED to entity in state=ENCRYPTED 

Workaround

Removing external id from the schema and mapping can be a workaround.