From 7263e83a287148035b93375d358a54df449a4cce Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 17 Feb 2021 11:16:59 -0500 Subject: [PATCH 1/4] remove vscodetask and vscodelaunch, deprecate project.github Signed-off-by: Stephanie --- ...pace.devfile.io_devworkspaces.v1beta1.yaml | 380 +------------- crds/workspace.devfile.io_devworkspaces.yaml | 380 +------------- ...file.io_devworkspacetemplates.v1beta1.yaml | 371 +------------ ...pace.devfile.io_devworkspacetemplates.yaml | 371 +------------ .../workspaces/v1alpha1/parent_conversion.go | 4 - pkg/apis/workspaces/v1alpha2/commands.go | 46 +- pkg/apis/workspaces/v1alpha2/projects.go | 2 +- .../v1alpha2/zz_generated.deepcopy.go | 168 ------ .../v1alpha2/zz_generated.parent_overrides.go | 140 ++--- .../v1alpha2/zz_generated.plugin_overrides.go | 64 +-- .../zz_generated.union_definitions.go | 118 +---- pkg/validation/commands.go | 12 - pkg/validation/commands_test.go | 59 --- pkg/validation/validation-rule.md | 3 +- samples/devfiles/nodejs-stack.devfile.yaml | 17 - samples/devfiles/simple-devfile.yaml | 4 - .../spring-boot-http-booster-devfile.yaml | 14 - .../nodejs.devworkspacetemplate.yaml | 17 - .../latest/dev-workspace-template-spec.json | 438 +--------------- schemas/latest/dev-workspace-template.json | 438 +--------------- schemas/latest/dev-workspace.json | 438 +--------------- schemas/latest/devfile.json | 438 +--------------- .../dev-workspace-template-spec.json | 494 +----------------- .../ide-targeted/dev-workspace-template.json | 494 +----------------- .../latest/ide-targeted/dev-workspace.json | 494 +----------------- schemas/latest/ide-targeted/devfile.json | 494 +----------------- .../latest/ide-targeted/parent-overrides.json | 244 +-------- .../latest/ide-targeted/plugin-overrides.json | 118 ----- schemas/latest/parent-overrides.json | 216 +------- schemas/latest/plugin-overrides.json | 106 ---- .../devfiles/commands/VsCodeLaunchAll.yaml | 27 - .../VsCodeLaunchBadGroupIsDefault.yaml | 6 - .../commands/VsCodeLaunchBadGroupKind.yaml | 6 - .../commands/VsCodeLaunchInlinedAndUri.yaml | 4 - .../commands/VsCodeLaunchMinimum.yaml | 6 - .../VsCodeLaunchMissingGroupKind.yaml | 6 - .../VsCodeLaunchMissingInlinedAndUri.yaml | 5 - .../commands/VsCodeLaunchMixedCaseId.yaml | 6 - .../devfiles/commands/VsCodeLaunchNoId.yaml | 2 - .../v200/devfiles/commands/VsCodeTaskAll.yaml | 27 - .../commands/VsCodeTaskBadGroupIsDefault.yaml | 6 - .../commands/VsCodeTaskBadGroupKind.yaml | 6 - .../commands/VsCodeTaskInlinedAndUri.yaml | 4 - .../devfiles/commands/VsCodeTaskMinimum.yaml | 6 - .../commands/VsCodeTaskMissingGroupKind.yaml | 6 - .../VsCodeTaskMissingInlinedAndUri.yaml | 5 - .../commands/VsCodeTaskMixedCaseId.yaml | 6 - .../devfiles/commands/VsCodeTaskNoId.yaml | 2 - test/v200/devfiles/components/pluginAll.yaml | 10 - test/v200/devfiles/parent/parentAll.yaml | 12 - test/v200/json/command-parent-tests.json | 114 +--- test/v200/json/command-tests.json | 114 +--- 52 files changed, 151 insertions(+), 6817 deletions(-) delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchAll.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchBadGroupKind.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchInlinedAndUri.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchMinimum.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchMissingGroupKind.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchMixedCaseId.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeLaunchNoId.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskAll.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskBadGroupKind.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskInlinedAndUri.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskMinimum.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskMissingGroupKind.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskMixedCaseId.yaml delete mode 100644 test/v200/devfiles/commands/VsCodeTaskNoId.yaml diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml index 1aba2f1c7..57206b610 100644 --- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml @@ -4145,10 +4145,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite - required: @@ -4204,8 +4200,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite - Custom type: string @@ -4373,90 +4367,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -4920,10 +4830,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -4978,8 +4884,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5102,94 +5006,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -5752,10 +5568,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -5808,8 +5620,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5929,90 +5739,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is part - of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is part - of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -6461,10 +6187,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -6519,8 +6241,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -6647,94 +6367,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default - command for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of - relative URI the VsCode configuration - will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default - command for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of - relative URI the VsCode configuration - will be fetched from - type: string - type: object required: - id type: object @@ -7341,7 +6973,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use + `Git` instead properties: checkoutFrom: description: Defines from what the project should @@ -7450,7 +7083,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use + `Git` instead properties: checkoutFrom: description: Defines from what the project should @@ -7579,7 +7213,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7703,7 +7338,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml index 8dc27eb21..f1119a338 100644 --- a/crds/workspace.devfile.io_devworkspaces.yaml +++ b/crds/workspace.devfile.io_devworkspaces.yaml @@ -4143,10 +4143,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite - required: @@ -4202,8 +4198,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite - Custom type: string @@ -4371,90 +4365,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -4925,10 +4835,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -4983,8 +4889,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5107,94 +5011,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -5757,10 +5573,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -5813,8 +5625,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5934,90 +5744,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is part - of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is part - of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -6466,10 +6192,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -6524,8 +6246,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -6652,94 +6372,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default - command for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of - relative URI the VsCode configuration - will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default - command for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of - relative URI the VsCode configuration - will be fetched from - type: string - type: object required: - id type: object @@ -7346,7 +6978,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use + `Git` instead properties: checkoutFrom: description: Defines from what the project should @@ -7455,7 +7088,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use + `Git` instead properties: checkoutFrom: description: Defines from what the project should @@ -7584,7 +7218,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7708,7 +7343,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml index 20d0908c3..5bd77b322 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml @@ -3919,10 +3919,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite - required: @@ -3976,8 +3972,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite - Custom type: string @@ -4136,87 +4130,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode launch - action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part of - properties: - isDefault: - description: Identifies the default command for a given - group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI the - VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part of - properties: - isDefault: - description: Identifies the default command for a given - group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI the - VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -4665,10 +4578,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -4722,8 +4631,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -4844,92 +4751,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a - VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is - part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is - part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition of a - VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is - part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is - part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -5469,10 +5290,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -5522,8 +5339,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5638,86 +5453,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -6152,10 +5887,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -6210,8 +5941,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -6334,94 +6063,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -7002,7 +6643,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7109,7 +6751,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7233,7 +6876,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be checked @@ -7350,7 +6994,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be checked diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml index 3c286a989..72e5400b4 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml @@ -3917,10 +3917,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite - required: @@ -3974,8 +3970,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite - Custom type: string @@ -4134,87 +4128,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode launch - action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part of - properties: - isDefault: - description: Identifies the default command for a given - group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI the - VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part of - properties: - isDefault: - description: Identifies the default command for a given - group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - required: - - kind - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI the - VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -4670,10 +4583,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -4727,8 +4636,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -4849,92 +4756,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a - VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is - part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is - part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition of a - VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is - part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command is - part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command - location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -5474,10 +5295,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -5527,8 +5344,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -5643,86 +5458,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition of a VsCode - launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object - vscodeTask: - description: Command providing the definition of a VsCode - Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command is part - of - properties: - isDefault: - description: Identifies the default command for - a given group kind - type: boolean - kind: - description: Kind of group the command is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode configuration - type: string - locationType: - description: Type of Vscode configuration command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative URI - the VsCode configuration will be fetched from - type: string - type: object required: - id type: object @@ -6157,10 +5892,6 @@ spec: - exec - required: - apply - - required: - - vscodeTask - - required: - - vscodeLaunch - required: - composite properties: @@ -6215,8 +5946,6 @@ spec: enum: - Exec - Apply - - VscodeTask - - VscodeLaunch - Composite type: string composite: @@ -6339,94 +6068,6 @@ spec: maxLength: 63 pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string - vscodeLaunch: - description: Command providing the definition - of a VsCode launch action - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object - vscodeTask: - description: Command providing the definition - of a VsCode Task - oneOf: - - required: - - uri - - required: - - inlined - properties: - group: - description: Defines the group this command - is part of - properties: - isDefault: - description: Identifies the default command - for a given group kind - type: boolean - kind: - description: Kind of group the command - is part of - enum: - - build - - run - - test - - debug - type: string - type: object - inlined: - description: Inlined content of the VsCode - configuration - type: string - locationType: - description: Type of Vscode configuration - command location - enum: - - Uri - - Inlined - type: string - uri: - description: Location as an absolute of relative - URI the VsCode configuration will be fetched - from - type: string - type: object required: - id type: object @@ -7007,7 +6648,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7114,7 +6756,8 @@ spec: type: object type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be @@ -7238,7 +6881,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be checked @@ -7355,7 +6999,8 @@ spec: - remotes type: object github: - description: Project's GitHub source + description: Project's GitHub source. Deprecated, use `Git` + instead properties: checkoutFrom: description: Defines from what the project should be checked diff --git a/pkg/apis/workspaces/v1alpha1/parent_conversion.go b/pkg/apis/workspaces/v1alpha1/parent_conversion.go index bcdde1b71..d1f5b5383 100644 --- a/pkg/apis/workspaces/v1alpha1/parent_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/parent_conversion.go @@ -219,10 +219,6 @@ func convertParentCommandFrom_v1alpha2(src *v1alpha2.CommandParentOverride, dest dest.Composite.Id = srcId case src.Exec != nil: dest.Exec.Id = srcId - case src.VscodeLaunch != nil: - dest.VscodeLaunch.Id = srcId - case src.VscodeTask != nil: - dest.VscodeTask.Id = srcId } return nil } diff --git a/pkg/apis/workspaces/v1alpha2/commands.go b/pkg/apis/workspaces/v1alpha2/commands.go index 84d70e40e..67b81a2b8 100644 --- a/pkg/apis/workspaces/v1alpha2/commands.go +++ b/pkg/apis/workspaces/v1alpha2/commands.go @@ -7,14 +7,12 @@ import ( // CommandType describes the type of command. // Only one of the following command type may be specified. -// +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite;Custom +// +kubebuilder:validation:Enum=Exec;Apply;Composite;Custom type CommandType string const ( ExecCommandType CommandType = "Exec" ApplyCommandType CommandType = "Apply" - VscodeTaskCommandType CommandType = "VscodeTask" - VscodeLaunchCommandType CommandType = "VscodeLaunch" CompositeCommandType CommandType = "Composite" CustomCommandType CommandType = "Custom" ) @@ -92,14 +90,6 @@ type CommandUnion struct { // +optional Apply *ApplyCommand `json:"apply,omitempty"` - // Command providing the definition of a VsCode Task - // +optional - VscodeTask *VscodeConfigurationCommand `json:"vscodeTask,omitempty"` - - // Command providing the definition of a VsCode launch action - // +optional - VscodeLaunch *VscodeConfigurationCommand `json:"vscodeLaunch,omitempty"` - // Composite command that allows executing several sub-commands // either sequentially or concurrently // +optional @@ -173,40 +163,6 @@ type CompositeCommand struct { Parallel bool `json:"parallel,omitempty"` } -// VscodeConfigurationCommandLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -// +kubebuilder:validation:Enum=Uri;Inlined -type VscodeConfigurationCommandLocationType string - -const ( - UriVscodeConfigurationCommandLocationType VscodeConfigurationCommandLocationType = "Uri" - InlinedVscodeConfigurationCommandLocationType VscodeConfigurationCommandLocationType = "Inlined" -) - -// +union -type VscodeConfigurationCommandLocation struct { - // Type of Vscode configuration command location - // + - // +unionDiscriminator - // +optional - LocationType VscodeConfigurationCommandLocationType `json:"locationType,omitempty"` - - // Location as an absolute of relative URI - // the VsCode configuration will be fetched from - // +optional - Uri string `json:"uri,omitempty"` - - // Inlined content of the VsCode configuration - // +optional - Inlined string `json:"inlined,omitempty"` -} - -type VscodeConfigurationCommand struct { - BaseCommand `json:",inline"` - VscodeConfigurationCommandLocation `json:",inline"` -} - type CustomCommand struct { LabeledCommand `json:",inline"` diff --git a/pkg/apis/workspaces/v1alpha2/projects.go b/pkg/apis/workspaces/v1alpha2/projects.go index a111ac650..b4a4e6934 100644 --- a/pkg/apis/workspaces/v1alpha2/projects.go +++ b/pkg/apis/workspaces/v1alpha2/projects.go @@ -73,7 +73,7 @@ type ProjectSource struct { // +optional Git *GitProjectSource `json:"git,omitempty"` - // Project's GitHub source + // Project's GitHub source. Deprecated, use `Git` instead // +optional Github *GithubProjectSource `json:"github,omitempty"` diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go index 3ee9a3c32..6647e17eb 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go @@ -409,16 +409,6 @@ func (in *CommandUnion) DeepCopyInto(out *CommandUnion) { *out = new(ApplyCommand) (*in).DeepCopyInto(*out) } - if in.VscodeTask != nil { - in, out := &in.VscodeTask, &out.VscodeTask - *out = new(VscodeConfigurationCommand) - (*in).DeepCopyInto(*out) - } - if in.VscodeLaunch != nil { - in, out := &in.VscodeLaunch, &out.VscodeLaunch - *out = new(VscodeConfigurationCommand) - (*in).DeepCopyInto(*out) - } if in.Composite != nil { in, out := &in.Composite, &out.Composite *out = new(CompositeCommand) @@ -454,16 +444,6 @@ func (in *CommandUnionParentOverride) DeepCopyInto(out *CommandUnionParentOverri *out = new(ApplyCommandParentOverride) (*in).DeepCopyInto(*out) } - if in.VscodeTask != nil { - in, out := &in.VscodeTask, &out.VscodeTask - *out = new(VscodeConfigurationCommandParentOverride) - (*in).DeepCopyInto(*out) - } - if in.VscodeLaunch != nil { - in, out := &in.VscodeLaunch, &out.VscodeLaunch - *out = new(VscodeConfigurationCommandParentOverride) - (*in).DeepCopyInto(*out) - } if in.Composite != nil { in, out := &in.Composite, &out.Composite *out = new(CompositeCommandParentOverride) @@ -494,16 +474,6 @@ func (in *CommandUnionPluginOverride) DeepCopyInto(out *CommandUnionPluginOverri *out = new(ApplyCommandPluginOverride) (*in).DeepCopyInto(*out) } - if in.VscodeTask != nil { - in, out := &in.VscodeTask, &out.VscodeTask - *out = new(VscodeConfigurationCommandPluginOverride) - (*in).DeepCopyInto(*out) - } - if in.VscodeLaunch != nil { - in, out := &in.VscodeLaunch, &out.VscodeLaunch - *out = new(VscodeConfigurationCommandPluginOverride) - (*in).DeepCopyInto(*out) - } if in.Composite != nil { in, out := &in.Composite, &out.Composite *out = new(CompositeCommandPluginOverride) @@ -534,16 +504,6 @@ func (in *CommandUnionPluginOverrideParentOverride) DeepCopyInto(out *CommandUni *out = new(ApplyCommandPluginOverrideParentOverride) (*in).DeepCopyInto(*out) } - if in.VscodeTask != nil { - in, out := &in.VscodeTask, &out.VscodeTask - *out = new(VscodeConfigurationCommandPluginOverrideParentOverride) - (*in).DeepCopyInto(*out) - } - if in.VscodeLaunch != nil { - in, out := &in.VscodeLaunch, &out.VscodeLaunch - *out = new(VscodeConfigurationCommandPluginOverrideParentOverride) - (*in).DeepCopyInto(*out) - } if in.Composite != nil { in, out := &in.Composite, &out.Composite *out = new(CompositeCommandPluginOverrideParentOverride) @@ -2836,134 +2796,6 @@ func (in *VolumePluginOverrideParentOverride) DeepCopy() *VolumePluginOverridePa return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommand) DeepCopyInto(out *VscodeConfigurationCommand) { - *out = *in - in.BaseCommand.DeepCopyInto(&out.BaseCommand) - out.VscodeConfigurationCommandLocation = in.VscodeConfigurationCommandLocation -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommand. -func (in *VscodeConfigurationCommand) DeepCopy() *VscodeConfigurationCommand { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommand) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandLocation) DeepCopyInto(out *VscodeConfigurationCommandLocation) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandLocation. -func (in *VscodeConfigurationCommandLocation) DeepCopy() *VscodeConfigurationCommandLocation { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandLocation) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandLocationParentOverride) DeepCopyInto(out *VscodeConfigurationCommandLocationParentOverride) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandLocationParentOverride. -func (in *VscodeConfigurationCommandLocationParentOverride) DeepCopy() *VscodeConfigurationCommandLocationParentOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandLocationParentOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandLocationPluginOverride) DeepCopyInto(out *VscodeConfigurationCommandLocationPluginOverride) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandLocationPluginOverride. -func (in *VscodeConfigurationCommandLocationPluginOverride) DeepCopy() *VscodeConfigurationCommandLocationPluginOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandLocationPluginOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandLocationPluginOverrideParentOverride) DeepCopyInto(out *VscodeConfigurationCommandLocationPluginOverrideParentOverride) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandLocationPluginOverrideParentOverride. -func (in *VscodeConfigurationCommandLocationPluginOverrideParentOverride) DeepCopy() *VscodeConfigurationCommandLocationPluginOverrideParentOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandLocationPluginOverrideParentOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandParentOverride) DeepCopyInto(out *VscodeConfigurationCommandParentOverride) { - *out = *in - in.BaseCommandParentOverride.DeepCopyInto(&out.BaseCommandParentOverride) - out.VscodeConfigurationCommandLocationParentOverride = in.VscodeConfigurationCommandLocationParentOverride -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandParentOverride. -func (in *VscodeConfigurationCommandParentOverride) DeepCopy() *VscodeConfigurationCommandParentOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandParentOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandPluginOverride) DeepCopyInto(out *VscodeConfigurationCommandPluginOverride) { - *out = *in - in.BaseCommandPluginOverride.DeepCopyInto(&out.BaseCommandPluginOverride) - out.VscodeConfigurationCommandLocationPluginOverride = in.VscodeConfigurationCommandLocationPluginOverride -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandPluginOverride. -func (in *VscodeConfigurationCommandPluginOverride) DeepCopy() *VscodeConfigurationCommandPluginOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandPluginOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *VscodeConfigurationCommandPluginOverrideParentOverride) DeepCopyInto(out *VscodeConfigurationCommandPluginOverrideParentOverride) { - *out = *in - in.BaseCommandPluginOverrideParentOverride.DeepCopyInto(&out.BaseCommandPluginOverrideParentOverride) - out.VscodeConfigurationCommandLocationPluginOverrideParentOverride = in.VscodeConfigurationCommandLocationPluginOverrideParentOverride -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VscodeConfigurationCommandPluginOverrideParentOverride. -func (in *VscodeConfigurationCommandPluginOverrideParentOverride) DeepCopy() *VscodeConfigurationCommandPluginOverrideParentOverride { - if in == nil { - return nil - } - out := new(VscodeConfigurationCommandPluginOverrideParentOverride) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *WorkspaceCondition) DeepCopyInto(out *WorkspaceCondition) { *out = *in diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go index 5ffd65f65..292203982 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go @@ -174,7 +174,7 @@ type ProjectSourceParentOverride struct { // +optional Git *GitProjectSourceParentOverride `json:"git,omitempty"` - // Project's GitHub source + // Project's GitHub source. Deprecated, use `Git` instead // +optional Github *GithubProjectSourceParentOverride `json:"github,omitempty"` @@ -186,7 +186,7 @@ type ProjectSourceParentOverride struct { // +union type CommandUnionParentOverride struct { - // +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite + // +kubebuilder:validation:Enum=Exec;Apply;Composite // Type of workspace command // +unionDiscriminator // +optional @@ -210,14 +210,6 @@ type CommandUnionParentOverride struct { // +optional Apply *ApplyCommandParentOverride `json:"apply,omitempty"` - // Command providing the definition of a VsCode Task - // +optional - VscodeTask *VscodeConfigurationCommandParentOverride `json:"vscodeTask,omitempty"` - - // Command providing the definition of a VsCode launch action - // +optional - VscodeLaunch *VscodeConfigurationCommandParentOverride `json:"vscodeLaunch,omitempty"` - // Composite command that allows executing several sub-commands // either sequentially or concurrently // +optional @@ -335,11 +327,6 @@ type ApplyCommandParentOverride struct { Component string `json:"component,omitempty"` } -type VscodeConfigurationCommandParentOverride struct { - BaseCommandParentOverride `json:",inline"` - VscodeConfigurationCommandLocationParentOverride `json:",inline"` -} - type CompositeCommandParentOverride struct { LabeledCommandParentOverride `json:",inline"` @@ -562,33 +549,6 @@ type EnvVarParentOverride struct { Value string `json:"value,omitempty" yaml:"value"` } -type BaseCommandParentOverride struct { - - // +optional - // Defines the group this command is part of - Group *CommandGroupParentOverride `json:"group,omitempty"` -} - -// +union -type VscodeConfigurationCommandLocationParentOverride struct { - - // +kubebuilder:validation:Enum=Uri;Inlined - // Type of Vscode configuration command location - // + - // +unionDiscriminator - // +optional - LocationType VscodeConfigurationCommandLocationTypeParentOverride `json:"locationType,omitempty"` - - // Location as an absolute of relative URI - // the VsCode configuration will be fetched from - // +optional - Uri string `json:"uri,omitempty"` - - // Inlined content of the VsCode configuration - // +optional - Inlined string `json:"inlined,omitempty"` -} - // Volume that should be mounted to a component container type VolumeMountParentOverride struct { @@ -705,22 +665,13 @@ type CheckoutFromParentOverride struct { Remote string `json:"remote,omitempty"` } -type CommandGroupParentOverride struct { - - // +optional - // Kind of group the command is part of - Kind CommandGroupKindParentOverride `json:"kind,omitempty"` +type BaseCommandParentOverride struct { // +optional - // Identifies the default command for a given group kind - IsDefault bool `json:"isDefault,omitempty"` + // Defines the group this command is part of + Group *CommandGroupParentOverride `json:"group,omitempty"` } -// VscodeConfigurationCommandLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -type VscodeConfigurationCommandLocationTypeParentOverride string - // K8sLikeComponentLocationType describes the type of // the location the configuration is fetched from. // Only one of the following component type may be specified. @@ -776,7 +727,7 @@ type ComponentUnionPluginOverrideParentOverride struct { // +union type CommandUnionPluginOverrideParentOverride struct { - // +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite + // +kubebuilder:validation:Enum=Exec;Apply;Composite // Type of workspace command // +unionDiscriminator // +optional @@ -800,23 +751,22 @@ type CommandUnionPluginOverrideParentOverride struct { // +optional Apply *ApplyCommandPluginOverrideParentOverride `json:"apply,omitempty"` - // Command providing the definition of a VsCode Task - // +optional - VscodeTask *VscodeConfigurationCommandPluginOverrideParentOverride `json:"vscodeTask,omitempty"` - - // Command providing the definition of a VsCode launch action - // +optional - VscodeLaunch *VscodeConfigurationCommandPluginOverrideParentOverride `json:"vscodeLaunch,omitempty"` - // Composite command that allows executing several sub-commands // either sequentially or concurrently // +optional Composite *CompositeCommandPluginOverrideParentOverride `json:"composite,omitempty"` } -// CommandGroupKind describes the kind of command group. -// +kubebuilder:validation:Enum=build;run;test;debug -type CommandGroupKindParentOverride string +type CommandGroupParentOverride struct { + + // +optional + // Kind of group the command is part of + Kind CommandGroupKindParentOverride `json:"kind,omitempty"` + + // +optional + // Identifies the default command for a given group kind + IsDefault bool `json:"isDefault,omitempty"` +} // ComponentType describes the type of component. // Only one of the following component type may be specified. @@ -901,11 +851,6 @@ type ApplyCommandPluginOverrideParentOverride struct { Component string `json:"component,omitempty"` } -type VscodeConfigurationCommandPluginOverrideParentOverride struct { - BaseCommandPluginOverrideParentOverride `json:",inline"` - VscodeConfigurationCommandLocationPluginOverrideParentOverride `json:",inline"` -} - type CompositeCommandPluginOverrideParentOverride struct { LabeledCommandPluginOverrideParentOverride `json:",inline"` @@ -917,6 +862,10 @@ type CompositeCommandPluginOverrideParentOverride struct { Parallel bool `json:"parallel,omitempty"` } +// CommandGroupKind describes the kind of command group. +// +kubebuilder:validation:Enum=build;run;test;debug +type CommandGroupKindParentOverride string + // Workspace component: Anything that will bring additional features / tooling / behaviour / context // to the workspace, in order to make working in it easier. type BaseComponentPluginOverrideParentOverride struct { @@ -1088,33 +1037,6 @@ type EnvVarPluginOverrideParentOverride struct { Value string `json:"value,omitempty" yaml:"value"` } -type BaseCommandPluginOverrideParentOverride struct { - - // +optional - // Defines the group this command is part of - Group *CommandGroupPluginOverrideParentOverride `json:"group,omitempty"` -} - -// +union -type VscodeConfigurationCommandLocationPluginOverrideParentOverride struct { - - // +kubebuilder:validation:Enum=Uri;Inlined - // Type of Vscode configuration command location - // + - // +unionDiscriminator - // +optional - LocationType VscodeConfigurationCommandLocationTypePluginOverrideParentOverride `json:"locationType,omitempty"` - - // Location as an absolute of relative URI - // the VsCode configuration will be fetched from - // +optional - Uri string `json:"uri,omitempty"` - - // Inlined content of the VsCode configuration - // +optional - Inlined string `json:"inlined,omitempty"` -} - // Volume that should be mounted to a component container type VolumeMountPluginOverrideParentOverride struct { @@ -1160,6 +1082,18 @@ type K8sLikeComponentLocationPluginOverrideParentOverride struct { Inlined string `json:"inlined,omitempty"` } +type BaseCommandPluginOverrideParentOverride struct { + + // +optional + // Defines the group this command is part of + Group *CommandGroupPluginOverrideParentOverride `json:"group,omitempty"` +} + +// K8sLikeComponentLocationType describes the type of +// the location the configuration is fetched from. +// Only one of the following component type may be specified. +type K8sLikeComponentLocationTypePluginOverrideParentOverride string + type CommandGroupPluginOverrideParentOverride struct { // +optional @@ -1171,16 +1105,6 @@ type CommandGroupPluginOverrideParentOverride struct { IsDefault bool `json:"isDefault,omitempty"` } -// VscodeConfigurationCommandLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -type VscodeConfigurationCommandLocationTypePluginOverrideParentOverride string - -// K8sLikeComponentLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -type K8sLikeComponentLocationTypePluginOverrideParentOverride string - // CommandGroupKind describes the kind of command group. // +kubebuilder:validation:Enum=build;run;test;debug type CommandGroupKindPluginOverrideParentOverride string diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go index 1872f7643..de0a7dc46 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go @@ -93,7 +93,7 @@ type ComponentUnionPluginOverride struct { // +union type CommandUnionPluginOverride struct { - // +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite + // +kubebuilder:validation:Enum=Exec;Apply;Composite // Type of workspace command // +unionDiscriminator // +optional @@ -117,14 +117,6 @@ type CommandUnionPluginOverride struct { // +optional Apply *ApplyCommandPluginOverride `json:"apply,omitempty"` - // Command providing the definition of a VsCode Task - // +optional - VscodeTask *VscodeConfigurationCommandPluginOverride `json:"vscodeTask,omitempty"` - - // Command providing the definition of a VsCode launch action - // +optional - VscodeLaunch *VscodeConfigurationCommandPluginOverride `json:"vscodeLaunch,omitempty"` - // Composite command that allows executing several sub-commands // either sequentially or concurrently // +optional @@ -214,11 +206,6 @@ type ApplyCommandPluginOverride struct { Component string `json:"component,omitempty"` } -type VscodeConfigurationCommandPluginOverride struct { - BaseCommandPluginOverride `json:",inline"` - VscodeConfigurationCommandLocationPluginOverride `json:",inline"` -} - type CompositeCommandPluginOverride struct { LabeledCommandPluginOverride `json:",inline"` @@ -399,33 +386,6 @@ type EnvVarPluginOverride struct { Value string `json:"value,omitempty" yaml:"value"` } -type BaseCommandPluginOverride struct { - - // +optional - // Defines the group this command is part of - Group *CommandGroupPluginOverride `json:"group,omitempty"` -} - -// +union -type VscodeConfigurationCommandLocationPluginOverride struct { - - // +kubebuilder:validation:Enum=Uri;Inlined - // Type of Vscode configuration command location - // + - // +unionDiscriminator - // +optional - LocationType VscodeConfigurationCommandLocationTypePluginOverride `json:"locationType,omitempty"` - - // Location as an absolute of relative URI - // the VsCode configuration will be fetched from - // +optional - Uri string `json:"uri,omitempty"` - - // Inlined content of the VsCode configuration - // +optional - Inlined string `json:"inlined,omitempty"` -} - // Volume that should be mounted to a component container type VolumeMountPluginOverride struct { @@ -471,6 +431,18 @@ type K8sLikeComponentLocationPluginOverride struct { Inlined string `json:"inlined,omitempty"` } +type BaseCommandPluginOverride struct { + + // +optional + // Defines the group this command is part of + Group *CommandGroupPluginOverride `json:"group,omitempty"` +} + +// K8sLikeComponentLocationType describes the type of +// the location the configuration is fetched from. +// Only one of the following component type may be specified. +type K8sLikeComponentLocationTypePluginOverride string + type CommandGroupPluginOverride struct { // +optional @@ -482,16 +454,6 @@ type CommandGroupPluginOverride struct { IsDefault bool `json:"isDefault,omitempty"` } -// VscodeConfigurationCommandLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -type VscodeConfigurationCommandLocationTypePluginOverride string - -// K8sLikeComponentLocationType describes the type of -// the location the configuration is fetched from. -// Only one of the following component type may be specified. -type K8sLikeComponentLocationTypePluginOverride string - // CommandGroupKind describes the kind of command group. // +kubebuilder:validation:Enum=build;run;test;debug type CommandGroupKindPluginOverride string diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go index 406ca523f..03a6e64d2 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go @@ -21,33 +21,10 @@ func (union *CommandUnion) Simplify() { // +k8s:deepcopy-gen=false type CommandUnionVisitor struct { - Exec func(*ExecCommand) error - Apply func(*ApplyCommand) error - VscodeTask func(*VscodeConfigurationCommand) error - VscodeLaunch func(*VscodeConfigurationCommand) error - Composite func(*CompositeCommand) error - Custom func(*CustomCommand) error -} - -var vscodeConfigurationCommandLocation reflect.Type = reflect.TypeOf(VscodeConfigurationCommandLocationVisitor{}) - -func (union VscodeConfigurationCommandLocation) Visit(visitor VscodeConfigurationCommandLocationVisitor) error { - return visitUnion(union, visitor) -} -func (union *VscodeConfigurationCommandLocation) discriminator() *string { - return (*string)(&union.LocationType) -} -func (union *VscodeConfigurationCommandLocation) Normalize() error { - return normalizeUnion(union, vscodeConfigurationCommandLocation) -} -func (union *VscodeConfigurationCommandLocation) Simplify() { - simplifyUnion(union, vscodeConfigurationCommandLocation) -} - -// +k8s:deepcopy-gen=false -type VscodeConfigurationCommandLocationVisitor struct { - Uri func(string) error - Inlined func(string) error + Exec func(*ExecCommand) error + Apply func(*ApplyCommand) error + Composite func(*CompositeCommand) error + Custom func(*CustomCommand) error } var componentUnion reflect.Type = reflect.TypeOf(ComponentUnionVisitor{}) @@ -204,32 +181,9 @@ func (union *CommandUnionParentOverride) Simplify() { // +k8s:deepcopy-gen=false type CommandUnionParentOverrideVisitor struct { - Exec func(*ExecCommandParentOverride) error - Apply func(*ApplyCommandParentOverride) error - VscodeTask func(*VscodeConfigurationCommandParentOverride) error - VscodeLaunch func(*VscodeConfigurationCommandParentOverride) error - Composite func(*CompositeCommandParentOverride) error -} - -var vscodeConfigurationCommandLocationParentOverride reflect.Type = reflect.TypeOf(VscodeConfigurationCommandLocationParentOverrideVisitor{}) - -func (union VscodeConfigurationCommandLocationParentOverride) Visit(visitor VscodeConfigurationCommandLocationParentOverrideVisitor) error { - return visitUnion(union, visitor) -} -func (union *VscodeConfigurationCommandLocationParentOverride) discriminator() *string { - return (*string)(&union.LocationType) -} -func (union *VscodeConfigurationCommandLocationParentOverride) Normalize() error { - return normalizeUnion(union, vscodeConfigurationCommandLocationParentOverride) -} -func (union *VscodeConfigurationCommandLocationParentOverride) Simplify() { - simplifyUnion(union, vscodeConfigurationCommandLocationParentOverride) -} - -// +k8s:deepcopy-gen=false -type VscodeConfigurationCommandLocationParentOverrideVisitor struct { - Uri func(string) error - Inlined func(string) error + Exec func(*ExecCommandParentOverride) error + Apply func(*ApplyCommandParentOverride) error + Composite func(*CompositeCommandParentOverride) error } var k8sLikeComponentLocationParentOverride reflect.Type = reflect.TypeOf(K8sLikeComponentLocationParentOverrideVisitor{}) @@ -315,32 +269,9 @@ func (union *CommandUnionPluginOverrideParentOverride) Simplify() { // +k8s:deepcopy-gen=false type CommandUnionPluginOverrideParentOverrideVisitor struct { - Exec func(*ExecCommandPluginOverrideParentOverride) error - Apply func(*ApplyCommandPluginOverrideParentOverride) error - VscodeTask func(*VscodeConfigurationCommandPluginOverrideParentOverride) error - VscodeLaunch func(*VscodeConfigurationCommandPluginOverrideParentOverride) error - Composite func(*CompositeCommandPluginOverrideParentOverride) error -} - -var vscodeConfigurationCommandLocationPluginOverrideParentOverride reflect.Type = reflect.TypeOf(VscodeConfigurationCommandLocationPluginOverrideParentOverrideVisitor{}) - -func (union VscodeConfigurationCommandLocationPluginOverrideParentOverride) Visit(visitor VscodeConfigurationCommandLocationPluginOverrideParentOverrideVisitor) error { - return visitUnion(union, visitor) -} -func (union *VscodeConfigurationCommandLocationPluginOverrideParentOverride) discriminator() *string { - return (*string)(&union.LocationType) -} -func (union *VscodeConfigurationCommandLocationPluginOverrideParentOverride) Normalize() error { - return normalizeUnion(union, vscodeConfigurationCommandLocationPluginOverrideParentOverride) -} -func (union *VscodeConfigurationCommandLocationPluginOverrideParentOverride) Simplify() { - simplifyUnion(union, vscodeConfigurationCommandLocationPluginOverrideParentOverride) -} - -// +k8s:deepcopy-gen=false -type VscodeConfigurationCommandLocationPluginOverrideParentOverrideVisitor struct { - Uri func(string) error - Inlined func(string) error + Exec func(*ExecCommandPluginOverrideParentOverride) error + Apply func(*ApplyCommandPluginOverrideParentOverride) error + Composite func(*CompositeCommandPluginOverrideParentOverride) error } var k8sLikeComponentLocationPluginOverrideParentOverride reflect.Type = reflect.TypeOf(K8sLikeComponentLocationPluginOverrideParentOverrideVisitor{}) @@ -404,32 +335,9 @@ func (union *CommandUnionPluginOverride) Simplify() { // +k8s:deepcopy-gen=false type CommandUnionPluginOverrideVisitor struct { - Exec func(*ExecCommandPluginOverride) error - Apply func(*ApplyCommandPluginOverride) error - VscodeTask func(*VscodeConfigurationCommandPluginOverride) error - VscodeLaunch func(*VscodeConfigurationCommandPluginOverride) error - Composite func(*CompositeCommandPluginOverride) error -} - -var vscodeConfigurationCommandLocationPluginOverride reflect.Type = reflect.TypeOf(VscodeConfigurationCommandLocationPluginOverrideVisitor{}) - -func (union VscodeConfigurationCommandLocationPluginOverride) Visit(visitor VscodeConfigurationCommandLocationPluginOverrideVisitor) error { - return visitUnion(union, visitor) -} -func (union *VscodeConfigurationCommandLocationPluginOverride) discriminator() *string { - return (*string)(&union.LocationType) -} -func (union *VscodeConfigurationCommandLocationPluginOverride) Normalize() error { - return normalizeUnion(union, vscodeConfigurationCommandLocationPluginOverride) -} -func (union *VscodeConfigurationCommandLocationPluginOverride) Simplify() { - simplifyUnion(union, vscodeConfigurationCommandLocationPluginOverride) -} - -// +k8s:deepcopy-gen=false -type VscodeConfigurationCommandLocationPluginOverrideVisitor struct { - Uri func(string) error - Inlined func(string) error + Exec func(*ExecCommandPluginOverride) error + Apply func(*ApplyCommandPluginOverride) error + Composite func(*CompositeCommandPluginOverride) error } var k8sLikeComponentLocationPluginOverride reflect.Type = reflect.TypeOf(K8sLikeComponentLocationPluginOverrideVisitor{}) diff --git a/pkg/validation/commands.go b/pkg/validation/commands.go index 9fc4e2270..8447737c8 100644 --- a/pkg/validation/commands.go +++ b/pkg/validation/commands.go @@ -57,14 +57,6 @@ func validateCommand(command v1alpha2.Command, parentCommands map[string]string, return validateCompositeCommand(&command, parentCommands, devfileCommands, components) case command.Exec != nil || command.Apply != nil: return validateCommandComponent(command, components) - case command.VscodeLaunch != nil: - if command.VscodeLaunch.Uri != "" { - return ValidateURI(command.VscodeLaunch.Uri) - } - case command.VscodeTask != nil: - if command.VscodeTask.Uri != "" { - return ValidateURI(command.VscodeTask.Uri) - } default: err = fmt.Errorf("command %s type is invalid", command.Id) } @@ -106,10 +98,6 @@ func getGroup(command v1alpha2.Command) *v1alpha2.CommandGroup { return command.Exec.Group case command.Apply != nil: return command.Apply.Group - case command.VscodeLaunch != nil: - return command.VscodeLaunch.Group - case command.VscodeTask != nil: - return command.VscodeTask.Group case command.Custom != nil: return command.Custom.Group diff --git a/pkg/validation/commands_test.go b/pkg/validation/commands_test.go index 187fc8a79..dac1dbf58 100644 --- a/pkg/validation/commands_test.go +++ b/pkg/validation/commands_test.go @@ -63,36 +63,6 @@ func generateDummyCompositeCommand(name string, commands []string, group *v1alph } } -// generateDummyCompositeCommand returns a dummy VscodeLaunch command for testing -func generateDummyVscodeLaunchCommand(name string, commandLocation v1alpha2.VscodeConfigurationCommandLocation, group *v1alpha2.CommandGroup) v1alpha2.Command { - return v1alpha2.Command{ - Id: name, - CommandUnion: v1alpha2.CommandUnion{ - VscodeLaunch: &v1alpha2.VscodeConfigurationCommand{ - BaseCommand: v1alpha2.BaseCommand{ - Group: group, - }, - VscodeConfigurationCommandLocation: commandLocation, - }, - }, - } -} - -// generateDummyCompositeCommand returns a dummy VscodeTask command for testing -func generateDummyVscodeTaskCommand(name string, commandLocation v1alpha2.VscodeConfigurationCommandLocation, group *v1alpha2.CommandGroup) v1alpha2.Command { - return v1alpha2.Command{ - Id: name, - CommandUnion: v1alpha2.CommandUnion{ - VscodeTask: &v1alpha2.VscodeConfigurationCommand{ - BaseCommand: v1alpha2.BaseCommand{ - Group: group, - }, - VscodeConfigurationCommandLocation: commandLocation, - }, - }, - } -} - func TestValidateCommands(t *testing.T) { component := "alias1" @@ -101,20 +71,10 @@ func TestValidateCommands(t *testing.T) { generateDummyContainerComponent(component, nil, nil, nil), } - uriCommandLocation := v1alpha2.VscodeConfigurationCommandLocation{ - Uri: "/some/path", - } - inValidUriCommandLocation := v1alpha2.VscodeConfigurationCommandLocation{ - Uri: "http//wronguri", - } - inlinedCommandLocation := v1alpha2.VscodeConfigurationCommandLocation{ - Inlined: "inlined code", - } duplicateKeyErr := "duplicate key: somecommand1" noDefaultCmdErr := ".*there should be exactly one default command, currently there is no default command" multipleDefaultCmdErr := ".*there should be exactly one default command, currently there is more than one default command" - invalidURIErr := "invalid URI for request" invalidCmdErr := ".*command does not map to a container component" tests := []struct { @@ -169,25 +129,6 @@ func TestValidateCommands(t *testing.T) { }, wantErr: &multipleDefaultCmdErr, }, - { - name: "Valid VscodeTask command with URI", - commands: []v1alpha2.Command{ - generateDummyVscodeTaskCommand("somevscodetask", uriCommandLocation, nil), - }, - }, - { - name: "Valid VscodeLaunch command with Inlined", - commands: []v1alpha2.Command{ - generateDummyVscodeLaunchCommand("somevscodelaunch", inlinedCommandLocation, nil), - }, - }, - { - name: "Invalid VscodeLaunch command with wrong URI", - commands: []v1alpha2.Command{ - generateDummyVscodeLaunchCommand("somevscodelaunch", inValidUriCommandLocation, nil), - }, - wantErr: &invalidURIErr, - }, { name: "Invalid Apply command with wrong component", commands: []v1alpha2.Command{ diff --git a/pkg/validation/validation-rule.md b/pkg/validation/validation-rule.md index d1d850dbf..454ffa414 100644 --- a/pkg/validation/validation-rule.md +++ b/pkg/validation/validation-rule.md @@ -24,8 +24,7 @@ Since network is shared in the same pod, endpoint ports should be unique across - Should not indirectly reference itself via a subcommand which is a composite command - Should reference a valid devfile command 3. exec and apply command should: map to a valid container component -4. vscodeLaunch & vscodeTask: URI needs to be in valid URI format -5. `{build, run, test, debug}`, each kind of group can only have one default command associated with it. If there are multiple commands of the same kind without a default, a warning will be displayed. +4. `{build, run, test, debug}`, each kind of group can only have one default command associated with it. If there are multiple commands of the same kind without a default, a warning will be displayed. ### Components: Common rules for all components types: diff --git a/samples/devfiles/nodejs-stack.devfile.yaml b/samples/devfiles/nodejs-stack.devfile.yaml index a5416b612..81aa65d81 100644 --- a/samples/devfiles/nodejs-stack.devfile.yaml +++ b/samples/devfiles/nodejs-stack.devfile.yaml @@ -59,20 +59,3 @@ commands: node_server_pids=$(pgrep -fx '.*nodemon (--inspect )?app.js' | tr "\\n" " ") && echo "Stopping node server with PIDs: ${node_server_pids}" && kill -15 ${node_server_pids} &>/dev/null && echo 'Done.' - - id: attach-remote-debugger - vscodeLaunch: - inlined: | - { - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "attach", - "name": "Attach to Remote", - "address": "localhost", - "port": 9229, - "localRoot": "${workspaceFolder}", - "remoteRoot": "${workspaceFolder}" - } - ] - } diff --git a/samples/devfiles/simple-devfile.yaml b/samples/devfiles/simple-devfile.yaml index 22c4ea382..b8c4446ec 100644 --- a/samples/devfiles/simple-devfile.yaml +++ b/samples/devfiles/simple-devfile.yaml @@ -16,10 +16,6 @@ commands: group: kind: build isDefault: true - - id: opendevfile - vscodeTask: - inlined: - json - id: build-schema-and-open-devfile composite: label: Build schema and open devfile diff --git a/samples/devfiles/spring-boot-http-booster-devfile.yaml b/samples/devfiles/spring-boot-http-booster-devfile.yaml index 9f7533d46..1a816e35a 100644 --- a/samples/devfiles/spring-boot-http-booster-devfile.yaml +++ b/samples/devfiles/spring-boot-http-booster-devfile.yaml @@ -54,20 +54,6 @@ commands: env: - name: MAVEN_OPTS value: "-Xmx200m" - - id: debug-remote-java-application - vscodeLaunch: - inlined: | - { - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Debug (Attach) - Remote", - "request": "attach", - "hostName": "localhost", - "port": 8000 - }] - } - id: run exec: component: maven diff --git a/samples/devworkspace-templates/nodejs.devworkspacetemplate.yaml b/samples/devworkspace-templates/nodejs.devworkspacetemplate.yaml index 70cd6962f..9290d3d14 100644 --- a/samples/devworkspace-templates/nodejs.devworkspacetemplate.yaml +++ b/samples/devworkspace-templates/nodejs.devworkspacetemplate.yaml @@ -54,20 +54,3 @@ spec: node_server_pids=$(pgrep -fx '.*nodemon (--inspect )?app.js' | tr "\\n" " ") && echo "Stopping node server with PIDs: ${node_server_pids}" && kill -15 ${node_server_pids} &>/dev/null && echo 'Done.' - - id: attach-remote-debugger - vscodeLaunch: - inlined: | - { - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "attach", - "name": "Attach to Remote", - "address": "localhost", - "port": 9229, - "localRoot": "${workspaceFolder}", - "remoteRoot": "${workspaceFolder}" - } - ] - } diff --git a/schemas/latest/dev-workspace-template-spec.json b/schemas/latest/dev-workspace-template-spec.json index fbf9b3691..a1e5aee1c 100644 --- a/schemas/latest/dev-workspace-template-spec.json +++ b/schemas/latest/dev-workspace-template-spec.json @@ -22,16 +22,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -265,108 +255,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -805,16 +693,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -978,102 +856,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -1571,16 +1353,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1744,102 +1516,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -2239,16 +1915,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2412,102 +2078,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -3012,7 +2582,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3136,7 +2706,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3287,7 +2857,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3437,7 +3007,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" diff --git a/schemas/latest/dev-workspace-template.json b/schemas/latest/dev-workspace-template.json index 542bbfdf7..615de4ecd 100644 --- a/schemas/latest/dev-workspace-template.json +++ b/schemas/latest/dev-workspace-template.json @@ -187,16 +187,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -430,108 +420,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -970,16 +858,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1143,102 +1021,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -1736,16 +1518,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1909,102 +1681,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -2404,16 +2080,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2577,102 +2243,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -3177,7 +2747,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3301,7 +2871,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3452,7 +3022,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3602,7 +3172,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" diff --git a/schemas/latest/dev-workspace.json b/schemas/latest/dev-workspace.json index 92a747095..98dcbe01c 100644 --- a/schemas/latest/dev-workspace.json +++ b/schemas/latest/dev-workspace.json @@ -200,16 +200,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -443,108 +433,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -983,16 +871,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1156,102 +1034,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -1749,16 +1531,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1922,102 +1694,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -2417,16 +2093,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2590,102 +2256,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -3190,7 +2760,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3314,7 +2884,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3465,7 +3035,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3615,7 +3185,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" diff --git a/schemas/latest/devfile.json b/schemas/latest/devfile.json index 5382cf142..e01f2e6d8 100644 --- a/schemas/latest/devfile.json +++ b/schemas/latest/devfile.json @@ -25,16 +25,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -215,108 +205,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -730,16 +618,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -903,102 +781,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -1552,16 +1334,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1725,102 +1497,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -2220,16 +1896,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2393,102 +2059,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -2993,7 +2563,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3117,7 +2687,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3245,7 +2815,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3377,7 +2947,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" diff --git a/schemas/latest/ide-targeted/dev-workspace-template-spec.json b/schemas/latest/ide-targeted/dev-workspace-template-spec.json index 38001695a..47dff6067 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template-spec.json +++ b/schemas/latest/ide-targeted/dev-workspace-template-spec.json @@ -22,16 +22,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -297,120 +287,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -880,16 +756,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1078,114 +944,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1735,16 +1493,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1933,114 +1681,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -2475,16 +2115,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2673,114 +2303,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -3341,7 +2863,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3372,7 +2894,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3482,7 +3004,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3513,7 +3035,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3653,7 +3175,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3687,7 +3209,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3821,7 +3343,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3855,7 +3377,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", diff --git a/schemas/latest/ide-targeted/dev-workspace-template.json b/schemas/latest/ide-targeted/dev-workspace-template.json index db3fbe7e2..f4a15060a 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template.json +++ b/schemas/latest/ide-targeted/dev-workspace-template.json @@ -220,16 +220,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -495,120 +485,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1078,16 +954,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1276,114 +1142,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1933,16 +1691,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2131,114 +1879,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -2673,16 +2313,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2871,114 +2501,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -3539,7 +3061,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3570,7 +3092,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3680,7 +3202,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3711,7 +3233,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3851,7 +3373,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3885,7 +3407,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -4019,7 +3541,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -4053,7 +3575,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", diff --git a/schemas/latest/ide-targeted/dev-workspace.json b/schemas/latest/ide-targeted/dev-workspace.json index 9d99421b9..8861962cb 100644 --- a/schemas/latest/ide-targeted/dev-workspace.json +++ b/schemas/latest/ide-targeted/dev-workspace.json @@ -233,16 +233,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -508,120 +498,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1091,16 +967,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1289,114 +1155,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1946,16 +1704,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2144,114 +1892,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -2686,16 +2326,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2884,114 +2514,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -3552,7 +3074,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3583,7 +3105,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3693,7 +3215,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3724,7 +3246,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3864,7 +3386,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3898,7 +3420,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -4032,7 +3554,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -4066,7 +3588,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", diff --git a/schemas/latest/ide-targeted/devfile.json b/schemas/latest/ide-targeted/devfile.json index eec025c0e..cb0298de5 100644 --- a/schemas/latest/ide-targeted/devfile.json +++ b/schemas/latest/ide-targeted/devfile.json @@ -25,16 +25,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -240,120 +230,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "required": [ - "kind" - ], - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -795,16 +671,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -993,114 +859,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1718,16 +1476,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -1916,114 +1664,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -2458,16 +2098,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -2656,114 +2286,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -3324,7 +2846,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3355,7 +2877,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3465,7 +2987,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -3496,7 +3018,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3612,7 +3134,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3646,7 +3168,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -3762,7 +3284,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "required": [ "remotes" @@ -3796,7 +3318,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", diff --git a/schemas/latest/ide-targeted/parent-overrides.json b/schemas/latest/ide-targeted/parent-overrides.json index 01d506955..293d94504 100644 --- a/schemas/latest/ide-targeted/parent-overrides.json +++ b/schemas/latest/ide-targeted/parent-overrides.json @@ -22,16 +22,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -220,114 +210,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -762,16 +644,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -960,114 +832,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false @@ -1606,7 +1370,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -1637,7 +1401,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", @@ -1744,7 +1508,7 @@ "markdownDescription": "Project's Git source" }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -1775,7 +1539,7 @@ } }, "additionalProperties": false, - "markdownDescription": "Project's GitHub source" + "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" }, "name": { "description": "Project name", diff --git a/schemas/latest/ide-targeted/plugin-overrides.json b/schemas/latest/ide-targeted/plugin-overrides.json index e6ce98654..5d062988e 100644 --- a/schemas/latest/ide-targeted/plugin-overrides.json +++ b/schemas/latest/ide-targeted/plugin-overrides.json @@ -22,16 +22,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -220,114 +210,6 @@ "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$", "markdownDescription": "Mandatory identifier that allows referencing this command in composite commands, from a parent, or in events." - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode launch action" - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean", - "markdownDescription": "Identifies the default command for a given group kind" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ], - "markdownDescription": "Kind of group the command is part of" - } - }, - "additionalProperties": false, - "markdownDescription": "Defines the group this command is part of" - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string", - "markdownDescription": "Inlined content of the VsCode configuration" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string", - "markdownDescription": "Location as an absolute of relative URI the VsCode configuration will be fetched from" - } - }, - "additionalProperties": false, - "markdownDescription": "Command providing the definition of a VsCode Task" } }, "additionalProperties": false diff --git a/schemas/latest/parent-overrides.json b/schemas/latest/parent-overrides.json index 75a5fccec..d0b11998d 100644 --- a/schemas/latest/parent-overrides.json +++ b/schemas/latest/parent-overrides.json @@ -21,16 +21,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -194,102 +184,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -689,16 +583,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -862,102 +746,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false @@ -1442,7 +1230,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { @@ -1563,7 +1351,7 @@ "additionalProperties": false }, "github": { - "description": "Project's GitHub source", + "description": "Project's GitHub source. Deprecated, use `Git` instead", "type": "object", "properties": { "checkoutFrom": { diff --git a/schemas/latest/plugin-overrides.json b/schemas/latest/plugin-overrides.json index 000e226bb..1315ddeaf 100644 --- a/schemas/latest/plugin-overrides.json +++ b/schemas/latest/plugin-overrides.json @@ -21,16 +21,6 @@ "apply" ] }, - { - "required": [ - "vscodeTask" - ] - }, - { - "required": [ - "vscodeLaunch" - ] - }, { "required": [ "composite" @@ -194,102 +184,6 @@ "type": "string", "maxLength": 63, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" - }, - "vscodeLaunch": { - "description": "Command providing the definition of a VsCode launch action", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false - }, - "vscodeTask": { - "description": "Command providing the definition of a VsCode Task", - "type": "object", - "oneOf": [ - { - "required": [ - "uri" - ] - }, - { - "required": [ - "inlined" - ] - } - ], - "properties": { - "group": { - "description": "Defines the group this command is part of", - "type": "object", - "properties": { - "isDefault": { - "description": "Identifies the default command for a given group kind", - "type": "boolean" - }, - "kind": { - "description": "Kind of group the command is part of", - "type": "string", - "enum": [ - "build", - "run", - "test", - "debug" - ] - } - }, - "additionalProperties": false - }, - "inlined": { - "description": "Inlined content of the VsCode configuration", - "type": "string" - }, - "uri": { - "description": "Location as an absolute of relative URI the VsCode configuration will be fetched from", - "type": "string" - } - }, - "additionalProperties": false } }, "additionalProperties": false diff --git a/test/v200/devfiles/commands/VsCodeLaunchAll.yaml b/test/v200/devfiles/commands/VsCodeLaunchAll.yaml deleted file mode 100644 index 143216342..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchAll.yaml +++ /dev/null @@ -1,27 +0,0 @@ - - id: testvscode1 - attributes: - test: Exec Test test - scope: Api - vscodeLaunch: - inlined: inline - group: - isDefault: false - kind: test - - id: testvscode12 - vscodeLaunch: - uri: http://testingland - group: - isDefault: false - kind: run - - id: testvscode13 - vscodeLaunch: - inlined: inline - group: - isDefault: true - kind: debug - - id: testvscode14 - vscodeLaunch: - uri: http://testingland - group: - isDefault: false - kind: build diff --git a/test/v200/devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml b/test/v200/devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml deleted file mode 100644 index 561067c3a..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscode - vscodeLaunch: - inlined: inline - group: - isDefault: nope - kind: test diff --git a/test/v200/devfiles/commands/VsCodeLaunchBadGroupKind.yaml b/test/v200/devfiles/commands/VsCodeLaunchBadGroupKind.yaml deleted file mode 100644 index 8371521e2..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchBadGroupKind.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscode - vscodeLaunch: - inlined: inline - group: - isDefault: false - kind: free diff --git a/test/v200/devfiles/commands/VsCodeLaunchInlinedAndUri.yaml b/test/v200/devfiles/commands/VsCodeLaunchInlinedAndUri.yaml deleted file mode 100644 index 78104f7b2..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchInlinedAndUri.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- id: testvscode1 - vscodeLaunch: - inlined: inline - uri: "http://testingland" diff --git a/test/v200/devfiles/commands/VsCodeLaunchMinimum.yaml b/test/v200/devfiles/commands/VsCodeLaunchMinimum.yaml deleted file mode 100644 index e206eb8bf..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchMinimum.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscode1 - vscodeLaunch: - uri: http://testingland -- id: testvscode2 - vscodeLaunch: - inlined: inline diff --git a/test/v200/devfiles/commands/VsCodeLaunchMissingGroupKind.yaml b/test/v200/devfiles/commands/VsCodeLaunchMissingGroupKind.yaml deleted file mode 100644 index 8371521e2..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchMissingGroupKind.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscode - vscodeLaunch: - inlined: inline - group: - isDefault: false - kind: free diff --git a/test/v200/devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml b/test/v200/devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml deleted file mode 100644 index b390f049c..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- id: testvscode - vscodeLaunch: - group: - isDefault: false - kind: test diff --git a/test/v200/devfiles/commands/VsCodeLaunchMixedCaseId.yaml b/test/v200/devfiles/commands/VsCodeLaunchMixedCaseId.yaml deleted file mode 100644 index e30d9fbe9..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchMixedCaseId.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testVscode1 - vscodeLaunch: - uri: http://testingland -- id: testvscode2 - vscodeLaunch: - inlined: inline diff --git a/test/v200/devfiles/commands/VsCodeLaunchNoId.yaml b/test/v200/devfiles/commands/VsCodeLaunchNoId.yaml deleted file mode 100644 index 9ac50f1b1..000000000 --- a/test/v200/devfiles/commands/VsCodeLaunchNoId.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- vscodeLaunch: - uri: http://testingland diff --git a/test/v200/devfiles/commands/VsCodeTaskAll.yaml b/test/v200/devfiles/commands/VsCodeTaskAll.yaml deleted file mode 100644 index 56a4fb8fa..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskAll.yaml +++ /dev/null @@ -1,27 +0,0 @@ - - id: testvscodetask1 - attributes: - test: Exec Test test - scope: Api - vscodeTask: - inlined: inline - group: - isDefault: false - kind: test - - id: testvscodetask2 - vscodeTask: - uri: http://testingland - group: - isDefault: false - kind: run - - id: testvscodetask3 - vscodeTask: - inlined: inline - group: - isDefault: true - kind: debug - - id: testvscodetask4 - vscodeTask: - uri: http://testingland - group: - isDefault: false - kind: build diff --git a/test/v200/devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml b/test/v200/devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml deleted file mode 100644 index dda1fe89a..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscodetask - vscodeTask: - inlined: inline - group: - isDefault: nada - kind: test diff --git a/test/v200/devfiles/commands/VsCodeTaskBadGroupKind.yaml b/test/v200/devfiles/commands/VsCodeTaskBadGroupKind.yaml deleted file mode 100644 index beff9744d..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskBadGroupKind.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscodetask - vscodeTask: - inlined: inline - group: - isDefault: false - kind: free diff --git a/test/v200/devfiles/commands/VsCodeTaskInlinedAndUri.yaml b/test/v200/devfiles/commands/VsCodeTaskInlinedAndUri.yaml deleted file mode 100644 index a0d154b39..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskInlinedAndUri.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- id: testvscodetask - vscodeTask: - inlined: inline - uri: "http://testingland" diff --git a/test/v200/devfiles/commands/VsCodeTaskMinimum.yaml b/test/v200/devfiles/commands/VsCodeTaskMinimum.yaml deleted file mode 100644 index a1a1bb971..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskMinimum.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscodetask1 - vscodeTask: - uri: http://testingland -- id: testvscodetask2 - vscodeTask: - inlined: inline diff --git a/test/v200/devfiles/commands/VsCodeTaskMissingGroupKind.yaml b/test/v200/devfiles/commands/VsCodeTaskMissingGroupKind.yaml deleted file mode 100644 index beff9744d..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskMissingGroupKind.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testvscodetask - vscodeTask: - inlined: inline - group: - isDefault: false - kind: free diff --git a/test/v200/devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml b/test/v200/devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml deleted file mode 100644 index 54db30021..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- id: testvscodetask - vscodeTask: - group: - isDefault: false - kind: test diff --git a/test/v200/devfiles/commands/VsCodeTaskMixedCaseId.yaml b/test/v200/devfiles/commands/VsCodeTaskMixedCaseId.yaml deleted file mode 100644 index f90cdb8b3..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskMixedCaseId.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- id: testVscodetask1 - vscodeTask: - uri: http://testingland -- id: testvscodetask2 - vscodeTask: - inlined: inline diff --git a/test/v200/devfiles/commands/VsCodeTaskNoId.yaml b/test/v200/devfiles/commands/VsCodeTaskNoId.yaml deleted file mode 100644 index dfde9c20b..000000000 --- a/test/v200/devfiles/commands/VsCodeTaskNoId.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- vscodeTask: - uri: http://testingland diff --git a/test/v200/devfiles/components/pluginAll.yaml b/test/v200/devfiles/components/pluginAll.yaml index a143b2ea0..d21608b9a 100644 --- a/test/v200/devfiles/components/pluginAll.yaml +++ b/test/v200/devfiles/components/pluginAll.yaml @@ -31,16 +31,6 @@ composite: group: kind: test - - id: "testvscodelnch" - vscodeLaunch: - uri: http://testingland - vscodeLaunch: - inlined: inline - - id: testvscodetask - vscodeTask: - uri: http://testingland - vscodeTask: - inlined: inline - name: "testpluginkube" plugin: kubernetes: diff --git a/test/v200/devfiles/parent/parentAll.yaml b/test/v200/devfiles/parent/parentAll.yaml index 78f63ca11..7f0600684 100644 --- a/test/v200/devfiles/parent/parentAll.yaml +++ b/test/v200/devfiles/parent/parentAll.yaml @@ -40,18 +40,6 @@ parent: composite: group: kind: test - - id: "testvscodeLaunch1" - vscodeLaunch: - uri: http://testingland - - id: "testvscodeLaunch2" - vscodeLaunch: - inlined: inline - - id: testvscodeTask1 - vscodeTask: - uri: http://testingland - - id: testvscodeTask1 - vscodeTask: - inlined: inline projects: - name: testProject1 git: diff --git a/test/v200/json/command-parent-tests.json b/test/v200/json/command-parent-tests.json index 8c5879bc4..5865adae5 100644 --- a/test/v200/json/command-parent-tests.json +++ b/test/v200/json/command-parent-tests.json @@ -125,124 +125,14 @@ "ExpectOutcome" : "expected boolean, but got string", "Files": [ "devfiles/commands/commandStart.yaml", "devfiles/commands/compositeBadParallel.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandAll.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchAll.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMinimum.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMinimum.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandNoId.yaml", - "ExpectOutcome" : "missing properties: \"id\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchNoId.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMixedCaseId.yaml", - "ExpectOutcome" : "does not match pattern", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMixedCaseId.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandBadGroupIsDefault.yaml", - "ExpectOutcome" : "expected boolean, but got string", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandBadGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchBadGroupKind.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMissingGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMissingGroupKind.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandInlinedAndUri.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMissingInlinedAndUri.yaml", - "ExpectOutcome" : "oneOf failed", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandAll.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskAll.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMinimum.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMinimum.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandNoId.yaml", - "ExpectOutcome" : "missing properties: \"id\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskNoId.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMixedCaseId.yaml", - "ExpectOutcome" : "does not match pattern", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMixedCaseId.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandBadGroupIsDefault.yaml", - "ExpectOutcome" : "expected boolean, but got string", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandBadGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskBadGroupKind.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMissingGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMissingGroupKind.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandInlinedAndUri.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMissingInlinedAndUri.yaml", - "ExpectOutcome" : "oneOf failed", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml"] - }, + }, { "FileName" : "commandsAll.yaml", "ExpectOutcome" : "PASS", "Files": ["devfiles/commands/commandStart.yaml", "devfiles/commands/execAll.yaml", "devfiles/commands/compositeAll.yaml", - "devfiles/commands/VsCodeTaskAll.yaml", - "devfiles/commands/applyAll.yaml", - "devfiles/commands/VsCodeLaunchAll.yaml"] + "devfiles/commands/applyAll.yaml"] } ] } diff --git a/test/v200/json/command-tests.json b/test/v200/json/command-tests.json index 00a8467a4..0459eaa0c 100644 --- a/test/v200/json/command-tests.json +++ b/test/v200/json/command-tests.json @@ -167,124 +167,14 @@ "ExpectOutcome" : "missing properties: \"kind\"", "Files": [ "devfiles/commands/commandStart.yaml", "devfiles/commands/compositeMissingGroupKind.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandAll.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchAll.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMinimum.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMinimum.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandNoId.yaml", - "ExpectOutcome" : "missing properties: \"id\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchNoId.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMixedCaseId.yaml", - "ExpectOutcome" : "does not match pattern", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMixedCaseId.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandBadGroupIsDefault.yaml", - "ExpectOutcome" : "expected boolean, but got string", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchBadGroupIsDefault.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandBadGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchBadGroupKind.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMissingGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMissingGroupKind.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandInlinedAndUri.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeLaunchCommandMissingInlinedAndUri.yaml", - "ExpectOutcome" : "oneOf failed", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeLaunchMissingInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandAll.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskAll.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMinimum.yaml", - "ExpectOutcome" : "PASS", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMinimum.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandNoId.yaml", - "ExpectOutcome" : "missing properties: \"id\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskNoId.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMixedCaseId.yaml", - "ExpectOutcome" : "does not match pattern", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMixedCaseId.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandBadGroupIsDefault.yaml", - "ExpectOutcome" : "expected boolean, but got string", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskBadGroupIsDefault.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandBadGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskBadGroupKind.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMissingGroupKind.yaml", - "ExpectOutcome" : "value must be one of \"build\", \"run\", \"test\", \"debug\"", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMissingGroupKind.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandInlinedAndUri.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskInlinedAndUri.yaml"] - }, - { - "FileName" : "VsCodeTaskCommandMissingInlinedAndUri.yaml", - "ExpectOutcome" : "oneOf failed", - "Files": ["devfiles/commands/commandStart.yaml", - "devfiles/commands/VsCodeTaskMissingInlinedAndUri.yaml"] - }, + }, { "FileName" : "CommandsAll.yaml", "ExpectOutcome" : "PASS", "Files": ["devfiles/commands/commandStart.yaml", "devfiles/commands/execAll.yaml", "devfiles/commands/compositeAll.yaml", - "devfiles/commands/VsCodeTaskAll.yaml", - "devfiles/commands/applyAll.yaml", - "devfiles/commands/VsCodeLaunchAll.yaml"] + "devfiles/commands/applyAll.yaml"] } ] } From 97280a9e9288c49c4e069a7f74908e799468491c Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Wed, 17 Feb 2021 15:03:44 -0500 Subject: [PATCH 2/4] Remove VSCodeTask and VSCodeLaunch from coverage in conversion tests Signed-off-by: Angel Misevski --- .../v1alpha1/attributes_conversion.go | 4 ---- .../workspaces/v1alpha1/commands_conversion.go | 10 ---------- .../workspaces/v1alpha1/conversion_test.go | 18 ++---------------- .../workspaces/v1alpha1/plugin_conversion.go | 4 ---- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/pkg/apis/workspaces/v1alpha1/attributes_conversion.go b/pkg/apis/workspaces/v1alpha1/attributes_conversion.go index 4221dc96a..505da885c 100644 --- a/pkg/apis/workspaces/v1alpha1/attributes_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/attributes_conversion.go @@ -31,10 +31,6 @@ func getCommandAttributes(command *Command) map[string]string { return command.Exec.Attributes case command.Apply != nil: return command.Apply.Attributes - case command.VscodeTask != nil: - return command.VscodeTask.Attributes - case command.VscodeLaunch != nil: - return command.VscodeLaunch.Attributes case command.Composite != nil: return command.Composite.Attributes case command.Custom != nil: diff --git a/pkg/apis/workspaces/v1alpha1/commands_conversion.go b/pkg/apis/workspaces/v1alpha1/commands_conversion.go index b60369d85..90afd7dd7 100644 --- a/pkg/apis/workspaces/v1alpha1/commands_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/commands_conversion.go @@ -27,10 +27,6 @@ func convertCommandTo_v1alpha2(src *Command, dest *v1alpha2.Command) error { srcAttributes = src.Exec.Attributes case src.Apply != nil: srcAttributes = src.Apply.Attributes - case src.VscodeTask != nil: - srcAttributes = src.VscodeTask.Attributes - case src.VscodeLaunch != nil: - srcAttributes = src.VscodeLaunch.Attributes case src.Composite != nil: srcAttributes = src.Composite.Attributes case src.Custom != nil: @@ -76,12 +72,6 @@ func convertCommandFrom_v1alpha2(src *v1alpha2.Command, dest *Command) error { case dest.Exec != nil: dest.Exec.Attributes = destAttributes dest.Exec.Id = id - case dest.VscodeLaunch != nil: - dest.VscodeLaunch.Attributes = destAttributes - dest.VscodeLaunch.Id = id - case dest.VscodeTask != nil: - dest.VscodeTask.Attributes = destAttributes - dest.VscodeTask.Id = id } return err } diff --git a/pkg/apis/workspaces/v1alpha1/conversion_test.go b/pkg/apis/workspaces/v1alpha1/conversion_test.go index 4a3181cb1..6a1b4f0d3 100644 --- a/pkg/apis/workspaces/v1alpha1/conversion_test.go +++ b/pkg/apis/workspaces/v1alpha1/conversion_test.go @@ -40,7 +40,7 @@ var componentFuzzFunc = func(component *Component, c fuzz.Continue) { } var commandFuzzFunc = func(command *Command, c fuzz.Continue) { - switch c.Intn(6) { + switch c.Intn(4) { case 0: c.Fuzz(&command.Apply) case 1: @@ -49,10 +49,6 @@ var commandFuzzFunc = func(command *Command, c fuzz.Continue) { c.Fuzz(&command.Custom) case 3: c.Fuzz(&command.Exec) - case 4: - c.Fuzz(&command.VscodeLaunch) - case 5: - c.Fuzz(&command.VscodeTask) } } @@ -130,7 +126,7 @@ var parentComponentFuzzFunc = func(component *Component, c fuzz.Continue) { var parentCommandFuzzFunc = func(command *Command, c fuzz.Continue) { // Do not generate Custom commands for Parents // Also: commands in Parents cannot have attributes. - switch c.Intn(5) { + switch c.Intn(3) { case 0: c.Fuzz(&command.Apply) if command.Apply != nil { @@ -146,16 +142,6 @@ var parentCommandFuzzFunc = func(command *Command, c fuzz.Continue) { if command.Exec != nil { command.Exec.Attributes = nil } - case 3: - c.Fuzz(&command.VscodeLaunch) - if command.VscodeLaunch != nil { - command.VscodeLaunch.Attributes = nil - } - case 4: - c.Fuzz(&command.VscodeTask) - if command.VscodeTask != nil { - command.VscodeTask.Attributes = nil - } } } diff --git a/pkg/apis/workspaces/v1alpha1/plugin_conversion.go b/pkg/apis/workspaces/v1alpha1/plugin_conversion.go index 56fc1c769..91d11c560 100644 --- a/pkg/apis/workspaces/v1alpha1/plugin_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/plugin_conversion.go @@ -138,10 +138,6 @@ func convertPluginComponentCommandFrom_v1alpha2(src *v1alpha2.CommandPluginOverr dest.Composite.Id = srcId case src.Exec != nil: dest.Exec.Id = srcId - case src.VscodeLaunch != nil: - dest.VscodeLaunch.Id = srcId - case src.VscodeTask != nil: - dest.VscodeTask.Id = srcId } return nil } From ed6d9ddd6594e0221819598c24ed8bb81c36c31b Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Wed, 17 Feb 2021 15:09:25 -0500 Subject: [PATCH 3/4] Add deprecation and removal notice to vscode tasks in v1alpha1 Signed-off-by: Angel Misevski --- ...pace.devfile.io_devworkspaces.v1beta1.yaml | 35 ++++++++++--------- crds/workspace.devfile.io_devworkspaces.yaml | 35 ++++++++++--------- ...file.io_devworkspacetemplates.v1beta1.yaml | 33 +++++++++-------- ...pace.devfile.io_devworkspacetemplates.yaml | 33 +++++++++-------- pkg/apis/workspaces/v1alpha1/commands.go | 4 +++ 5 files changed, 78 insertions(+), 62 deletions(-) diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml index 57206b610..9f9ba2404 100644 --- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml @@ -330,8 +330,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a VsCode + launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -385,8 +385,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a VsCode + Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1137,8 +1137,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri @@ -1196,8 +1197,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2055,8 +2056,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a + VsCode launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2112,8 +2113,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a + VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2885,8 +2886,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; + removed in v1alpha2" oneOf: - required: - uri @@ -2944,8 +2946,9 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml index f1119a338..6144da16d 100644 --- a/crds/workspace.devfile.io_devworkspaces.yaml +++ b/crds/workspace.devfile.io_devworkspaces.yaml @@ -326,8 +326,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a VsCode + launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -381,8 +381,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a VsCode + Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1133,8 +1133,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri @@ -1192,8 +1193,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2051,8 +2052,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a + VsCode launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2108,8 +2109,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a + VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2881,8 +2882,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; + removed in v1alpha2" oneOf: - required: - uri @@ -2940,8 +2942,9 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml index 5bd77b322..795c223f0 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml @@ -300,8 +300,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode launch - action + description: "Command providing the definition of a VsCode launch + action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -354,7 +354,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode Task + description: "Command providing the definition of a VsCode Task + \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1086,8 +1087,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a - VsCode launch action + description: "Command providing the definition of + a VsCode launch action \n Deprecated; removed in + v1alpha2" oneOf: - required: - uri @@ -1144,8 +1146,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a - VsCode Task + description: "Command providing the definition of + a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1971,8 +1973,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a VsCode + launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2026,8 +2028,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a VsCode + Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2778,8 +2780,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri @@ -2837,8 +2840,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml index 72e5400b4..e74789980 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml @@ -298,8 +298,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode launch - action + description: "Command providing the definition of a VsCode launch + action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -352,7 +352,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode Task + description: "Command providing the definition of a VsCode Task + \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1084,8 +1085,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a - VsCode launch action + description: "Command providing the definition of + a VsCode launch action \n Deprecated; removed in + v1alpha2" oneOf: - required: - uri @@ -1142,8 +1144,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a - VsCode Task + description: "Command providing the definition of + a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -1969,8 +1971,8 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition of a VsCode - launch action + description: "Command providing the definition of a VsCode + launch action \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2024,8 +2026,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition of a VsCode - Task + description: "Command providing the definition of a VsCode + Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri @@ -2776,8 +2778,9 @@ spec: - id type: object vscodeLaunch: - description: Command providing the definition - of a VsCode launch action + description: "Command providing the definition + of a VsCode launch action \n Deprecated; removed + in v1alpha2" oneOf: - required: - uri @@ -2835,8 +2838,8 @@ spec: - id type: object vscodeTask: - description: Command providing the definition - of a VsCode Task + description: "Command providing the definition + of a VsCode Task \n Deprecated; removed in v1alpha2" oneOf: - required: - uri diff --git a/pkg/apis/workspaces/v1alpha1/commands.go b/pkg/apis/workspaces/v1alpha1/commands.go index f6fba949b..c767c78e2 100644 --- a/pkg/apis/workspaces/v1alpha1/commands.go +++ b/pkg/apis/workspaces/v1alpha1/commands.go @@ -86,10 +86,14 @@ type Command struct { Apply *ApplyCommand `json:"apply,omitempty"` // Command providing the definition of a VsCode Task + // + // Deprecated; removed in v1alpha2 // +optional VscodeTask *VscodeConfigurationCommand `json:"vscodeTask,omitempty"` // Command providing the definition of a VsCode launch action + // + // Deprecated; removed in v1alpha2 // +optional VscodeLaunch *VscodeConfigurationCommand `json:"vscodeLaunch,omitempty"` From fbd873af9d5e608c4bc522e6127a40ddc0cbcf28 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Wed, 17 Feb 2021 19:24:43 -0500 Subject: [PATCH 4/4] run go fmt Signed-off-by: Stephanie --- pkg/apis/workspaces/v1alpha2/commands.go | 8 ++++---- pkg/validation/commands_test.go | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/apis/workspaces/v1alpha2/commands.go b/pkg/apis/workspaces/v1alpha2/commands.go index 67b81a2b8..7c2872c3c 100644 --- a/pkg/apis/workspaces/v1alpha2/commands.go +++ b/pkg/apis/workspaces/v1alpha2/commands.go @@ -11,10 +11,10 @@ import ( type CommandType string const ( - ExecCommandType CommandType = "Exec" - ApplyCommandType CommandType = "Apply" - CompositeCommandType CommandType = "Composite" - CustomCommandType CommandType = "Custom" + ExecCommandType CommandType = "Exec" + ApplyCommandType CommandType = "Apply" + CompositeCommandType CommandType = "Composite" + CustomCommandType CommandType = "Custom" ) // CommandGroupKind describes the kind of command group. diff --git a/pkg/validation/commands_test.go b/pkg/validation/commands_test.go index dac1dbf58..e901608c4 100644 --- a/pkg/validation/commands_test.go +++ b/pkg/validation/commands_test.go @@ -71,7 +71,6 @@ func TestValidateCommands(t *testing.T) { generateDummyContainerComponent(component, nil, nil, nil), } - duplicateKeyErr := "duplicate key: somecommand1" noDefaultCmdErr := ".*there should be exactly one default command, currently there is no default command" multipleDefaultCmdErr := ".*there should be exactly one default command, currently there is more than one default command"