#3164: [Feature-10219][EMR] EMR supports use <add-Steps> to add steps to an existing cluster (#10657)

* Add the ProgramType parameter to distinguish task types
* EmrAddStepsTask supports Add-Steps
* UI supports Add-Steps
* EmrTask modify the name of the class to EmrJobFlowTask
* add ERM Task abstract base class AbstractEmrTask
* add testcase for EmrAddStepsTask
* Modifying help Documents

commit.ref

@@ -1 +1 @@
-Subproject commit cc41485d503ef79f0378df4731e3f7f7c983ce8c
+Subproject commit 8eaf5a230998946001b80c9f373da844e6efcd21

commit.yml

@@ -2,40 +2,226 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '5cacdee8941288a946add31e5eb2ff3e9683c3c3'
-    oldFile: !uuid 'cca864d02434754e7f9499779264308683bd5c33'
-  /dolphinscheduler-api/src:
-    newFile: !uuid '2071d847f161206b786137ea8c5beef0265dc4c1'
-    oldFile: !uuid '1db7dacbf0b01a2ebb1f00a8d35a917a43066f34'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid '82d24d84a13bc59fab2536f51df761ef845f1b2e'
-    oldFile: !uuid '5fdccc98ba5888df9897a0377f9374fb0597f5a5'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '1f2a7abdcb6cf7f4938482180bcf89463ce39bf6'
-    oldFile: !uuid 'de16b7eb939c452a3c2912a2b3c160821a96af65'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '5d80ed2bee350721f35b184c5f7bb7ce82be7119'
-    oldFile: !uuid '9ca10ea4c8252c3b7d3d9a8d3f194d17594c6774'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '62b75cc4b2b01d5a8d73cb9039e3baa08b20c5be'
-    oldFile: !uuid 'e6b3eca8c72e0a6f70e507b8dd3e18067e974fc6'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'd0e9a3cef888d29a379e4f905d085c4cac06805f'
-    oldFile: !uuid 'f9136121ce9b41b5ef06fc7a5567b2d6414c0595'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '6fabfe1a17db9dbe7913048a85b1a09caadf788e'
-    oldFile: !uuid 'eb6f859ba8f3af87f4d90c94bcbb37821b0fcbac'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '0a079bef3ee07b34a6a57ffda6c736566c1ceda6'
-    oldFile: !uuid '3a58e39fd9a8668ca21c9e9317e609d5d6ab8996'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid '149da92dbc43f2683e488b720bf123316ae8f397'
-    oldFile: !uuid 'f5730746920cf1ab8c6a4b23f8651d28c6120391'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
-    newFile: !uuid '2bdd7eb6f4e26f1e993cea18fd38de4fee011638'
-    oldFile: !uuid 'd4baa59d9dcb19ec1d959797d6998200def25b42'
-gitCommitId: !uuid 'cc41485d503ef79f0378df4731e3f7f7c983ce8c'
-renames: {
-  }
-revisionId: 3163
+  /docs:
+    newFile: !uuid 'a7264ea12bef87359536f054a877bf61734bd631'
+    oldFile: !uuid '2d709ff4ed0c7ed58f9597e50b461941e38f0e40'
+  /docs/docs:
+    newFile: !uuid '27619f931970729b0f20121bc67d591c248d2aeb'
+    oldFile: !uuid 'c5d289b4346697a1849086333a1749d4532e2f46'
+  /docs/docs/en:
+    newFile: !uuid '4df009d29640376e9c550611765c1a64ca148221'
+    oldFile: !uuid '2c1fd27089eb57630c64912bb9fc4948b9b5b81a'
+  /docs/docs/en/guide:
+    newFile: !uuid '1f8f47655e15af0d7a25d1b383657b693334b1bf'
+    oldFile: !uuid 'a188bb18a287fe3466fdfa3c775ad038aed3f807'
+  /docs/docs/en/guide/task:
+    newFile: !uuid 'ff3a0ec876ba60e8548c038a5848361df51683c1'
+    oldFile: !uuid '475cccfbbe1de059c6539c3d67cf361a28e86bf9'
+  /docs/docs/en/guide/task/emr.md:
+    newFile: !uuid 'ebcaa885aaea364d67bfcc3a4f6802a8a8f8bc79'
+    oldFile: !uuid '050d7c2397786d59d1dd8650e44303a76d49b1aa'
+  /docs/docs/zh:
+    newFile: !uuid 'e5b99bd7c332876b8fe091449e2af3f8134fab3e'
+    oldFile: !uuid '7a8a24bc7e96ef9a7292d3937af7841661ab2147'
+  /docs/docs/zh/guide:
+    newFile: !uuid '1fdc1f8a9ee3ca5b3a9e64f3cb4ed050795eeb91'
+    oldFile: !uuid 'c7c0cdd73d854a75654a4edef213ed1e6391128d'
+  /docs/docs/zh/guide/task:
+    newFile: !uuid 'e929ea8c74c5880a1572df1c8fe10129d66b62ca'
+    oldFile: !uuid '339b394953a69f1b956034bfd2300d7e02f81c3e'
+  /docs/docs/zh/guide/task/emr.md:
+    newFile: !uuid '59dab0046e1194d79de8340b9ba06633942d6c36'
+    oldFile: !uuid 'dfa17f6658bb2fda88ffb1a42286b4d31f761100'
+  /docs/img:
+    newFile: !uuid 'fe288c4d11600113ea8d526bedc0eef9b7e449b0'
+    oldFile: !uuid '0decb4a388bad7427961ddcb2fdda351dfc66a75'
+  /docs/img/tasks:
+    newFile: !uuid 'fd2e6b8488350caf77673d5cf158ebae3264dc2c'
+    oldFile: !uuid 'e14ef300d68a478ed6dace6ecf480c7f8c14f4b0'
+  /docs/img/tasks/demo:
+    newFile: !uuid 'e2765735b682b965831a31711f7925fddda23adb'
+    oldFile: !uuid 'bc1c5b618c8074c6e47ebcb636ef23478ffa2a49'
+  /docs/img/tasks/demo/emr_add_job_flow_steps.png:
+    newFile: !uuid 'bc8de30f72ef5636dcc3002ad2a612d98d567901'
+    oldFile: null
+  /docs/img/tasks/demo/emr_jobFlowId.png:
+    newFile: !uuid 'b79097afd579d8083bf5564f0b26fb0cf0a2030b'
+    oldFile: null
+  /docs/img/tasks/demo/emr_run_job_flow.png:
+    newFile: !uuid 'ad09c5f7c9718cccf4d1d39c3655d7f0bf128fef'
+    oldFile: null
+  /dolphinscheduler-task-plugin:
+    newFile: !uuid '74948d0635bd93ba11eb93dd9c05a11b54caf861'
+    oldFile: !uuid 'e241150eaedc2e157d61f1cfe48c79c67010b7a9'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr:
+    newFile: !uuid 'fe7e0814affbe3d81fe041a7eff2376a24d2724b'
+    oldFile: !uuid 'af0484512dbfe697ebff6b9f1fcdb9c800531586'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src:
+    newFile: !uuid 'db982fe96355e9a1917172b0807ea45112693665'
+    oldFile: !uuid '176407f5d76cda0ddbe15c0b74ee97d6944541f7'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main:
+    newFile: !uuid '8d124633683a4dbf428b14e5f47e9ca5cf0b6c6e'
+    oldFile: !uuid '2daa658dcf58e3f9c47fc5e7bea8f155e684f192'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java:
+    newFile: !uuid 'f271e54885922733e974702527ce78c34d9367cc'
+    oldFile: !uuid '9142bf81f74c44e30f258e95ca2724623869e1c1'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org:
+    newFile: !uuid '0d5b370a6af0981c3573be69eee4a7826f646288'
+    oldFile: !uuid '1b4a26c65889fce2270ef14433fec9ad894a13c2'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache:
+    newFile: !uuid 'f0b4ba467ccdc9f93f825f184a7deb656a6aaaed'
+    oldFile: !uuid '45582f80e27d71752bf155145a4e424b890d80d5'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '7c189328cf94b81ec37d2bbd53cfb5a17c986a9e'
+    oldFile: !uuid 'b32a00dfa5efd4cdd4a26bb3f2808341b155ee76'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '67ca516e452111554455722e487f86dfd71f0396'
+    oldFile: !uuid 'acc22e3b2344929421c7d9aa328ec9561bd69ed7'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'f53ab7b5e0ae370e378834c2ff5c6d4c0a202819'
+    oldFile: !uuid 'f8645827359becf649e5fe518fd8011e926eef74'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr:
+    newFile: !uuid '24f8ba883796a513b41b13ccfe6895f088791092'
+    oldFile: !uuid 'dbd55bebb45105ed087facd0f49820d00915f1a7'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/AbstractEmrTask.java
+  : newFile: !uuid '329c3bc3d57999316ad302b7c4a845e8d73d728f'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrAddStepsTask.java
+  : newFile: !uuid 'd747577b718e99ffb0b9016948854725223538ad'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrJobFlowTask.java
+  : newFile: !uuid 'ed42de2831bc8901be483647715482c70eedffff'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrParameters.java
+  : newFile: !uuid '1e38a66d8138055501a4b31fa52dd9838677ec4d'
+    oldFile: !uuid '14396fcebcefddf18b93e437df7f67f615d9ba7e'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrTask.java
+  : newFile: null
+    oldFile: !uuid 'ada0041bf990cfed3b81543ac40a0980572cbef7'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrTaskChannel.java
+  : newFile: !uuid 'e59b4e361359b5c82df22c6f5b59911b5ecb038d'
+    oldFile: !uuid '898362f2cc30cca9ed204f18fa6fdfe48bfe3a14'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/ProgramType.java
+  : newFile: !uuid '0f0870c119b2af5c684d10792ce9d643854d0744'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test:
+    newFile: !uuid '768216fc22013a3c8d1d7af871addf4e4ef8b45f'
+    oldFile: !uuid '970ce6097d9d243c2b96f31b002e771c177bdaf5'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java:
+    newFile: !uuid 'a186d862a7af888aeba2b5996d0d8491c035882c'
+    oldFile: !uuid '94b68596553d36ccd2241d37d10856d1ed196296'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org:
+    newFile: !uuid 'ade14bb77253ee6badbc3c476d041a7ad343fab6'
+    oldFile: !uuid 'c0d65b7ec03ecc2c8a70a4e84d780435b0116a11'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache:
+    newFile: !uuid 'cfa3413043d7d5d32f5dac9f1795b15923325742'
+    oldFile: !uuid '2fefb2e0613322c89f0a9f5b31e4fa56ddbf4b8e'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '70c649ec0e2f5c2cab24dcb816abc80cf475173c'
+    oldFile: !uuid '4154f49334d3602a251dd2b6e39bbe85ea2e374a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid 'c3366b75dfc1a199280cd5526d6250f9cb192b95'
+    oldFile: !uuid '2f513f29e065cad79ef01e82f704dacfe3c9858a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid '5dec8ee6424a6823e977313e80e99b85065f014d'
+    oldFile: !uuid 'a3882b68488ce4f76b4bc4fb9261277b64724931'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr:
+    newFile: !uuid '8ded6ebfcbc19372df54a175069ef3fb90923a0c'
+    oldFile: !uuid '3736cac939e9cae71e346ca56d4db93f0273708c'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr/EmrAddStepsTaskTest.java
+  : newFile: !uuid 'd74d36fa8210e6d45390a3cb1f0910725a1e5b7b'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr/EmrJobFlowTaskTest.java
+  : newFile: !uuid '65c6c0c239db58a9491f265313afa47895dd39c6'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr/EmrTaskTest.java
+  : newFile: null
+    oldFile: !uuid '285078f21fe57e10f0f74d4d5e46f6e3f8da52ae'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources:
+    newFile: !uuid '72bfc538b8b644170e6089abdf27fb06d8df6dd4'
+    oldFile: !uuid '774f74736ac398a565ad8be1bf1da99373b37e12'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org:
+    newFile: !uuid 'ba02b0e5384eb6d2cbb37b86057015c7c88268c9'
+    oldFile: !uuid '23e2c3464da4343257bed8cf05cb9000c0c2ee90'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache:
+    newFile: !uuid 'c09dc6963257b97c3a8374182c273db7bccd0dc2'
+    oldFile: !uuid 'ad0ba3705745a5645bc0599e40e60bcea1163af9'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler:
+    newFile: !uuid 'f06e34357187bcc87bd40bb82ba122b94a169fbc'
+    oldFile: !uuid '6568ec63a7dd3b4e80228d43dfd2cf5599b6ed61'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '908cb73368df0a33bc901576b17212be7da3a8c2'
+    oldFile: !uuid '617578f5d13837016f851fd9e9f2c8d56b215c9a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'be703af59655f21042eef5d1a91855ac0417d4bb'
+    oldFile: !uuid 'ae3f745b5c387f03a84d3bdb3af732d3b68d58b2'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler/plugin/task/emr:
+    newFile: !uuid '1859ab4c9c9b40d6099bbd71fd081b47b43bdd67'
+    oldFile: !uuid '17e34b79f4b586fc22685c2e704e16a0cf913a79'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler/plugin/task/emr/EmrAddStepsDefine.json
+  : newFile: !uuid 'a14a259a88342ace640b30355e5e452628a55252'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/resources/org/apache/dolphinscheduler/plugin/task/emr/EmrErrorAddStepsDefine.json
+  : newFile: !uuid '46e81b13ba87b6b127c2e00746caffb8c68a705e'
+    oldFile: null
+  /dolphinscheduler-ui:
+    newFile: !uuid 'd543e3846323fc204debde9a718fb3c0e3080c06'
+    oldFile: !uuid 'dc878de3f36df1a084941e5d4bd83b73ff0cb96f'
+  /dolphinscheduler-ui/src:
+    newFile: !uuid '88956650abcd0a1492ee6083edeb9924ea9393ec'
+    oldFile: !uuid '9360b56660d764645ee30cb3502519319cc47558'
+  /dolphinscheduler-ui/src/locales:
+    newFile: !uuid '20160130c904dfa60c65a1bbc0bcdeeb349059e7'
+    oldFile: !uuid '88e8b6775c38573ac1535ac13cc1f59882279988'
+  /dolphinscheduler-ui/src/locales/en_US:
+    newFile: !uuid '10120e6ebe8f80e86a4c1272264b7a53ec721e36'
+    oldFile: !uuid 'a070cf3a0d69ba8321b4b48556ffb5705186a446'
+  /dolphinscheduler-ui/src/locales/en_US/project.ts:
+    newFile: !uuid '43cba0d3d6d775735fda562fd4f9de43d02f47f7'
+    oldFile: !uuid 'cf2cef1271cfa1741bb4c21481ce0bf5998b302d'
+  /dolphinscheduler-ui/src/locales/zh_CN:
+    newFile: !uuid '7a73edddac0be8ac476e4ed47d5291babf0705ee'
+    oldFile: !uuid '71da1f14f2752811ea2bcbe1cead8bbc033ab112'
+  /dolphinscheduler-ui/src/locales/zh_CN/project.ts:
+    newFile: !uuid '3706771854f17ba55f4bd4479a74507f1e3beb24'
+    oldFile: !uuid 'ab2c9c71f44e720259a8a2b47bffbb10ce3f2584'
+  /dolphinscheduler-ui/src/views:
+    newFile: !uuid '11131d27215d703d6fda39f77fcc087d6cbeba00'
+    oldFile: !uuid '4f4c77661b60968b80517dc1642d01aab9cee65d'
+  /dolphinscheduler-ui/src/views/projects:
+    newFile: !uuid 'a45a453902f2ca756e707c20d26f65417ede10cc'
+    oldFile: !uuid '940bc178e47275aeba2904c797eb2559b8616cf9'
+  /dolphinscheduler-ui/src/views/projects/task:
+    newFile: !uuid '54d7b00bfeab83d2436d3d1537102b493bcb9abe'
+    oldFile: !uuid '132126752393309e62116141c5bc09ec515351cf'
+  /dolphinscheduler-ui/src/views/projects/task/components:
+    newFile: !uuid 'f1b390c6d6b6d4acf92f9402c8cd0170fd59c4fd'
+    oldFile: !uuid 'b715719597569f170c8093d5de1fe2c89d2619f6'
+  /dolphinscheduler-ui/src/views/projects/task/components/node:
+    newFile: !uuid '77f7d2afe4e2c8a31841b56f6a7a4b5c6cbb804a'
+    oldFile: !uuid '5256cb7480496385043182575ba21dce67953c9d'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/fields:
+    newFile: !uuid '56968b0630a5895e3ccaa3fc88fd3bcbf5a98b9c'
+    oldFile: !uuid 'a1a4834cff6449845f01882b22a26bbb0cb19666'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-emr.ts:
+    newFile: !uuid '1446fc866a79740aed54b2e8430ef39b3e4faceb'
+    oldFile: !uuid 'a67b370d1826363eafab6cd036f4c9e483dec035'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts:
+    newFile: !uuid '4ab18ccd0566fd012781b9ebd66f5ae054ab573a'
+    oldFile: !uuid 'c90d1660db2d1da9fcaccf585751e3cfb0467030'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/tasks:
+    newFile: !uuid '30dd55b8b0203a443c46b51309e65414b2e9ee01'
+    oldFile: !uuid '3b555a978805f7b238a3a3b248a679bceb460933'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-emr.ts:
+    newFile: !uuid '36dbbefa79cf508f83b8e316f6a880b04b326eb9'
+    oldFile: !uuid '1face687fb50924ab7c9f2e9310806d702eb2cab'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/types.ts:
+    newFile: !uuid '187ff7532f951b5bd7fcd399057d810ec6529113'
+    oldFile: !uuid '5019f29ce118bd660d067aa34833bbdfcad4a9e6'
+gitCommitId: !uuid '8eaf5a230998946001b80c9f373da844e6efcd21'
+renames:
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrJobFlowTask.java
+  : /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/main/java/org/apache/dolphinscheduler/plugin/task/emr/EmrTask.java
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr/EmrJobFlowTaskTest.java
+  : /dolphinscheduler-task-plugin/dolphinscheduler-task-emr/src/test/java/org/apache/dolphinscheduler/plugin/task/emr/EmrTaskTest.java
+revisionId: 3164