Reduce nesting of tasks by one level (#1346)

This is likely to help with discovery which only checks upto 1 level https://learn.microsoft.com/en-us/azure/devops/extend/develop/integrate-build-task?toc=%2Fazure%2Fdevops%2Fmarketplace-extensibility%2Ftoc.json&view=azure-devops#multiple-versions-layout
tinglesoftware · Sep 22, 2024 · 0456da7 · 0456da7
1 parent 936210b
commit 0456da7
Show file tree

Hide file tree

Showing 47 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/extension.yml b/.github/workflows/extension.yml
@@ -83,12 +83,12 @@ jobs:
 
       - name: Update version numbers in task.json
         run: |
-          echo "`jq '.version.Major=1' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json
-          echo "`jq '.version.Minor=34' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json
-          echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json
-          echo "`jq '.version.Major=${{ steps.gitversion.outputs.major }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json
-          echo "`jq '.version.Minor=${{ steps.gitversion.outputs.minor }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json
-          echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json
+          echo "`jq '.version.Major=1' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json
+          echo "`jq '.version.Minor=34' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json
+          echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json
+          echo "`jq '.version.Major=${{ steps.gitversion.outputs.major }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json
+          echo "`jq '.version.Minor=${{ steps.gitversion.outputs.minor }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json
+          echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json
 
       - name: Create Extension (dev)
         run: >

diff --git a/extension/package.json b/extension/package.json
@@ -4,11 +4,11 @@
   "description": "Dependabot Azure DevOps task",
   "main": "''",
   "scripts": {
-    "postdependencies": "cp -r node_modules tasks/dependabot/dependabotV1/node_modules && cp -r node_modules tasks/dependabot/dependabotV2/node_modules",
+    "postdependencies": "cp -r node_modules tasks/dependabotV1/node_modules && cp -r node_modules tasks/dependabotV2/node_modules",
     "build": "tsc -p .",
     "start": "npm run start:V2",
-    "start:V1": "node tasks/dependabot/dependabotV1/index.js",
-    "start:V2": "node tasks/dependabot/dependabotV2/index.js",
+    "start:V1": "node tasks/dependabotV1/index.js",
+    "start:V2": "node tasks/dependabotV2/index.js",
     "test": "jest",
     "package": "npx tfx-cli extension create --json5"
   },

diff --git a/...on/tasks/dependabot/dependabotV1/icon.png → extension/tasks/dependabotV1/icon.png b/...on/tasks/dependabot/dependabotV1/icon.png → extension/tasks/dependabotV1/icon.png
diff --git a/...on/tasks/dependabot/dependabotV1/index.ts → extension/tasks/dependabotV1/index.ts b/...on/tasks/dependabot/dependabotV1/index.ts → extension/tasks/dependabotV1/index.ts
diff --git a/...n/tasks/dependabot/dependabotV1/task.json → extension/tasks/dependabotV1/task.json b/...n/tasks/dependabot/dependabotV1/task.json → extension/tasks/dependabotV1/task.json
diff --git a/...t/dependabotV1/utils/IDependabotConfig.ts → ...s/dependabotV1/utils/IDependabotConfig.ts b/...t/dependabotV1/utils/IDependabotConfig.ts → ...s/dependabotV1/utils/IDependabotConfig.ts
diff --git a/...ndabotV1/utils/convertPlaceholder.test.ts → ...ndabotV1/utils/convertPlaceholder.test.ts b/...ndabotV1/utils/convertPlaceholder.test.ts → ...ndabotV1/utils/convertPlaceholder.test.ts
diff --git a/.../dependabotV1/utils/convertPlaceholder.ts → .../dependabotV1/utils/convertPlaceholder.ts b/.../dependabotV1/utils/convertPlaceholder.ts → .../dependabotV1/utils/convertPlaceholder.ts
diff --git a/...ependabotV1/utils/extractHostname.test.ts → ...ependabotV1/utils/extractHostname.test.ts b/...ependabotV1/utils/extractHostname.test.ts → ...ependabotV1/utils/extractHostname.test.ts
diff --git a/...bot/dependabotV1/utils/extractHostname.ts → ...sks/dependabotV1/utils/extractHostname.ts b/...bot/dependabotV1/utils/extractHostname.ts → ...sks/dependabotV1/utils/extractHostname.ts
diff --git a/...dabotV1/utils/extractOrganization.test.ts → ...dabotV1/utils/extractOrganization.test.ts b/...dabotV1/utils/extractOrganization.test.ts → ...dabotV1/utils/extractOrganization.test.ts
diff --git a/...dependabotV1/utils/extractOrganization.ts → ...dependabotV1/utils/extractOrganization.ts b/...dependabotV1/utils/extractOrganization.ts → ...dependabotV1/utils/extractOrganization.ts
diff --git a/...tV1/utils/extractVirtualDirectory.test.ts → ...tV1/utils/extractVirtualDirectory.test.ts b/...tV1/utils/extractVirtualDirectory.test.ts → ...tV1/utils/extractVirtualDirectory.test.ts
diff --git a/...ndabotV1/utils/extractVirtualDirectory.ts → ...ndabotV1/utils/extractVirtualDirectory.ts b/...ndabotV1/utils/extractVirtualDirectory.ts → ...ndabotV1/utils/extractVirtualDirectory.ts
diff --git a/...abotV1/utils/getAzureDevOpsAccessToken.ts → ...abotV1/utils/getAzureDevOpsAccessToken.ts b/...abotV1/utils/getAzureDevOpsAccessToken.ts → ...abotV1/utils/getAzureDevOpsAccessToken.ts
diff --git a/...t/dependabotV1/utils/getDockerImageTag.ts → ...s/dependabotV1/utils/getDockerImageTag.ts b/...t/dependabotV1/utils/getDockerImageTag.ts → ...s/dependabotV1/utils/getDockerImageTag.ts
diff --git a/...ependabotV1/utils/getGithubAccessToken.ts → ...ependabotV1/utils/getGithubAccessToken.ts b/...ependabotV1/utils/getGithubAccessToken.ts → ...ependabotV1/utils/getGithubAccessToken.ts
diff --git a/.../dependabotV1/utils/getSharedVariables.ts → .../dependabotV1/utils/getSharedVariables.ts b/.../dependabotV1/utils/getSharedVariables.ts → .../dependabotV1/utils/getSharedVariables.ts
diff --git a/...ependabotV1/utils/parseConfigFile.test.ts → ...ependabotV1/utils/parseConfigFile.test.ts b/...ependabotV1/utils/parseConfigFile.test.ts → ...ependabotV1/utils/parseConfigFile.test.ts
diff --git a/...bot/dependabotV1/utils/parseConfigFile.ts → ...sks/dependabotV1/utils/parseConfigFile.ts b/...bot/dependabotV1/utils/parseConfigFile.ts → ...sks/dependabotV1/utils/parseConfigFile.ts
diff --git a/...tils/resolveAzureDevOpsIdentities.test.ts → ...tils/resolveAzureDevOpsIdentities.test.ts b/...tils/resolveAzureDevOpsIdentities.test.ts → ...tils/resolveAzureDevOpsIdentities.test.ts
diff --git a/...tV1/utils/resolveAzureDevOpsIdentities.ts → ...tV1/utils/resolveAzureDevOpsIdentities.ts b/...tV1/utils/resolveAzureDevOpsIdentities.ts → ...tV1/utils/resolveAzureDevOpsIdentities.ts
diff --git a/...on/tasks/dependabot/dependabotV2/icon.png → extension/tasks/dependabotV2/icon.png b/...on/tasks/dependabot/dependabotV2/icon.png → extension/tasks/dependabotV2/icon.png
diff --git a/...on/tasks/dependabot/dependabotV2/index.ts → extension/tasks/dependabotV2/index.ts b/...on/tasks/dependabot/dependabotV2/index.ts → extension/tasks/dependabotV2/index.ts
diff --git a/...n/tasks/dependabot/dependabotV2/task.json → extension/tasks/dependabotV2/task.json b/...n/tasks/dependabot/dependabotV2/task.json → extension/tasks/dependabotV2/task.json
diff --git a/...s/azure-devops/AzureDevOpsWebApiClient.ts → ...s/azure-devops/AzureDevOpsWebApiClient.ts b/...s/azure-devops/AzureDevOpsWebApiClient.ts → ...s/azure-devops/AzureDevOpsWebApiClient.ts
diff --git a/...ls/azure-devops/interfaces/IFileChange.ts → ...ls/azure-devops/interfaces/IFileChange.ts b/...ls/azure-devops/interfaces/IFileChange.ts → ...ls/azure-devops/interfaces/IFileChange.ts
diff --git a/...s/azure-devops/interfaces/IPullRequest.ts → ...s/azure-devops/interfaces/IPullRequest.ts b/...s/azure-devops/interfaces/IPullRequest.ts → ...s/azure-devops/interfaces/IPullRequest.ts
diff --git a/...vops/interfaces/IPullRequestProperties.ts → ...vops/interfaces/IPullRequestProperties.ts b/...vops/interfaces/IPullRequestProperties.ts → ...vops/interfaces/IPullRequestProperties.ts
diff --git a/...re-devops/resolveAzureDevOpsIdentities.ts → ...re-devops/resolveAzureDevOpsIdentities.ts b/...re-devops/resolveAzureDevOpsIdentities.ts → ...re-devops/resolveAzureDevOpsIdentities.ts
diff --git a/.../dependabotV2/utils/convertPlaceholder.ts → .../dependabotV2/utils/convertPlaceholder.ts b/.../dependabotV2/utils/convertPlaceholder.ts → .../dependabotV2/utils/convertPlaceholder.ts
diff --git a/...tV2/utils/dependabot-cli/DependabotCli.ts → ...tV2/utils/dependabot-cli/DependabotCli.ts b/...tV2/utils/dependabot-cli/DependabotCli.ts → ...tV2/utils/dependabot-cli/DependabotCli.ts
diff --git a/...ls/dependabot-cli/DependabotJobBuilder.ts → ...ls/dependabot-cli/DependabotJobBuilder.ts b/...ls/dependabot-cli/DependabotJobBuilder.ts → ...ls/dependabot-cli/DependabotJobBuilder.ts
diff --git a/...pendabot-cli/DependabotOutputProcessor.ts → ...pendabot-cli/DependabotOutputProcessor.ts b/...pendabot-cli/DependabotOutputProcessor.ts → ...pendabot-cli/DependabotOutputProcessor.ts
diff --git a/.../interfaces/IDependabotUpdateJobConfig.ts → .../interfaces/IDependabotUpdateJobConfig.ts b/.../interfaces/IDependabotUpdateJobConfig.ts → .../interfaces/IDependabotUpdateJobConfig.ts
diff --git a/.../interfaces/IDependabotUpdateOperation.ts → .../interfaces/IDependabotUpdateOperation.ts b/.../interfaces/IDependabotUpdateOperation.ts → .../interfaces/IDependabotUpdateOperation.ts
diff --git a/...faces/IDependabotUpdateOperationResult.ts → ...faces/IDependabotUpdateOperationResult.ts b/...faces/IDependabotUpdateOperationResult.ts → ...faces/IDependabotUpdateOperationResult.ts
diff --git a/...faces/IDependabotUpdateOutputProcessor.ts → ...faces/IDependabotUpdateOutputProcessor.ts b/...faces/IDependabotUpdateOutputProcessor.ts → ...faces/IDependabotUpdateOutputProcessor.ts
diff --git a/...ependabot/interfaces/IDependabotConfig.ts → ...ependabot/interfaces/IDependabotConfig.ts b/...ependabot/interfaces/IDependabotConfig.ts → ...ependabot/interfaces/IDependabotConfig.ts
diff --git a/...botV2/utils/dependabot/parseConfigFile.ts → ...botV2/utils/dependabot/parseConfigFile.ts b/...botV2/utils/dependabot/parseConfigFile.ts → ...botV2/utils/dependabot/parseConfigFile.ts
diff --git a/...bot/dependabotV2/utils/extractHostname.ts → ...sks/dependabotV2/utils/extractHostname.ts b/...bot/dependabotV2/utils/extractHostname.ts → ...sks/dependabotV2/utils/extractHostname.ts
diff --git a/...dependabotV2/utils/extractOrganization.ts → ...dependabotV2/utils/extractOrganization.ts b/...dependabotV2/utils/extractOrganization.ts → ...dependabotV2/utils/extractOrganization.ts
diff --git a/...ndabotV2/utils/extractVirtualDirectory.ts → ...ndabotV2/utils/extractVirtualDirectory.ts b/...ndabotV2/utils/extractVirtualDirectory.ts → ...ndabotV2/utils/extractVirtualDirectory.ts
diff --git a/...abotV2/utils/getAzureDevOpsAccessToken.ts → ...abotV2/utils/getAzureDevOpsAccessToken.ts b/...abotV2/utils/getAzureDevOpsAccessToken.ts → ...abotV2/utils/getAzureDevOpsAccessToken.ts
diff --git a/...ependabotV2/utils/getGithubAccessToken.ts → ...ependabotV2/utils/getGithubAccessToken.ts b/...ependabotV2/utils/getGithubAccessToken.ts → ...ependabotV2/utils/getGithubAccessToken.ts
diff --git a/.../dependabotV2/utils/getSharedVariables.ts → .../dependabotV2/utils/getSharedVariables.ts b/.../dependabotV2/utils/getSharedVariables.ts → .../dependabotV2/utils/getSharedVariables.ts
diff --git a/extension/vss-extension.json b/extension/vss-extension.json
@@ -45,7 +45,7 @@
       "type": "ms.vss-distributed-task.task",
       "targets": ["ms.vss-distributed-task.tasks"],
       "properties": {
-        "name": "tasks/dependabot"
+        "name": "tasks"
       }
     }
   ]