Skip to content

Commit

Permalink
Try fix linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredfholgate committed Sep 20, 2023
1 parent b52c10f commit 6bcdaf4
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
---
blank_issues_enabled: false
3 changes: 2 additions & 1 deletion .github/workflows/docs-fmt-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
echo "Repository formatting or documentation is not correct."
echo "Run 'make fmt && make docs' locally and commit the changes to fix."
exit 1
fi
fi
3 changes: 2 additions & 1 deletion .github/workflows/wiki-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@
git add .
git commit -m "$github_commit_message [$GITHUB_ACTOR/${GITHUB_SHA::8}]"
git push --set-upstream "https://[email protected]/$wiki_target_repo.git" master
working-directory: ${{ env.wiki_target_repo }}
working-directory: ${{ env.wiki_target_repo }}

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Please refer to our [wiki](https://github.com/Azure/alz-terraform-accelerator/wi

This project welcomes contributions and suggestions. Most contributions require you to agree to a
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
the rights to use your contribution. For details, visit (https://cla.opensource.microsoft.com)[https://cla.opensource.microsoft.com].
the rights to use your contribution. For details, visit [https://cla.opensource.microsoft.com](https://cla.opensource.microsoft.com).

When you submit a pull request, a CLA bot will automatically determine whether you need to provide
a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
Expand Down
8 changes: 8 additions & 0 deletions bootstrap/modules/resource_names/providers.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
terraform {
required_providers {
random = {
source = "hashicorp/random"
version = "~> 3.5"
}
}
}
2 changes: 1 addition & 1 deletion docs/wiki/[User-Guide]-Quick-Start-Phase-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The inputs differ depending on the VCS you have chosen:
1. `azure_devops_use_organisation_legacy_url`: If you have not migrated to the modern url (still using `https://<organization_name>.visualstudio.com`) for your Azure DevOps organisation, then set this to `true`.
1. `azure_devops_create_project`: If you have an existing project you want to use rather than creating a new one, select `true`. We recommend creating a new project to ensure it is isolated by a strong security boundary.
1. `azure_devops_project_name`: Enter the name of the Azure DevOps project to create or the name of an existing poroject if you set `azure_devops_create_project` to `false`.
1. `azure_devops_authentication_scheme`: Enter the authentication scheme that your pipeline will use to authenticate to Azure. [WorkloadIdentityFederation](https://learn.microsoft.com/en-us/azure/devops/pipelines/library/connect-to-azure?view=azure-devops#create-an-azure-resource-manager-service-connection-using-workload-identity-federation) uses OpenId Connect and is the recommended approach. [ManagedServiceIdentity](https://learn.microsoft.com/en-us/azure/devops/pipelines/library/connect-to-azure?view=azure-devops#create-an-azure-resource-manager-service-connection-to-a-vm-with-a-managed-service-identity) requires the deployment of self-shoted agents are part of the bootstrap setup.
1. `azure_devops_authentication_scheme`: Enter the authentication scheme that your pipeline will use to authenticate to Azure. `WorkloadIdentityFederation` uses OpenId Connect and is the recommended approach. `ManagedServiceIdentity` requires the deployment of self-hosted agents are part of the bootstrap setup.
1. `apply_approvers`: This is a list of service principal names (SPN) of people you wish to be in the group that approves apply of the Azure landing zone module. This is a comma-separated list like `[email protected],[email protected],[email protected]`. You may need to check what the SPN is prior to filling this out as it can vary based on identity provider.
1. `root_management_group_display_name`: The is the name of the root management group that you applied permissions to in a previous step. This defaults to `Tenant Root Group`, but if you organization has changed it you'll need to enter the new display name.
1. You will now see a green message telling you that the next section is specigic to the starter module you choose. Navigate to the documentation for the relevant starter module to get details of the specific inputs.
Expand Down
3 changes: 2 additions & 1 deletion templates/.ci_cd/.azuredevops/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
commandOptions: '-auto-approve tfplan'
environmentServiceNameAzureRM: '${service_connection_name}'
env:
ARM_USE_AZUREAD: true
ARM_USE_AZUREAD: true

3 changes: 2 additions & 1 deletion templates/.ci_cd/.azuredevops/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@
command: 'plan'
environmentServiceNameAzureRM: '${service_connection_name}'
env:
ARM_USE_AZUREAD: true
ARM_USE_AZUREAD: true

4 changes: 3 additions & 1 deletion templates/.ci_cd/.github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
-backend-config="key=terraform.tfstate"
- name: Terraform Plan for $${{ github.event.inputs.terraform_action }}
# shellcheck disable=SC2086
run: terraform plan -out=tfplan -input=false $${{ github.event.inputs.terraform_action == 'destroy' && '-destroy' || '' }}

- name: Create Module Artifact
Expand Down Expand Up @@ -95,4 +96,5 @@
-backend-config="key=terraform.tfstate"
- name: Terraform $${{ github.event.inputs.terraform_action }}
run: terraform apply -input=false -auto-approve tfplan
run: terraform apply -input=false -auto-approve tfplan

3 changes: 2 additions & 1 deletion templates/.ci_cd/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,5 @@
- name: Terraform Plan Status
if: steps.plan.outcome == 'failure'
run: exit 1
run: exit 1

0 comments on commit 6bcdaf4

Please sign in to comment.