From b969d2049305463388b71ddb6f21fd0469e4587b Mon Sep 17 00:00:00 2001
From: Dave Arnold <dave@roknsound.com>
Date: Tue, 3 Dec 2024 17:10:18 -0800
Subject: [PATCH] Remove deprecated GitHub workflow files and update variable
 definitions for consistency

---
 .github/workflows/modtest-dev.yaml | 29 -----------------------------
 .github/workflows/modtest.yml      | 23 -----------------------
 variables.tf                       | 12 ++++++------
 versions.tf                        |  2 +-
 4 files changed, 7 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/modtest-dev.yaml
 delete mode 100644 .github/workflows/modtest.yml

diff --git a/.github/workflows/modtest-dev.yaml b/.github/workflows/modtest-dev.yaml
deleted file mode 100644
index c98e5f1..0000000
--- a/.github/workflows/modtest-dev.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: "ModTest: dev"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-    
-jobs:
-  modtest:
-    if : ${{ github.event_name }} == "pull_request"
-    uses: HappyPathway/centralized-actions/.github/workflows/modtest.yml@main
-    with:
-      workspace: dev
-      workspace_repo: github-repos
-      workspace_branch: main
-      repo_clone_type: https
-      mod_source: repo/github
-
-      github_server: ${{vars.GH_SERVER}}
-      github_org:  ${{ github.repository_owner }} 
-      branch: ${{ github.head_ref }}
-      terraform_version: ${{vars.TERRAFORM_VERSION}}
-      terraform_api_token_name: ${{ vars.TERRAFORM_API_TOKEN_NAME }}
-      terraform_api: ${{vars.TERRAFORM_API}}
-       
-    secrets:
-      TFE_TOKEN: ${{ secrets.TFE_TOKEN }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/modtest.yml b/.github/workflows/modtest.yml
deleted file mode 100644
index ca4c63a..0000000
--- a/.github/workflows/modtest.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: "ModTest"
-
-on:
-  push:
-    branchs:
-      - main
-  pull_request:
-    branches:
-      - main
-    
-jobs:
-  modtest:
-    uses: HappyPathway/centralized-actions/.github/workflows/modtest.yml@main
-    with:
-       workspace: github-repos
-       github_server: github.com 
-       github_org: HappyPathway
-       mod_source: repo/github
-       branch: ${{ github.head_ref }}
-       terraform_version: 1.9.1
-    secrets:
-      TFE_TOKEN: ${{ secrets.TFE_TOKEN }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/variables.tf b/variables.tf
index 4e066ca..d454359 100644
--- a/variables.tf
+++ b/variables.tf
@@ -204,15 +204,15 @@ variable "vulnerability_alerts" {
   default = false
 }
 
-variable gitignore_template {
+variable "gitignore_template" {
   default = null
 }
 
-variable homepage_url {
+variable "homepage_url" {
   default = null
 }
 
-variable security_and_analysis {
+variable "security_and_analysis" {
   description = <<EOT
   Security and Analysis Configuration
 The security_and_analysis block supports the following:
@@ -226,12 +226,12 @@ EOT
   type = object({
     advanced_security = optional(object({
       status = string
-    }, { status = "disabled" })
+    }, { status = "disabled" }))
     secret_scanning = optional(object({
       status = string
-    }, { status = "disabled" })
+    }, { status = "disabled" }))
     secret_scanning_push_protection = optional(object({
       status = string
-    }, { status = "disabled" })
+    }, { status = "disabled" }))
   })
 }
diff --git a/versions.tf b/versions.tf
index 73db9d5..fbe53be 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     github = {
-      source  = "integrations/github"
+      source = "integrations/github"
     }
   }
 }