chore: Update pytestEnabled and search.useIgnoreFiles in .vscode/sett…

…ings.json, update backendUrl in landing/src/services/contactService.js, update publish-profile in .github/workflows/azure-functions-app-python.yml, update REACT_APP_BACKEND_URL in .github/workflows/azure-staticwebapp.yml, and update terraform providers in infra/runtime/.terraform.lock.hcl
ppokrovskii · Jun 22, 2024 · b1cb8da · b1cb8da
1 parent 228bcb8
commit b1cb8da
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 30 deletions.
diff --git a/.github/workflows/azure-functions-app-python.yml b/.github/workflows/azure-functions-app-python.yml
@@ -66,7 +66,7 @@ jobs:
       with:
         app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }}
         package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
-        publish-profile: ${{ secrets.AZURE_FUNCTIONAPP_PUBLISH_PROFILE }} # Remove publish-profile to use Azure RBAC
+        publish-profile: ${{ secrets.AZFUNCTIONS_PUBLISHING_PROFILE }} # Remove publish-profile to use Azure RBAC
         scm-do-build-during-deployment: false
         enable-oryx-build: false
         respect-funcignore: true
diff --git a/.github/workflows/azure-staticwebapp.yml b/.github/workflows/azure-staticwebapp.yml
@@ -25,7 +25,7 @@ env:
   APP_LOCATION: "/landing" # location of your client code
   # API_LOCATION: "api" # location of your api source code - optional
   APP_ARTIFACT_LOCATION: "build" # location of client code build output
-  AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing deployment token for your static web app
+  AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.LANDING_AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing deployment token for your static web app
 
 permissions:
   contents: read
@@ -58,7 +58,7 @@ jobs:
           app_build_command: 'npm run build' # Static Web App build command to embed environment variables
         env: # Add environment variables here
           REACT_APP_GA_MEASUREMENT_ID: ${{ secrets.REACT_APP_GA_MEASUREMENT_ID }}
-          REACT_APP_BACKEND_URL: ${{ vars.REACT_APP_BACKEND_URL }}
+          REACT_APP_BACKEND_URL: ${{ vars.LANDING_REACT_APP_BACKEND_URL }}
           REACT_APP_ENV: ${{ github.ref_name == 'main' && 'prod' || 'dev' }} # Set the node environment to enable/disable google analytics
 
           ###### End of Repository/Build Configurations ######

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,5 +10,6 @@
         "."
     ],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "search.useIgnoreFiles": false
 }
diff --git a/infra/runtime/.terraform.lock.hcl b/infra/runtime/.terraform.lock.hcl
diff --git a/infra/runtime/github_actions_secrets.tf b/infra/runtime/github_actions_secrets.tf
@@ -1,4 +1,5 @@
-data "external" "publishing_profile" {
+# get landing_publishing_profile
+data "external" "landing_publishing_profile" {
   program = ["powershell", "-File", "./fetch_publishing_profile.ps1", azurerm_linux_function_app.landing_backend.name, azurerm_resource_group.rg.name]
 
   # No input is required, so this can be an empty map
@@ -7,7 +8,20 @@ data "external" "publishing_profile" {
 
 # Convert the publishing profile from JSON string to raw string
 locals {
-  publishing_profile = data.external.publishing_profile.result.publishing_profile
+  landing_publishing_profile = data.external.landing_publishing_profile.result.publishing_profile
+}
+
+# get azfunctions_publishing_profile
+data "external" "azfunctions_publishing_profile" {
+  program = ["powershell", "-File", "./fetch_publishing_profile.ps1", azurerm_linux_function_app.resumematchpro.name, azurerm_resource_group.rg.name]
+
+  # No input is required, so this can be an empty map
+  query = {}
+}
+
+# Convert the publishing profile from JSON string to raw string
+locals {
+  azfunctions_publishing_profile = data.external.azfunctions_publishing_profile.result.publishing_profile
 }
 
 data "github_repository" "repo" {
@@ -23,7 +37,28 @@ resource "github_actions_environment_secret" "LANDING_BACKEND_PUBLISHING_PROFILE
   repository      = data.github_repository.repo.name
   environment     = github_repository_environment.repo_environment.environment
   secret_name     = "LANDING_BACKEND_PUBLISHING_PROFILE"
-  plaintext_value = local.publishing_profile
+  plaintext_value = local.landing_publishing_profile
+}
+
+resource "github_actions_environment_secret" "AZFUNCTIONS_PUBLISHING_PROFILE" {
+  repository      = data.github_repository.repo.name
+  environment     = github_repository_environment.repo_environment.environment
+  secret_name     = "AZFUNCTIONS_PUBLISHING_PROFILE"
+  plaintext_value = local.azfunctions_publishing_profile
+}
+
+resource "github_actions_environment_secret" "LANDING_AZURE_STATIC_WEB_APPS_API_TOKEN" {
+  repository      = data.github_repository.repo.name
+  environment     = github_repository_environment.repo_environment.environment
+  secret_name     = "LANDING_AZURE_STATIC_WEB_APPS_API_TOKEN"
+  plaintext_value = azurerm_static_web_app.landingpage.api_key
+}
+
+resource "github_actions_environment_variable" "LANDING_REACT_APP_BACKEND_URL" {
+  repository      = data.github_repository.repo.name
+  environment     = github_repository_environment.repo_environment.environment
+  variable_name   = "LANDING_REACT_APP_BACKEND_URL"
+  value           = "https://${azurerm_linux_function_app.landing_backend.default_hostname}/api"
 }
 
 # data "github_repository" "repo" {

diff --git a/landing/src/services/contactService.js b/landing/src/services/contactService.js
@@ -1,5 +1,5 @@
   export const submitContactDetails = async (contactDetails) => {
-    const backendUrl = process.env.REACT_APP_BACKEND_URL;
+    const backendUrl = process.env.LANDING_REACT_APP_BACKEND_URL;
     try {
         const response = await fetch(`${backendUrl}/contact_details`, {
             method: 'POST',