Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make terraform non alpha #2796

Merged
merged 9 commits into from
Sep 28, 2023
Merged

make terraform non alpha #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0df438
make terraform non alpha
vhvb1989 Sep 27, 2023
db0c1da
squemas
vhvb1989 Sep 27, 2023
8b5a010
Merge branch 'main' of github.com:Azure/azure-dev into make-terraform…
vhvb1989 Sep 27, 2023
17825f5
Merge branch 'main' of github.com:Azure/azure-dev into make-terraform…
vhvb1989 Sep 27, 2023
d63e482
Merge branch 'main' of github.com:Azure/azure-dev into make-terraform…
vhvb1989 Sep 28, 2023
d5f19d5
missing pipeline
vhvb1989 Sep 28, 2023
621eb91
cl
vhvb1989 Sep 28, 2023
e12e471
revert change to alpha schema
vhvb1989 Sep 28, 2023
1a3ab6e
Merge branch 'main' of github.com:Azure/azure-dev into make-terraform…
vhvb1989 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions cli/azd/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

### Other Changes

- [[#2796]](https://github.com/Azure/azure-dev/pull/2796) Update `terraform` provider from alpha to beta.

## 1.3.1 (2023-09-20)

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/docs/feature-stages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ As of `0.8.0-beta.1`, each Azure Developer CLI feature has been evaluated and as
| CI/CD | GitHub Actions | Stable |
| CI/CD | Azure Pipelines | Stable |
| IaC | Bicep | Stable |
| IaC | Terraform | Alpha |
| IaC | Terraform | Beta |
| IaC | Resource Group-Scope Deployments | Alpha |
| Host | Azure App Service | Stable |
| Host | Azure Static Web Apps | Stable |
Expand Down
2 changes: 0 additions & 2 deletions cli/azd/resources/alpha_features.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
- id: terraform
description: "Provision Azure resources from terraform files."
vhvb1989 marked this conversation as resolved.
Show resolved Hide resolved
- id: resourceGroupDeployments
description: "Support infrastructure deployments at resource group scope."
- id: buildpacks
Expand Down
3 changes: 2 additions & 1 deletion schemas/v1.0/azure.yaml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"title": "Type of infrastructure provisioning provider",
"description": "Optional. The infrastructure provisioning provider used to provision the Azure resources for the application. (Default: bicep)",
"enum": [
"bicep"
"bicep",
"terraform"
]
},
"path": {
Expand Down
4 changes: 0 additions & 4 deletions templates/common/.azdo/pipelines/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ steps:
env:
AZURE_CREDENTIALS: $(AZURE_CREDENTIALS)

- pwsh: |
azd config set alpha.terraform on
displayName: Enable terraform alpha feature from azd

- task: AzureCLI@2
displayName: Provision Infrastructure
inputs:
Expand Down
4 changes: 0 additions & 4 deletions templates/common/.azdo/pipelines/terraform/java/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ steps:
env:
AZURE_CREDENTIALS: $(AZURE_CREDENTIALS)

- pwsh: |
azd config set alpha.terraform on
displayName: Enable terraform alpha feature from azd

- task: JavaToolInstaller@0
inputs:
versionSpec: '17'
Expand Down
3 changes: 0 additions & 3 deletions templates/common/.github/workflows/java/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ jobs:
env:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}

- name: Enable terraform alpha feature
run: azd config set alpha.terraform on

- name: Provision Infrastructure
run: azd provision --no-prompt
env:
Expand Down
3 changes: 0 additions & 3 deletions templates/common/.github/workflows/nodejs/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ jobs:
env:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}

- name: Enable terraform alpha feature
run: azd config set alpha.terraform on

- name: Provision Infrastructure
run: azd provision --no-prompt
env:
Expand Down
3 changes: 0 additions & 3 deletions templates/common/.github/workflows/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ jobs:
env:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}

- name: Enable terraform alpha feature
run: azd config set alpha.terraform on

- name: Provision Infrastructure
run: azd provision --no-prompt
env:
Expand Down
2 changes: 0 additions & 2 deletions templates/starter/terraform/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

A starter blueprint for getting your application up on Azure using [Azure Developer CLI](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/overview) (azd). Add your application code, write Infrastructure as Code assets in Terraform to get your application up and running quickly.

> Note: Terraform is in **alpha mode**. You need to enable it by running `azd config set alpha.terraform on`. Read more about [alpha features](https://github.com/Azure/azure-dev/tree/main/cli/azd/docs).

The following assets have been provided:

- Infrastructure-as-code (IaC) Terraform modules under the `infra` directory that demonstrate how to provision resources and setup resource tagging for azd.
Expand Down
2 changes: 0 additions & 2 deletions templates/todo/projects/java-postgresql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ The following prerequisites are required to use this application. Please ensure
- [Terraform](https://www.terraform.io/)
- Requires the [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli)

> Note: Terraform is in **alpha mode**. You need to enable it by running `azd config set alpha.terraform on`. Read more about [alpha features](https://github.com/Azure/azure-dev/tree/main/cli/azd/docs).

### Quickstart
To learn how to get started with any template, follow the steps in [this quickstart](https://learn.microsoft.com/azure/developer/azure-developer-cli/get-started?tabs=localinstall&pivots=programming-language-java) with this template (`Azure-Samples/todo-java-postgresql-terraform`).

Expand Down
2 changes: 0 additions & 2 deletions templates/todo/projects/nodejs-mongo/.repo/terraform/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ The following prerequisites are required to use this application. Please ensure
- [Terraform CLI](https://aka.ms/azure-dev/terraform-install)
- Requires the [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli)

> Note: Terraform is in **alpha mode**. You need to enable it by running `azd config set alpha.terraform on`. Read more about [alpha features](https://github.com/Azure/azure-dev/tree/main/cli/azd/docs).

### Quickstart
To learn how to get started with any template, follow the steps in [this quickstart](https://learn.microsoft.com/azure/developer/azure-developer-cli/get-started?tabs=localinstall&pivots=programming-language-nodejs) with this template(`Azure-Samples/todo-nodejs-mongo-terraform`)

Expand Down
2 changes: 0 additions & 2 deletions templates/todo/projects/python-mongo/.repo/terraform/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ The following prerequisites are required to use this application. Please ensure
- [Terraform CLI](https://aka.ms/azure-dev/terraform-install)
- Requires the [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli)

> Note: Terraform is in **alpha mode**. You need to enable it by running `azd config set alpha.terraform on`. Read more about [alpha features](https://github.com/Azure/azure-dev/tree/main/cli/azd/docs).

### Quickstart
To learn how to get started with any template, follow the steps in [this quickstart](https://learn.microsoft.com/azure/developer/azure-developer-cli/get-started?tabs=localinstall&pivots=programming-language-python) with this template(`Azure-Samples/todo-python-mongo-terraform`).

Expand Down