add new inputs

cisagov · Sep 20, 2024 · 4ecf009 · 4ecf009
1 parent 1642ec7
commit 4ecf009
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 98 deletions.
diff --git a/.github/actions/import-pfx/action.yaml b/.github/actions/import-pfx/action.yaml
@@ -11,8 +11,6 @@ runs:
   using: "composite"
   steps:
     - run: |
-        echo "64"
-        echo "${{ inputs.PfxBase64 }}"
         cd repo
         # Create PFX
         New-Item -ItemType file -Path ./key.txt

diff --git a/.github/workflows/function_test_defender.yaml b/.github/workflows/function_test_defender.yaml
@@ -14,6 +14,14 @@ on:
         description: "The GitHub job ID"
         required: true
         type: string
+      GitHubEventSchedule:
+        description: "A type of GitHub event"
+        required: true
+        type: string
+      GitHubEventName:
+        description: "The name of a GitHub event"
+        required: true
+        type: string
     secrets:
       PfxBase64:
         required: true
@@ -82,13 +90,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || inputs.GitHubEventSchedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -149,13 +157,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -214,13 +222,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -281,13 +289,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -346,13 +354,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -413,13 +421,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -478,13 +486,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com
@@ -545,13 +553,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        # if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.EmailOnFailure || github.event.schedule || inputs.GitHubEventName == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com

diff --git a/.github/workflows/function_test_sharepoint.yaml b/.github/workflows/function_test_sharepoint.yaml
@@ -45,6 +45,7 @@ jobs:
       group: Sharepoint_Tenant1
       cancel-in-progress: false
     steps:
+      - run: echo ${{ inputs.GitHubJob }}
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
@@ -82,14 +83,13 @@ jobs:
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Extract Email
         id: extract-email
-        # if: ${{ failure() && (inputs.email-on-failure || github.event.schedule || github.event_name == 'push') }}
+        if: ${{ failure() && (inputs.email-on-failure || github.event.schedule || github.event_name == 'push') }}
         uses: ./repo/.github/actions/extract-email
         env:
           Alias: ${{ inputs.GitHubJob }}
           TestParams: ${{ secrets.TestParamsDev }}
       - name: Notify on Failure
-        # if: ${{ failure() && (inputs.email-on-failure || github.event.schedule || github.event_name == 'push') }}
-        if: ${{ success() }}
+        if: ${{ failure() && (inputs.email-on-failure || github.event.schedule || github.event_name == 'push') }}
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp.gmail.com

diff --git a/.github/workflows/test_concurrency.yaml b/.github/workflows/test_concurrency.yaml
@@ -38,14 +38,15 @@ jobs:
       ClientId: ${{ secrets.AZURE_CLIENT_ID }}
       TenantId: ${{ secrets.AZURE_TENANT_ID }}
       SubscriptionId: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      KeyVaultInfo: ${{ secrets.SCUBA_KEY_VAULT_PROD}}
-
+      KeyVaultInfo: ${{ secrets.SCUBA_KEY_VAULT_PROD}}   
   test_defender:
     name: Test Defender
     uses: ./.github/workflows/function_test_defender.yaml
     with:
       EmailOnFailure: ${{ inputs.EmailOnFailure }}
       GitHubJob: ${{ github.job }}
+      GitHubEventSchedule: ${{ github.event.schedule }}
+      GitHubEventName: ${{ github.event_name }}
     secrets:
       PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
       PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
@@ -56,85 +57,85 @@ jobs:
     needs:
       - publish
 
-  test_entra:
-    name: Test Entra
-    uses: ./.github/workflows/function_test_entra.yaml
-    with:
-      EmailOnFailure: ${{ inputs.EmailOnFailure }}
-      GitHubJob: ${{ github.job }}
-    secrets:
-      PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
-      PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
-      TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
-      TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
-      NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
-      NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
-    needs:
-      - publish
+  # test_entra:
+  #   name: Test Entra
+  #   uses: ./.github/workflows/function_test_entra.yaml
+  #   with:
+  #     EmailOnFailure: ${{ inputs.EmailOnFailure }}
+  #     GitHubJob: ${{ github.job }}
+  #   secrets:
+  #     PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
+  #     PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
+  #     TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
+  #     TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
+  #     NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
+  #     NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
+  #   needs:
+  #     - publish
 
