From 6f502d459e0711cda338ed678ebf5f7929563f6f Mon Sep 17 00:00:00 2001
From: anaik91 <ashwinknaik@google.com>
Date: Fri, 27 Oct 2023 22:26:44 +0530
Subject: [PATCH] fix: fixed linter issues

---
 .github/workflows/static-checks.yml          | 16 ++++++++--------
 .github/workflows/{build.yml => testing.yml} |  9 ++++-----
 test/terraform/control-plane/variables.tf    |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)
 rename .github/workflows/{build.yml => testing.yml} (88%)

diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index df1273c..bd58e7b 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -27,15 +27,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-      - name: Install Linter dependencies
-        run: npm install
+        uses: actions/checkout@v3
+      # - name: Setup Node
+      #   uses: actions/setup-node@v2
+      #   with:
+      #     node-version: "14"
+      # - name: Install Linter dependencies
+      #   run: npm install
       - name: Run Mega Linter
-        uses: nvuillam/mega-linter@v4
+        uses: oxsecurity/megalinter@v7
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/testing.yml
similarity index 88%
rename from .github/workflows/build.yml
rename to .github/workflows/testing.yml
index b5d2288..7257123 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/testing.yml
@@ -1,4 +1,4 @@
-name: Release
+name: E2E Testing
 on:
   push:
 
@@ -6,8 +6,7 @@ jobs:
   docker-build:
     name: Tagged Docker release to Google Artifact Registry
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-
+    if: github.event_name == 'push'
     permissions:
       contents: 'read'
       id-token: 'write'
@@ -35,7 +34,7 @@ jobs:
 
       - name: Get tag
         id: get-tag
-        run: echo ::set-output name=short_ref::${GITHUB_REF#refs/*/}
+        run: echo ::set-output name=short_ref::"${GITHUB_REF#refs/*/}"
 
       - id: docker-push-tagged
         name: Tag Docker image and push to Google Artifact Registry
@@ -44,4 +43,4 @@ jobs:
           push: true
           tags: |
              ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}/ansible-helm-apigee-hybrid-deployer:${{ steps.get-tag.outputs.short_ref }}
-             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}/ansible-helm-apigee-hybrid-deployer:latest
\ No newline at end of file
+             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}/ansible-helm-apigee-hybrid-deployer:latest
diff --git a/test/terraform/control-plane/variables.tf b/test/terraform/control-plane/variables.tf
index ef9a345..3397816 100644
--- a/test/terraform/control-plane/variables.tf
+++ b/test/terraform/control-plane/variables.tf
@@ -51,7 +51,7 @@ variable "apigee_environments" {
   description = "Apigee Environments."
   type = map(object({
     display_name = optional(string)
-    description  = optional(string, "Terraform-managed")
+    description  = optional(string)
     node_config = optional(object({
       min_node_count = optional(number)
       max_node_count = optional(number)