Move schemas for migrate_drupal sources to migrate_drupal module

Tagging for "Avoid commit conflicts" since this will need re-rolling for quite a lot of migrate issues.

Tagging for "Avoid commit conflicts" since this will need re-rolling for quite a lot of migrate issues.

Rerolled.

Oh, I made a backwuard patch -.-"

I have reviewd and applied the patch from #7.
I have uninstalled (using drush) & re-enabled (using the UI) the migrate_drupal module.
The patch looks good.

The patch did not remove the old file. Here is an updated patch.

Oh, good point. I applied patch #13 again. Now it not just adds the file in the new location, but actually moves it across from the old to new location.

Sorry back to NW, the Empty source needs to stay in the migrate module as it's provided by migrate.

Something like this? (I just change the header comment of the file too, we had forgotten it.

This is my first time working with these schema files, so I'm not sure if I'm doing it correctly, but I figured I'd give it a shot...

Updated patch attached, that _might_ fix the failing tests.

One thing I noticed that I'm wondering about is on line 5 of /core/modules/migrate/config/schema/migrate.source.schema.yml:

label: 'Drupal 6 field formatter'

This doesn't seem correct. Should it be something like:

label: 'Drupal 6 empty source'

-mike

Good golly, this one seems like it should be easy, but I still can't get it to work...

The issues are with the d6_user_picture_field and d6_upload_field schemas - both of which are a little odd because they contain a "plugin" source variable (which I can't seem to figure out how to properly list in the schema file).

Updated patch attached.

-mike

The tests seem to fail because the "migrate.source.empty" definition is still in the migrate module schema yml.
If I move it locally to the migrate_drupal schema yml file, the DefaultConfigTest passes.

So I'm assuming that's the cause of the problem.
Now we need to find a way to solve it :)

This was probably caused by the fact that both files had the name "migrate.source.schema.yml".
I renamed the one in migrate_drupal to "migrate_drupal.source.schema.yml", and this seems to work locally.
Unless I'm missing something here, since I'm no expert on the schema files...

Attaching a new version of ultimike's patch to see if this works...

@svendecabooter - Holy cow, I hope that's it. I would have never figured that out on my own...

I don't think I'm qualified to review this patch, but benjy indicated he'll have some time this weekend to review patches.

Thanks,
-mike

Yep, looks good.

Stuff is changing on the copy...

For example:

 migrate.source.d6_node_type:
-  type: migrate_source_sql
+  type: migrate_source

This patch should be generated with the following in the git config file

[diff]
        renames = copies

As it makes this possible to spot. For more on a recommended git config see https://www.drupal.org/documentation/git/configure

wow, good catch. What the heck causes that to be renamed?

I continued from ultimike's patch, but that seemed to have been an attempt to fix the failed tests.
New patch in attachment which just moves the appropriate schema entries over, without changing them.

OK, chx showed me that `git diff -C HEAD` gives a much better view of what has changed when a file has been moved.

New patch looks much better.

1. +++ b/core/modules/migrate/config/schema/migrate.source.schema.yml
   @@ -1,235 +1,5 @@
   -migrate.source.*:
   -  type: migrate_source
   -  label: 'Default source'
   

   Pretty certain this still belongs in the migrate module and not migrate_drupal

2. +++ b/core/modules/migrate/config/schema/migrate.source.schema.yml
   @@ -1,235 +1,5 @@
   -migrate.source.variable:
   -  type: migrate_source_sql
   -  label: 'Variable'
   -  mapping:
   -    variables:
   -      type: sequence
   -      label: 'Variables'
   -      sequence:
   -        - type: string
   -          label: 'Variable'
   -    constants:
   -      type: mapping
   -      label: 'Constants'
   -      mapping:
   -        entity_type:
   -          type: string
   -          label: 'Entity type'
   -        id:
   -          type: string
   -          label: 'ID'
   -        label:
   -          type: label
   -          label: 'Label'
   -        description:
   -          type: text
   -          label: 'Description'
   -        path:
   -          type: string
   -          label: 'Path'
   -        plugin:
   -          type: string
   -          label: 'Plugin'
   

   Is this D6 only?

3. +++ b/core/modules/migrate/config/schema/migrate.source.schema.yml
   @@ -1,235 +1,5 @@
   -migrate.source.variable_multirow:
   -  type: migrate_source_sql
   -  label: 'Drupal 6 box'
   -  mapping:
   -    variables:
   -      type: sequence
   -      label: 'Variables'
   -      sequence:
   -        - type: string
   -          label: 'Variable'
   

   The label looks incorrect. This does not look d6 specific.

4. +++ b/core/modules/migrate/config/schema/migrate.source.schema.yml
   @@ -256,129 +26,3 @@ migrate.source.empty:
   -migrate_entity_constant:
   -  type: mapping
   -  mapping:
   -    entity_type:
   -      type: string
   -      label: 'Entity type'
   -    bundle:
   -      type: string
   -      label: 'Bundle'
   -    label:
   -      type: label
   -      label: 'Label'
   -    id:
   -      type: string
   -      label: 'ID'
   -    view_mode:
   -      type: string
   -      label: 'View mode'
   -    form_mode:
   -      type: string
   -      label: 'Form mode'
   -    field_name:
   -      type: string
   -      label: 'Field name'
   -    empty:
   -      type: sequence
   -      label: 'Empty'
   -      sequence:
   -        - type: string
   -          label: 'Empty'
   -    name:
   -      type: string
   -      label: 'Name'
   -    preview:
   -      type: integer
   -      label: 'Preview'
   -    create_body:
   -      type: boolean
   -      label: 'create body'
   -    required:
   -      type: boolean
   -      label: 'Required'
   -    type:
   -      type: string
   -      label: 'Type'
   -    cardinality:
   -      type: integer
   -      label: 'Cardinality'
   -    parent:
   -      type: integer
   -      label: 'Parent'
   -    langcode:
   -      type: string
   -      label: 'Type'
   -    third_party_settings:
   -      type: sequence
   -      label: 'Settings'
   -      sequence:
   -        - type: ignore
   -          label: 'Settings'
   -    settings:
   -      type: sequence
   -      label: 'Settings'
   -      sequence:
   -        - type: ignore
   -          label: 'Settings'
   -    options:
   -      type: mapping
   -      label: 'Options'
   -      mapping:
   -        label:
   -          type: string
   -          label: 'label'
   -        type:
   -          type: string
   -          label: 'Type'
   -        weight:
   -          type: integer
   -          label: 'Weight'
   -        settings:
   -          type: sequence
   -          label: 'Settings'
   -          sequence:
   -            - type: string
   -              label: 'Settings'
   

   This does not look d6 specific

1. Fixed
2. No it's not D6 specific. Not sure why that matters?
3. labels fixed for both migrate.source.d6_field: and migrate.source.variable_multirow:
4. Again not sure what this has to do with been D6 specific?

Maybe the issue title made is why you mentioned D6 specific? Updated.

Whether migrate_entity_constant is reusable for non - migrate_drupal migrations, who knows? Maybe yes, maybe no, more likely no than yes. But who care? It's just rather meaningless schema. There's nothing fancy there, no new types, tricky references, nothing. Your constants will likely be slightly different, write your own scheme.

Committed 2c2e2ce and pushed to 8.0.x. Thanks!

migrate.source.empty:
  type: migrate_source_sql
  label: 'Drupal 6 field formatter'

Interesting label - can someone file a followup issue to fix.

Followup issue filed: #2365891: Incorrect schema label.

-mike