revert back the ci yaml changes

gruntwork-io · Jun 13, 2023 · 2e01363 · 2e01363
1 parent 2623f81
commit 2e01363
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 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.53.2
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.31.0
       - 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,23 +3,19 @@ output "client_key" {
 }
 
 output "client_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate
-  sensitive = true
+  value = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate
 }
 
 output "cluster_ca_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate
-  sensitive = true
+  value = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate
 }
 
 output "cluster_username" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.username
-  sensitive = true
+  value = azurerm_kubernetes_cluster.k8s.kube_config.0.username
 }
 
 output "cluster_password" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.password
-  sensitive = true
+  value = azurerm_kubernetes_cluster.k8s.kube_config.0.password
 }
 
 output "kube_config" {
@@ -28,6 +24,5 @@ output "kube_config" {
 }
 
 output "host" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config.0.host
-  sensitive = true
+  value = azurerm_kubernetes_cluster.k8s.kube_config.0.host
 }
diff --git a/modules/azure/region.go b/modules/azure/region.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/gruntwork-io/terratest/modules/collections"
-	// "github.com/gruntwork-io/terratest/modules/logger"
+	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/gruntwork-io/terratest/modules/testing"
 )
@@ -115,7 +115,7 @@ func GetRandomRegionE(t testing.TestingT, approvedRegions []string, forbiddenReg
 	regionsToPickFrom = collections.ListSubtract(regionsToPickFrom, forbiddenRegions)
 	region := random.RandomString(regionsToPickFrom)
 
-	// logger.Logf(t, "Using region %s", region)
+	logger.Logf(t, "Using region %s", region)
 	return region, nil
 }
 
@@ -138,7 +138,7 @@ 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")
+	logger.Log(t, "Looking up all Azure regions available in this account")
 
 	// Validate Azure subscription ID
 	subscriptionID, err := getTargetAzureSubscription(subscriptionID)