-  test_exchange:
-    name: Test Exchange
-    uses: ./.github/workflows/function_test_exchange.yaml
-    with:
-      EmailOnFailure: ${{ inputs.EmailOnFailure }}
-      GitHubJob: ${{ github.job }}
-    secrets:
-      PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
-      PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
-      TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
-      TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
-      NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
-      NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
-    needs:
-      - publish
+  # test_exchange:
+  #   name: Test Exchange
+  #   uses: ./.github/workflows/function_test_exchange.yaml
+  #   with:
+  #     EmailOnFailure: ${{ inputs.EmailOnFailure }}
+  #     GitHubJob: ${{ github.job }}
+  #   secrets:
+  #     PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
+  #     PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
+  #     TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
+  #     TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
+  #     NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
+  #     NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
+  #   needs:
+  #     - publish
 
-  test_power_platform:
-    name: Test Power Platform
-    uses: ./.github/workflows/function_test_powerplatform.yaml
-    with:
-      EmailOnFailure: ${{ inputs.EmailOnFailure }}
-      GitHubJob: ${{ github.job }}
-    secrets:
-      PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
-      PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
-      TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
-      TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
-      NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
-      NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
-    needs:
-      - publish
+  # test_power_platform:
+  #   name: Test Power Platform
+  #   uses: ./.github/workflows/function_test_powerplatform.yaml
+  #   with:
+  #     EmailOnFailure: ${{ inputs.EmailOnFailure }}
+  #     GitHubJob: ${{ github.job }}
+  #   secrets:
+  #     PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
+  #     PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
+  #     TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
+  #     TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
+  #     NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
+  #     NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
+  #   needs:
+  #     - publish
 
-  test_sharepoint:
-    name: Test Sharepoint
-    uses: ./.github/workflows/function_test_sharepoint.yaml
-    with:
-      EmailOnFailure: ${{ inputs.EmailOnFailure }}
-      GitHubJob: ${{ github.job }}
-    secrets:
-      PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
-      PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
-      TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
-      TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
-      NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
-      NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
-    needs:
-      - publish
+  # test_sharepoint:
+  #   name: Test Sharepoint
+  #   uses: ./.github/workflows/function_test_sharepoint.yaml
+  #   with:
+  #     EmailOnFailure: ${{ inputs.EmailOnFailure }}
+  #     GitHubJob: ${{ github.job }}
+  #   secrets:
+  #     PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
+  #     PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
+  #     TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
+  #     TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
+  #     NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
+  #     NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
+  #   needs:
+  #     - publish
 
-  test_teams:
-    name: Test Teams
-    uses: ./.github/workflows/function_test_teams.yaml
-    with:
-      EmailOnFailure: ${{ inputs.EmailOnFailure }}
-      GitHubJob: ${{ github.job }}
-    secrets:
-      PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
-      PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
-      TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
-      TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
-      NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
-      NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
-    needs:
-      - publish
+  # test_teams:
+  #   name: Test Teams
+  #   uses: ./.github/workflows/function_test_teams.yaml
+  #   with:
+  #     EmailOnFailure: ${{ inputs.EmailOnFailure }}
+  #     GitHubJob: ${{ github.job }}
+  #   secrets:
+  #     PfxBase64: ${{ secrets.NIGHTLY_TEST_BUILD_PFX }}
+  #     PfxPassword: ${{ secrets.NIGHTLY_TEST_BUILD_PW }}
+  #     TestParams: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS }}
+  #     TestParamsDev: ${{ secrets.NIGHTLY_TEST_BUILD_PARAMS_DEV }}
+  #     NotifierUsername: ${{ secrets.NOTIFIER_EMAIL_USERNAME }}
+  #     NotifierPassword: ${{ secrets.NOTIFIER_EMAIL_PASSWORD }}
+  #   needs:
+  #     - publish
 
   cleanup:
     name: Clean