V7 release prep (#296)

* Fix imports in the task * Change the default docker tag to from 0.6 to 0.7
tinglesoftware · Jun 16, 2022 · 47e9574 · 47e9574
1 parent 29c6636
commit 47e9574
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 17 deletions.
diff --git a/src/extension/task/index.ts b/src/extension/task/index.ts
@@ -1,5 +1,5 @@
-import tl = require("azure-pipelines-task-lib/task");
-import tr = require("azure-pipelines-task-lib/toolrunner");
+import * as tl from "azure-pipelines-task-lib/task"
+import { ToolRunner } from "azure-pipelines-task-lib/toolrunner"
 import { IDependabotUpdate } from "./models/IDependabotUpdate";
 import getConfigFromInputs from "./utils/getConfigFromInputs";
 import getSharedVariables from "./utils/getSharedVariables";
@@ -22,7 +22,7 @@ async function run() {
     // For each update run docker container
     for (const update of updates) {
       // Prepare the docker task
-      let dockerRunner: tr.ToolRunner = tl.tool(tl.which("docker", true));
+      let dockerRunner: ToolRunner = tl.tool(tl.which("docker", true));
       dockerRunner.arg(["run"]); // run command
       dockerRunner.arg(["--rm"]); // remove after execution
       dockerRunner.arg(["-i"]); // attach pseudo tty

diff --git a/src/extension/task/task.json b/src/extension/task/task.json
@@ -254,7 +254,7 @@
       "groupName": "advanced",
       "label": "Tag of the docker image to be pulled.",
       "required": false,
-      "defaultValue": "0.6",
+      "defaultValue": "0.7",
       "helpMarkDown": "The image tag to use when pulling the docker container used by the task. A tag also defines the version. By default, the task decides which tag/version to use. This can be the latest or most stable version. You can also use `major.minor` format to get the latest patch"
     },
     {

diff --git a/src/extension/task/utils/extractOrganization.ts b/src/extension/task/utils/extractOrganization.ts
@@ -1,4 +1,4 @@
-import { setResult, TaskResult } from "azure-pipelines-task-lib";
+import { setResult, TaskResult } from "azure-pipelines-task-lib/task";
 
 /**
  * Extract organization name from organization URL

diff --git a/src/extension/task/utils/getAzureDevOpsAccessToken.ts b/src/extension/task/utils/getAzureDevOpsAccessToken.ts
@@ -2,7 +2,7 @@ import {
   debug,
   getEndpointAuthorizationParameter,
   getInput,
-} from "azure-pipelines-task-lib";
+} from "azure-pipelines-task-lib/task";
 
 /**
  * Prepare the access token for Azure DevOps Repos.
@@ -15,9 +15,7 @@ import {
 export default function getAzureDevOpsAccessToken() {
   let systemAccessToken: string = getInput("azureDevOpsAccessToken");
   if (!systemAccessToken) {
-    debug(
-      "No custom token provided. The SystemVssConnection's AccessToken shall be used."
-    );
+    debug("No custom token provided. The SystemVssConnection's AccessToken shall be used.");
     systemAccessToken = getEndpointAuthorizationParameter(
       "SystemVssConnection",
       "AccessToken",

diff --git a/src/extension/task/utils/getConfigFromInputs.ts b/src/extension/task/utils/getConfigFromInputs.ts
@@ -1,4 +1,4 @@
-import { getInput, getVariable } from "azure-pipelines-task-lib";
+import { getInput } from "azure-pipelines-task-lib/task";
 import { IDependabotUpdate } from "../models/IDependabotUpdate";
 
 /**

diff --git a/src/extension/task/utils/getGithubAccessToken.ts b/src/extension/task/utils/getGithubAccessToken.ts
@@ -3,7 +3,7 @@ import {
   getEndpointAuthorization,
   getInput,
   loc,
-} from "azure-pipelines-task-lib";
+} from "azure-pipelines-task-lib/task";
 
 /**
  * Extract access token from Github endpoint

diff --git a/src/extension/task/utils/getSharedVariables.ts b/src/extension/task/utils/getSharedVariables.ts
@@ -3,7 +3,7 @@ import {
   getBoolInput,
   getInput,
   getDelimitedInput,
-} from "azure-pipelines-task-lib";
+} from "azure-pipelines-task-lib/task";
 import extractHostname from "./extractHostname";
 import extractOrganization from "./extractOrganization";
 import extractVirtualDirectory from "./extractVirtualDirectory";

diff --git a/src/extension/task/utils/getTargetRepository.ts b/src/extension/task/utils/getTargetRepository.ts
@@ -1,4 +1,4 @@
-import { debug, getInput, getVariable } from "azure-pipelines-task-lib";
+import { debug, getInput, getVariable } from "azure-pipelines-task-lib/task";
 
 /**
  * Extract the target repository from the `targetRepositoryName` input
@@ -13,9 +13,7 @@ export default function getTargetRepository() {
   // Prepare the repository
   let repository: string = getInput("targetRepositoryName");
   if (!repository) {
-    debug(
-      "No custom repository provided. The Pipeline Repository Name shall be used."
-    );
+    debug("No custom repository provided. The Pipeline Repository Name shall be used.");
     repository = getVariable("Build.Repository.Name");
   }
 

diff --git a/src/extension/task/utils/parseConfigFile.ts b/src/extension/task/utils/parseConfigFile.ts
@@ -2,7 +2,7 @@ import { IDependabotUpdate } from "../models/IDependabotUpdate";
 import { load } from "js-yaml";
 import * as fs from "fs";
 import * as path from "path";
-import { getVariable } from "azure-pipelines-task-lib";
+import { getVariable } from "azure-pipelines-task-lib/task";
 
 /**
  * Parse the dependabot config YAML file to specify update(s) configuration