rename setting section from 'tf-azure' to 'azureTerraform' (#132)
This commit is contained in:
Родитель
caf642178e
Коммит
1cf8a7f464
18
README.md
18
README.md
|
@ -69,7 +69,7 @@ In both cases the default test container is "microsoft/terraform-test" and it ca
|
|||
|
||||
### Azure Terraform: push
|
||||
|
||||
This command will sync workspace files that meet the filter `tf-azure.files` setting in your configuration to Azure clouddrive.
|
||||
This command will sync workspace files that meet the filter `azureTerraform.files` setting in your configuration to Azure clouddrive.
|
||||
|
||||
## Requirements
|
||||
|
||||
|
@ -88,14 +88,14 @@ This extension requires:
|
|||
|
||||
## Extension Settings
|
||||
|
||||
- `tf-azure` - Parent for Terraform-Azure related extension settings
|
||||
- `tf-azure.terminal` - Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`
|
||||
- `tf-azure.files` - Indicates the files that should be synchronized to Azure CloudShell using the glob pattern string, for example `**/*.{tf,txt,yml,tfvars,rb}`
|
||||
- `tf-azure.test-container` - Indicates the container to use to run the tests, for example `microsoft/terraform-test`. Private registry is not supported at this time.
|
||||
- `tf-azure.aci-name` - Indicates the name of the Azure Container Instance to use for testing. For example: `terraformtesting`
|
||||
- `tf-azure.aci-ResGroup` - Indicates the name of the Resource Group to use for the ACI instance. For example: `TerrafornTestRG`
|
||||
- `tf-azure.aci-group` - Indicates the name of the Container Group that host the ACI instance. For example: `TerrafornTesting`
|
||||
- `tf-azure.test-location` - Indicates the location where to deploy the test container instance. For example: `westus`
|
||||
- `azureTerraform` - Parent for Terraform-Azure related extension settings
|
||||
- `azureTerraform.terminal` - Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`
|
||||
- `azureTerraform.files` - Indicates the files that should be synchronized to Azure CloudShell using the glob pattern string, for example `**/*.{tf,txt,yml,tfvars,rb}`
|
||||
- `azureTerraform.test-container` - Indicates the container to use to run the tests, for example `microsoft/terraform-test`. Private registry is not supported at this time.
|
||||
- `azureTerraform.aci-name` - Indicates the name of the Azure Container Instance to use for testing. For example: `terraformtesting`
|
||||
- `azureTerraform.aci-ResGroup` - Indicates the name of the Resource Group to use for the ACI instance. For example: `TerrafornTestRG`
|
||||
- `azureTerraform.aci-group` - Indicates the name of the Container Group that host the ACI instance. For example: `TerrafornTesting`
|
||||
- `azureTerraform.test-location` - Indicates the location where to deploy the test container instance. For example: `westus`
|
||||
|
||||
## Known Issues
|
||||
|
||||
|
|
14
package.json
14
package.json
|
@ -33,37 +33,37 @@
|
|||
"configuration": {
|
||||
"title": "Azure Terraform",
|
||||
"properties": {
|
||||
"tf-azure.terminal": {
|
||||
"azureTerraform.terminal": {
|
||||
"type": "string",
|
||||
"default": "cloudshell",
|
||||
"description": "Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`"
|
||||
},
|
||||
"tf-azure.files": {
|
||||
"azureTerraform.files": {
|
||||
"type": "string",
|
||||
"default": "**/*.{rb,sh,tf,tfvars,txt,yml}",
|
||||
"description": "Indicates the files that should be synchronized to Azure Cloud Shell using the glob pattern string, for example: **/*.{tf,txt,yml,tfvars,rb}"
|
||||
},
|
||||
"tf-azure.test-container": {
|
||||
"azureTerraform.test-container": {
|
||||
"type": "string",
|
||||
"default": "microsoft/terraform-test",
|
||||
"description": "Indicates the container that you want to use to run the tests. For example: microsoft/terraform-test"
|
||||
},
|
||||
"tf-azure.aci-name": {
|
||||
"azureTerraform.aci-name": {
|
||||
"type": "string",
|
||||
"default": "terraformtesting",
|
||||
"description": "Indicates the name of the Azure Container Instance to use for testing. For example: terraformtesting"
|
||||
},
|
||||
"tf-azure.aci-ResGroup": {
|
||||
"azureTerraform.aci-ResGroup": {
|
||||
"type": "string",
|
||||
"default": "TerraformTestRG",
|
||||
"description": "Indicates the name of the Resource Group to use for the ACI instance. For example: TerrafornTestRG"
|
||||
},
|
||||
"tf-azure.aci-group": {
|
||||
"azureTerraform.aci-group": {
|
||||
"type": "string",
|
||||
"default": "TerraformTesting",
|
||||
"description": "Indicates the name of the Container Group that host the ACI instance. For example: TerrafornTesting"
|
||||
},
|
||||
"tf-azure.test-location": {
|
||||
"azureTerraform.test-location": {
|
||||
"type": "string",
|
||||
"default": "westus",
|
||||
"description": "Indicates the location where to deploy the test container instance. For example: westus"
|
||||
|
|
|
@ -48,9 +48,9 @@ export class CloudShell extends BaseShell {
|
|||
const localPath: string = path.join(workingDirectory, ".TFTesting");
|
||||
const createAciScript: string = "createacitest.sh";
|
||||
const containerCommandScript: string = "containercmd.sh";
|
||||
const resourceGroup: string = vscode.workspace.getConfiguration("tf-azure").get("aci-ResGroup");
|
||||
const aciName: string = vscode.workspace.getConfiguration("tf-azure").get("aci-name");
|
||||
const aciGroup: string = vscode.workspace.getConfiguration("tf-azure").get("aci-group");
|
||||
const resourceGroup: string = vscode.workspace.getConfiguration("azureTerraform").get("aci-ResGroup");
|
||||
const aciName: string = vscode.workspace.getConfiguration("azureTerraform").get("aci-name");
|
||||
const aciGroup: string = vscode.workspace.getConfiguration("azureTerraform").get("aci-group");
|
||||
|
||||
const TFConfiguration = escapeFile(aciConfig(
|
||||
resourceGroup,
|
||||
|
@ -58,8 +58,8 @@ export class CloudShell extends BaseShell {
|
|||
aciGroup,
|
||||
this.tfTerminal.storageAccountName,
|
||||
this.tfTerminal.fileShareName,
|
||||
vscode.workspace.getConfiguration("tf-azure").get("test-location"),
|
||||
vscode.workspace.getConfiguration("tf-azure").get("test-container"),
|
||||
vscode.workspace.getConfiguration("azureTerraform").get("test-location"),
|
||||
vscode.workspace.getConfiguration("azureTerraform").get("test-container"),
|
||||
workspaceName,
|
||||
));
|
||||
|
||||
|
|
|
@ -87,11 +87,11 @@ export function activate(ctx: vscode.ExtensionContext) {
|
|||
}));
|
||||
}
|
||||
export function terminalSetToCloudshell(): boolean {
|
||||
return (vscode.workspace.getConfiguration("tf-azure").get("terminal") === "cloudshell") as boolean;
|
||||
return (vscode.workspace.getConfiguration("azureTerraform").get("terminal") === "cloudshell") as boolean;
|
||||
}
|
||||
|
||||
export function filesGlobSetting(): vscode.GlobPattern {
|
||||
return vscode.workspace.getConfiguration("tf-azure").get("files") as vscode.GlobPattern;
|
||||
return vscode.workspace.getConfiguration("azureTerraform").get("files") as vscode.GlobPattern;
|
||||
}
|
||||
|
||||
// tslint:disable-next-line:no-empty
|
||||
|
|
|
@ -56,7 +56,7 @@ export class IntegratedShell extends BaseShell {
|
|||
if (!await isDockerInstalled()) {
|
||||
return;
|
||||
}
|
||||
const containerName: string = vscode.workspace.getConfiguration("tf-azure").get("test-container");
|
||||
const containerName: string = vscode.workspace.getConfiguration("azureTerraform").get("test-container");
|
||||
|
||||
terraformChannel.appendLine("Checking Azure Service Principal environment variables...");
|
||||
if (!isServicePrincipalSetInEnv()) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче