Support SWA Access Token (#20501)

* Update resources.resjson * Update index.ts * Update task.json * Update task.loc.json * Update task.json * Update task.loc.json * Update task.json * Update task.loc.json * fixed generated file issue * fix task.loc.json * add new env vars
microsoft · Oct 3, 2024 · 0e0fb37 · 0e0fb37
1 parent c647485
commit 0e0fb37
Show file tree

Hide file tree

Showing 18 changed files with 241 additions and 109 deletions.
diff --git a/Tasks/AzureStaticWebAppV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureStaticWebAppV0/Strings/resources.resjson/en-US/resources.resjson
@@ -36,5 +36,9 @@
  "loc.input.label.production_branch": "Production Branch",
  "loc.input.help.production_branch": "Production branch. When specified and Deployment Environment is empty, deployments from other branches will be preview environments",
  "loc.input.label.data_api_location": "Data api location",
- "loc.input.help.data_api_location": "Directory location of the Data API source files relative to working directory"
-}
+ "loc.input.help.data_api_location": "Directory location of the Data API source files relative to working directory",
+ "loc.input.label.azure_access_token": "Azure Access Token",
+ "loc.input.help.azure_access_token": "Access token used to authenticate and authorize the deployment",
+ "loc.input.label.default_hostname": "Default Hostname",
+ "loc.input.help.default_hostname": "Default Hostname of the app"
+}
diff --git a/Tasks/AzureStaticWebAppV0/envVarDenylist.json b/Tasks/AzureStaticWebAppV0/envVarDenylist.json
@@ -34,5 +34,7 @@
  "ROUTES_LOCATION",
  "ORIGINAL_PATH",
  "DEPLOYMENT_ACTION",
- "NUGET_PACKAGES"
+ "NUGET_PACKAGES",
+ "AZURE_ACCESS_TOKEN",
+ "DEFAULT_HOSTNAME"
 ]
diff --git a/Tasks/AzureStaticWebAppV0/index.ts b/Tasks/AzureStaticWebAppV0/index.ts
@@ -12,6 +12,8 @@ const routesLocationInputName = 'routes_location';
 const buildTimeoutInMinutesInputName = 'build_timeout_in_minutes';
 const configFileLocationInputName = 'config_file_location';
 const apiTokenInputName = 'azure_static_web_apps_api_token';
+const accessTokenInputName = 'azure_access_token';
+const defaultHostnameInputName = 'default_hostname';
 const deploymentEnvironmentInputName = 'deployment_environment';
 const productionBranchInputName = 'production_branch';
 const dataApiLocationInputName = 'data_api_location';
@@ -87,7 +89,9 @@ async function createDockerEnvVarFile(envVarFilePath: string) {
  const skipApiBuild: boolean = tl.getBoolInput('skip_api_build', false);
  const isStaticExport: boolean = tl.getBoolInput('is_static_export', false);
  const apiToken: string = process.env[apiTokenInputName] || tl.getInput(apiTokenInputName, false) || "";
-
+ const accessToken: string = process.env[accessTokenInputName] || tl.getInput(accessTokenInputName, false) || "";
+ const defaultHostname: string = process.env[defaultHostnameInputName] || tl.getInput(defaultHostnameInputName, false) || "";
+
  const systemVerbose = getNullableBooleanFromString(process.env['SYSTEM_DEBUG']);
  const inputVerbose = getNullableBooleanFromString(tl.getInput('verbose', false));
 
@@ -114,7 +118,9 @@ async function createDockerEnvVarFile(envVarFilePath: string) {
  addSystemVariableToString("VERBOSE", verbose.toString());
 
  addInputStringToString("DEPLOYMENT_TOKEN", apiToken, apiTokenInputName);
-
+ addInputStringToString("AZURE_ACCESS_TOKEN", accessToken, accessTokenInputName);
+ addInputStringToString("DEFAULT_HOSTNAME", defaultHostname, defaultHostnameInputName);
+
  process.env['SWA_DEPLOYMENT_CLIENT'] = deploymentClient;
  process.env['SWA_WORKING_DIR'] = workingDirectory;
  process.env['SWA_WORKSPACE_DIR'] = containerWorkingDir;

diff --git a/Tasks/AzureStaticWebAppV0/package-lock.json b/Tasks/AzureStaticWebAppV0/package-lock.json
diff --git a/Tasks/AzureStaticWebAppV0/task.json b/Tasks/AzureStaticWebAppV0/task.json
@@ -14,7 +14,7 @@
  "demands": [],
  "version": {
  "Major": 0,
- "Minor": 246,
+ "Minor": 247,
  "Patch": 0
  },
  "preview": true,
@@ -160,6 +160,22 @@
  "defaultValue": "",
  "required": false,
  "helpMarkDown": "Directory location of the Data API source files relative to working directory"
+ },
+ {
+ "name": "azure_access_token",
+ "type": "string",
+ "label": "Azure Access Token",
+ "defaultValue": "",
+ "required": false,
+ "helpMarkDown": "Access Token used for deployment. Not required if passed as a variable"
+ },
+ {
+ "name": "default_hostname",
+ "type": "string",
+ "label": "Default Hostname",
+ "defaultValue": "",
+ "required": false,
+ "helpMarkDown": "Default hostname for deployment. Not required if passed as an environment variable"
  }
  ],
  "execution": {
@@ -172,4 +188,4 @@
  "argumentFormat": ""
  }
  }
