Merge pull request #1304 from HadwaAbdelhalem/update_azure_workflow

Update azure workflow golangcli-lint version
gruntwork-io · Jun 20, 2023 · 6308579 · 6308579
2 parents 60601b4 + 143565f
commit 6308579
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 33 deletions.
diff --git 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
@@ -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
 }
diff --git a/examples/azure/terraform-azure-keyvault-example/example.pfx b/examples/azure/terraform-azure-keyvault-example/example.pfx
diff --git 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
@@ -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)