Skip to content

Commit 0e2f4fb

Browse files
authored
Merge pull request #128 from adobe/upgrade-oclif-core-v2
Update @adobe/aio-cli-plugin-events to @oclif/core v2
2 parents 9494ccb + 59dd6b2 commit 0e2f4fb

36 files changed

Lines changed: 214 additions & 94 deletions

bin/run

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag
1111
governing permissions and limitations under the License.
1212
*/
1313

14-
const oclif = require('@oclif/core')
15-
16-
oclif.run()
17-
.then(require('@oclif/core/flush'))
18-
.catch(require('@oclif/core/handle'))
14+
// eslint-disable-next-line node/shebang
15+
(async () => {
16+
const oclif = await import('@oclif/core')
17+
await oclif.execute({ type: 'cjs', dir: __dirname })
18+
})()

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@adobe/aio-lib-env": "^3",
1717
"@adobe/aio-lib-events": "^4",
1818
"@adobe/aio-lib-ims": "^7",
19-
"@oclif/core": "^1.5.2",
19+
"@oclif/core": "^2.8.12",
2020
"inquirer": "^8.2.5",
2121
"js-yaml": "^4.1.0"
2222
},

src/commands/event/eventmetadata/create.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, Flags, ux: cli } = require('@oclif/core')
1515
const { sentenceValidatorWithMinOneChar, eventCodeValidator } = require('../../../utils/validator')
1616
const inquirer = require('inquirer')
1717
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:eventmetadata:create', { provider: 'debug' })
@@ -61,9 +61,12 @@ class EventmetadataCreateCommand extends BaseCommand {
6161

6262
EventmetadataCreateCommand.description = 'Create an Event Metadata for a Provider'
6363

64-
EventmetadataCreateCommand.args = [
65-
{ name: 'providerId', required: true, description: 'The requested eventmetadata event code' }
66-
]
64+
EventmetadataCreateCommand.args = {
65+
providerId: Args.string({
66+
required: true,
67+
description: 'The requested provider ID'
68+
})
69+
}
6770

6871
EventmetadataCreateCommand.flags = {
6972
...BaseCommand.flags,

src/commands/event/eventmetadata/delete.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, ux: cli } = require('@oclif/core')
1515
const inquirer = require('inquirer')
1616
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:eventmetadata:delete', { provider: 'debug' })
1717

@@ -64,10 +64,16 @@ class EventmetadataDeleteCommand extends BaseCommand {
6464

6565
EventmetadataDeleteCommand.description = 'Delete Event Metadata for a Provider'
6666

67-
EventmetadataDeleteCommand.args = [
68-
{ name: 'providerId', required: true, description: 'The requested provider ID' },
69-
{ name: 'eventCode', required: false, description: 'The requested eventmetadata event code' }
70-
]
67+
EventmetadataDeleteCommand.args = {
68+
providerId: Args.string({
69+
required: true,
70+
description: 'The requested provider ID'
71+
}),
72+
eventCode: Args.string({
73+
required: false,
74+
description: 'The requested event code'
75+
})
76+
}
7177

7278
EventmetadataDeleteCommand.flags = {
7379
...BaseCommand.flags

src/commands/event/eventmetadata/get.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, Flags, ux: cli } = require('@oclif/core')
1515
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:eventmetadata:get', { provider: 'debug' })
1616

1717
class EventmetadataGetCommand extends BaseCommand {
@@ -41,10 +41,16 @@ class EventmetadataGetCommand extends BaseCommand {
4141

4242
EventmetadataGetCommand.description = 'Get details of an Event Code of a Provider'
4343

44-
EventmetadataGetCommand.args = [
45-
{ name: 'providerId', required: true, description: 'The requested provider ID' },
46-
{ name: 'eventCode', required: true, description: 'The requested eventmetadata event code' }
47-
]
44+
EventmetadataGetCommand.args = {
45+
providerId: Args.string({
46+
required: true,
47+
description: 'The requested provider ID'
48+
}),
49+
eventCode: Args.string({
50+
required: true,
51+
description: 'The requested event code'
52+
})
53+
}
4854

4955
EventmetadataGetCommand.flags = {
5056
...BaseCommand.flags,

src/commands/event/eventmetadata/list.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, Flags, ux: cli } = require('@oclif/core')
1515
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:eventmetadata:list', { provider: 'debug' })
1616

1717
class EventmetadataListCommand extends BaseCommand {
@@ -58,9 +58,12 @@ EventmetadataListCommand.aliases = [
5858
'event:eventmetadata:ls'
5959
]
6060

61-
EventmetadataListCommand.args = [
62-
{ name: 'providerId', required: true, description: 'The requested provider ID' }
63-
]
61+
EventmetadataListCommand.args = {
62+
providerId: Args.string({
63+
required: true,
64+
description: 'The requested provider ID'
65+
})
66+
}
6467

6568
EventmetadataListCommand.flags = {
6669
...BaseCommand.flags,

src/commands/event/eventmetadata/update.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, Flags, ux: cli } = require('@oclif/core')
1515
const { sentenceValidatorWithMinOneChar } = require('../../../utils/validator')
1616
const inquirer = require('inquirer')
1717
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:eventmetadata:update', { provider: 'debug' })
@@ -56,10 +56,16 @@ class EventmetadataUpdateCommand extends BaseCommand {
5656

5757
EventmetadataUpdateCommand.description = 'Update an Event Metadata for a Provider'
5858

59-
EventmetadataUpdateCommand.args = [
60-
{ name: 'providerId', required: true, description: 'The requested provider ID' },
61-
{ name: 'eventCode', required: true, description: 'The requested eventmetadata event code' }
62-
]
59+
EventmetadataUpdateCommand.args = {
60+
providerId: Args.string({
61+
required: true,
62+
description: 'The requested provider ID'
63+
}),
64+
eventCode: Args.string({
65+
required: true,
66+
description: 'The requested event code'
67+
})
68+
}
6369

6470
EventmetadataUpdateCommand.flags = {
6571
...BaseCommand.flags,

src/commands/event/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ class IndexCommand extends BaseCommand {
2222

2323
IndexCommand.description = 'Manage your Adobe I/O Events'
2424

25-
IndexCommand.args = []
25+
IndexCommand.args = {}
2626

2727
module.exports = IndexCommand

src/commands/event/provider/create.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Flags, ux: cli } = require('@oclif/core')
1515
const { sentenceValidatorWithMinOneChar, sentenceValidatorWithMinZeroChar } = require('../../../utils/validator')
1616
const inquirer = require('inquirer')
1717
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:provider:create', { provider: 'debug' })

src/commands/event/provider/delete.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
const BaseCommand = require('../../../BaseCommand.js')
14-
const { CliUx: { ux: cli } } = require('@oclif/core')
14+
const { Args, ux: cli } = require('@oclif/core')
1515
const inquirer = require('inquirer')
1616
const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-events:provider:delete', { provider: 'debug' })
1717

@@ -46,9 +46,12 @@ class ProviderDeleteCommand extends BaseCommand {
4646

4747
ProviderDeleteCommand.description = 'Delete Provider by id'
4848

49-
ProviderDeleteCommand.args = [
50-
{ name: 'providerId', required: true, description: 'The requested provider ID' }
51-
]
49+
ProviderDeleteCommand.args = {
50+
providerId: Args.string({
51+
required: true,
52+
description: 'The requested provider ID'
53+
})
54+
}
5255

5356
ProviderDeleteCommand.flags = {
5457
...BaseCommand.flags

0 commit comments

Comments
 (0)