diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 670798899..03813b91b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: ref: ${{ github.event.inputs.branch }} - name: install golangci-lint binary run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.31.0 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.53.2 - name: lint modules/azure folder id: azure_module_lint run: | diff --git a/examples/azure/terraform-azure-aks-example/output.tf b/examples/azure/terraform-azure-aks-example/output.tf index a06b6ca89..2bd5b736e 100644 --- a/examples/azure/terraform-azure-aks-example/output.tf +++ b/examples/azure/terraform-azure-aks-example/output.tf @@ -3,19 +3,23 @@ output "client_key" { } output "client_certificate" { - value = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate + value = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate + sensitive = true } output "cluster_ca_certificate" { - value = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate + value = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate + sensitive = true } output "cluster_username" { - value = azurerm_kubernetes_cluster.k8s.kube_config.0.username + value = azurerm_kubernetes_cluster.k8s.kube_config.0.username + sensitive = true } output "cluster_password" { - value = azurerm_kubernetes_cluster.k8s.kube_config.0.password + value = azurerm_kubernetes_cluster.k8s.kube_config.0.password + sensitive = true } output "kube_config" { @@ -24,5 +28,6 @@ output "kube_config" { } output "host" { - value = azurerm_kubernetes_cluster.k8s.kube_config.0.host + value = azurerm_kubernetes_cluster.k8s.kube_config.0.host + sensitive = true } \ No newline at end of file diff --git a/examples/azure/terraform-azure-keyvault-example/example.pfx b/examples/azure/terraform-azure-keyvault-example/example.pfx index f6bbd489d..1a2ce7593 100755 Binary files a/examples/azure/terraform-azure-keyvault-example/example.pfx and b/examples/azure/terraform-azure-keyvault-example/example.pfx differ diff --git a/examples/azure/terraform-azure-keyvault-example/main.tf b/examples/azure/terraform-azure-keyvault-example/main.tf index b73f2bd54..ed36d1163 100644 --- a/examples/azure/terraform-azure-keyvault-example/main.tf +++ b/examples/azure/terraform-azure-keyvault-example/main.tf @@ -6,7 +6,7 @@ # --------------------------------------------------------------------------------------------------------------------- provider "azurerm" { - version = "~>2.20" + version = "~>3.0" features { key_vault { purge_soft_delete_on_destroy = false @@ -70,35 +70,37 @@ resource "azurerm_key_vault" "key_vault" { object_id = data.azurerm_client_config.current.object_id key_permissions = [ - "create", - "get", - "list", - "delete", - "purge", + "Create", + "Get", + "List", + "Delete", + "Purge", + "SetRotationPolicy", + "GetRotationPolicy" ] secret_permissions = [ - "set", - "get", - "list", - "delete", - "purge", + "Set", + "Get", + "List", + "Delete", + "Purge", ] certificate_permissions = [ - "create", - "delete", - "deleteissuers", - "get", - "getissuers", - "import", - "list", - "listissuers", - "managecontacts", - "manageissuers", - "setissuers", - "update", - "purge", + "Create", + "Delete", + "DeleteIssuers", + "Get", + "GetIssuers", + "Import", + "List", + "ListIssuers", + "ManageContacts", + "ManageIssuers", + "SetIssuers", + "Update", + "Purge", ] } } diff --git a/modules/azure/region.go b/modules/azure/region.go index e36733531..c478beeb2 100644 --- a/modules/azure/region.go +++ b/modules/azure/region.go @@ -4,7 +4,6 @@ import ( "context" "github.com/gruntwork-io/terratest/modules/collections" - "github.com/gruntwork-io/terratest/modules/logger" "github.com/gruntwork-io/terratest/modules/random" "github.com/gruntwork-io/terratest/modules/testing" ) @@ -115,7 +114,6 @@ func GetRandomRegionE(t testing.TestingT, approvedRegions []string, forbiddenReg regionsToPickFrom = collections.ListSubtract(regionsToPickFrom, forbiddenRegions) region := random.RandomString(regionsToPickFrom) - logger.Logf(t, "Using region %s", region) return region, nil } @@ -138,7 +136,6 @@ func GetAllAzureRegions(t testing.TestingT, subscriptionID string) []string { // GetAllAzureRegionsE gets the list of Azure regions available in this subscription func GetAllAzureRegionsE(t testing.TestingT, subscriptionID string) ([]string, error) { - logger.Log(t, "Looking up all Azure regions available in this account") // Validate Azure subscription ID subscriptionID, err := getTargetAzureSubscription(subscriptionID)