diff --git a/CHANGELOG.md b/CHANGELOG.md index c46245b..00a0584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ **Merged pull requests:** +- Use oidc as authentication method [\#290](https://github.com/Azure/terraform-azurerm-compute/pull/290) ([lonegunmanb](https://github.com/lonegunmanb)) - change customized tflint config files to use override files [\#289](https://github.com/Azure/terraform-azurerm-compute/pull/289) ([lonegunmanb](https://github.com/lonegunmanb)) - Bump github.com/Azure/terraform-module-test-helper from 0.15.0 to 0.16.0 in /test [\#274](https://github.com/Azure/terraform-azurerm-compute/pull/274) ([dependabot[bot]](https://github.com/apps/dependabot)) - Fix checkov issue [\#272](https://github.com/Azure/terraform-azurerm-compute/pull/272) ([lonegunmanb](https://github.com/lonegunmanb)) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index be86554..e8dd58a 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -142,8 +142,8 @@ resource "azurerm_storage_account" "debian2" { public_network_access_enabled = false customer_managed_key { - key_vault_key_id = azurerm_key_vault_key.des_key.id user_assigned_identity_id = azurerm_user_assigned_identity.storage_account.id + key_vault_key_id = azurerm_key_vault_key.des_key.id } identity { type = "UserAssigned" diff --git a/tfvmmakefile b/tfvmmakefile new file mode 100644 index 0000000..7f28c53 --- /dev/null +++ b/tfvmmakefile @@ -0,0 +1,85 @@ +REMOTE_SCRIPT := "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/scripts" + +fmt: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fmt.sh" | bash + +fumpt: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fumpt.sh" | bash + +gosec: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gosec.sh" | bash + +tffmt: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/tffmt.sh" | bash + +tffmtcheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terraform-fmt.sh" | bash + +tfvalidatecheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terraform-validate.sh" | bash + +terrafmtcheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terrafmt-check.sh" | bash + +gofmtcheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gofmtcheck.sh" | bash + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fumptcheck.sh" | bash + +golint: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-golangci-lint.sh" | bash + +tflint: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-tflint.sh" | bash + +lint: golint tflint gosec + +checkovcheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/checkovcheck.sh" | bash + +checkovplancheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/checkovplancheck.sh" | bash + +fmtcheck: gofmtcheck tfvalidatecheck tffmtcheck terrafmtcheck + +pr-check: depscheck fmtcheck lint unit-test checkovcheck + +unit-test: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-unit-test.sh" | bash + +e2e-test: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-e2e-test.sh" | bash + +version-upgrade-test: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/version-upgrade-test.sh" | bash + +terrafmt: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terrafmt.sh" | bash + +pre-commit: tffmt terrafmt depsensure fmt fumpt generate + +depsensure: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/deps-ensure.sh" | bash + +depscheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/deps-check.sh" | bash + +generate: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/generate.sh" | bash + +gencheck: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gencheck.sh" | bash + +yor-tag: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/yor-tag.sh" | bash + +autofix: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/autofix.sh" | bash + +test: fmtcheck + @TEST=$(TEST) curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-gradually-deprecated.sh" | bash + @TEST=$(TEST) curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-test.sh" | bash + +build-test: + curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/build-test.sh" | bash + +.PHONY: fmt fmtcheck pr-check \ No newline at end of file