diff --git a/app/hack/index.js b/app/hack/index.js deleted file mode 100644 index 716ef00..0000000 --- a/app/hack/index.js +++ /dev/null @@ -1,7 +0,0 @@ -/* eslint-disable no-console */ - -import { enqueueRunnerForCreation } from "../src/runner/index.js"; - -await enqueueRunnerForCreation(); - -process.exit(0); diff --git a/app/runner-controller/logger.js b/app/runner-controller/logger.js index f7604c3..cd288a3 100644 --- a/app/runner-controller/logger.js +++ b/app/runner-controller/logger.js @@ -5,7 +5,7 @@ let _logger; export const getLogger = () => { if (!_logger) { _logger = pino({ - level: process.env.LOG_LEVEL || "debug", + level: process.env.LOG_LEVEL || "info", transport: process.env.NODE_ENV === "production" ? undefined : { target: "pino-pretty", diff --git a/modules/function-app/outputs.tf b/modules/function-app/outputs.tf index 5d1be26..e4ce0bd 100644 --- a/modules/function-app/outputs.tf +++ b/modules/function-app/outputs.tf @@ -1,3 +1,4 @@ output "function_webhook_url" { - value = nonsensitive("https://${azurerm_linux_function_app.gh_webhook_event_handler_app.default_hostname}/api/eventHandler?clientId=default&code=${data.azurerm_function_app_host_keys.default.default_function_key}") + sensitive = true + value = "https://${azurerm_linux_function_app.gh_webhook_event_handler_app.default_hostname}/api/eventHandler?clientId=default&code=${data.azurerm_function_app_host_keys.default.default_function_key}" } diff --git a/modules/web-app/main.tf b/modules/web-app/main.tf index a381739..691652c 100644 --- a/modules/web-app/main.tf +++ b/modules/web-app/main.tf @@ -14,7 +14,7 @@ resource "azurerm_linux_web_app" "gh_webhook_runner_controller_app" { site_config { application_stack { - docker_image = var.runner_controller_image_name + docker_image = "${var.docker_registry_url}/${var.runner_controller_image_name}" docker_image_tag = var.runner_controller_image_tag } @@ -25,7 +25,9 @@ resource "azurerm_linux_web_app" "gh_webhook_runner_controller_app" { app_settings = { AZURE_APP_CONFIGURATION_ENDPOINT = var.azure_app_configuration_endpoint - DOCKER_REGISTRY_SERVER_URL = var.docker_registry_url + DOCKER_ENABLE_CI = "true" + #DOCKER_REGISTRY_SERVER_URL = "https://${var.docker_registry_url}" + } logs { @@ -148,6 +150,7 @@ resource "azurerm_key_vault_access_policy" "app_registration_key_vault_access_po secret_permissions = [ "Get", - "Set" + "Set", + "Delete", ] } diff --git a/outputs.tf b/outputs.tf index 45e5822..d1f3509 100644 --- a/outputs.tf +++ b/outputs.tf @@ -3,5 +3,6 @@ output "custom_data_script" { } output "function_webhook_url" { - value = module.github_webhook_event_handler_function_app.function_webhook_url + sensitive = true + value = module.github_webhook_event_handler_function_app.function_webhook_url }