-}
+}
diff --git a/Tasks/AzureStaticWebAppV0/task.loc.json b/Tasks/AzureStaticWebAppV0/task.loc.json
@@ -14,7 +14,7 @@
  "demands": [],
  "version": {
  "Major": 0,
- "Minor": 246,
+ "Minor": 247,
  "Patch": 0
  },
  "preview": true,
@@ -160,6 +160,22 @@
  "defaultValue": "",
  "required": false,
  "helpMarkDown": "ms-resource:loc.input.help.data_api_location"
+ },
+ {
+ "name": "azure_access_token",
+ "type": "string",
+ "label": "ms-resource:loc.input.label.azure_access_token",
+ "defaultValue": "",
+ "required": false,
+ "helpMarkDown": "ms-resource:loc.input.help.azure_access_token"
+ },
+ {
+ "name": "default_hostname",
+ "type": "string",
+ "label": "ms-resource:loc.input.label.default_hostname",
+ "defaultValue": "",
+ "required": false,
+ "helpMarkDown": "ms-resource:loc.input.help.default_hostname"
  }
  ],
  "execution": {
@@ -172,4 +188,4 @@
  "argumentFormat": ""
  }
  }
-}
+}
diff --git a/_generated/AzureStaticWebAppV0.versionmap.txt b/_generated/AzureStaticWebAppV0.versionmap.txt
@@ -1,2 +1,2 @@
-Default|0.246.0
-Node20_229_8|0.246.1
+Default|0.247.0
+Node20_229_8|0.247.1
diff --git a/_generated/AzureStaticWebAppV0/Strings/resources.resjson/en-US/resources.resjson b/_generated/AzureStaticWebAppV0/Strings/resources.resjson/en-US/resources.resjson
@@ -36,5 +36,9 @@
  "loc.input.label.production_branch": "Production Branch",
  "loc.input.help.production_branch": "Production branch. When specified and Deployment Environment is empty, deployments from other branches will be preview environments",
  "loc.input.label.data_api_location": "Data api location",
- "loc.input.help.data_api_location": "Directory location of the Data API source files relative to working directory"
+ "loc.input.help.data_api_location": "Directory location of the Data API source files relative to working directory",
+ "loc.input.label.azure_access_token": "Azure Access Token",
+ "loc.input.help.azure_access_token": "Access Token used for deployment. Not required if passed as a variable",
+ "loc.input.label.default_hostname": "Default Hostname",
+ "loc.input.help.default_hostname": "Default hostname for deployment. Not required if passed as an environment variable"
 }
diff --git a/_generated/AzureStaticWebAppV0/envVarDenylist.json b/_generated/AzureStaticWebAppV0/envVarDenylist.json
@@ -34,5 +34,7 @@
  "ROUTES_LOCATION",
  "ORIGINAL_PATH",
  "DEPLOYMENT_ACTION",
- "NUGET_PACKAGES"
+ "NUGET_PACKAGES",
+ "AZURE_ACCESS_TOKEN",
+ "DEFAULT_HOSTNAME"
 ]
diff --git a/_generated/AzureStaticWebAppV0/index.ts b/_generated/AzureStaticWebAppV0/index.ts
@@ -12,6 +12,8 @@ const routesLocationInputName = 'routes_location';
 const buildTimeoutInMinutesInputName = 'build_timeout_in_minutes';
 const configFileLocationInputName = 'config_file_location';
 const apiTokenInputName = 'azure_static_web_apps_api_token';
+const accessTokenInputName = 'azure_access_token';
+const defaultHostnameInputName = 'default_hostname';
 const deploymentEnvironmentInputName = 'deployment_environment';
 const productionBranchInputName = 'production_branch';
 const dataApiLocationInputName = 'data_api_location';
@@ -87,7 +89,9 @@ async function createDockerEnvVarFile(envVarFilePath: string) {
  const skipApiBuild: boolean = tl.getBoolInput('skip_api_build', false);
  const isStaticExport: boolean = tl.getBoolInput('is_static_export', false);
  const apiToken: string = process.env[apiTokenInputName] || tl.getInput(apiTokenInputName, false) || "";
-
+ const accessToken: string = process.env[accessTokenInputName] || tl.getInput(accessTokenInputName, false) || "";
+ const defaultHostname: string = process.env[defaultHostnameInputName] || tl.getInput(defaultHostnameInputName, false) || "";
+
  const systemVerbose = getNullableBooleanFromString(process.env['SYSTEM_DEBUG']);
  const inputVerbose = getNullableBooleanFromString(tl.getInput('verbose', false));
 
@@ -114,7 +118,9 @@ async function createDockerEnvVarFile(envVarFilePath: string) {
  addSystemVariableToString("VERBOSE", verbose.toString());
 
  addInputStringToString("DEPLOYMENT_TOKEN", apiToken, apiTokenInputName);
-
+ addInputStringToString("AZURE_ACCESS_TOKEN", accessToken, accessTokenInputName);
+ addInputStringToString("DEFAULT_HOSTNAME", defaultHostname, defaultHostnameInputName);
+
  process.env['SWA_DEPLOYMENT_CLIENT'] = deploymentClient;
  process.env['SWA_WORKING_DIR'] = workingDirectory;
  process.env['SWA_WORKSPACE_DIR'] = containerWorkingDir;

diff --git a/_generated/AzureStaticWebAppV0/package-lock.json b/_generated/AzureStaticWebAppV0/package-lock.json