minor fixes

port-labs · Aug 8, 2023 · f9dc605 · f9dc605
1 parent 3936447
commit f9dc605
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/deployment/terraform/azure/containerapp/modules/container_app/main.tf b/deployment/terraform/azure/containerapp/modules/container_app/main.tf
@@ -87,8 +87,7 @@ resource "azurerm_container_app" "ocean-container-app" {
   secret {
     name = local.port_credentials_secret_name
     value = jsonencode({
-    client_secret : var.port.client_secret,
-    client_id : var.port.client_id,
+      for key, value in var.port : key => value if value != null
     })
   }
   dynamic "secret" {

diff --git a/deployment/terraform/azure/containerapp/modules/container_app/variables.tf b/deployment/terraform/azure/containerapp/modules/container_app/variables.tf
@@ -32,6 +32,7 @@ variable "port" {
   type = object({
     client_id     = string
     client_secret = string
+    base_url      = optional(string)
   })
 }
 

diff --git a/deployment/terraform/azure/containerapp/variables.tf b/deployment/terraform/azure/containerapp/variables.tf
@@ -32,6 +32,7 @@ variable "port" {
   type = object({
     client_id     = string
     client_secret = string
+    base_url      = optional(string)
   })
 }
 

diff --git a/integrations/azure/config.yaml b/integrations/azure/config.yaml
@@ -5,18 +5,9 @@ port:
   clientId: "{{ from env PORT_CLIENT_ID }}" # Can be loaded via environment variable: PORT_CLIENT_ID, if both are set, the environment variable will be used.
   clientSecret: "{{ from env PORT_CLIENT_SECRET }}" # Can be loaded via environment variable: PORT_CLIENT_SECRET, if both are set, the environment variable will be used.
   baseUrl: "{{ from env PORT_BASE_URL }}"
-#  baseUrl: http://localhost:3000 # Can be loaded via environment variable: PORT_BASE_URL, if both are set, the environment variable will be used.
 # The event listener to use for the integration service.
 eventListener:
-#  type: SAMPLE
-  type: POLLING
-#  brokers: {{ from env EVENT_LISTENER_BROKERS }}
-#  username: {{ from env EVENT_LISTENER_USERNAME }}
-#  password: {{ from env EVENT_LISTENER_PASSWORD }}
-#  consumerGroup: {{ from env EVENT_LISTENER_CONSUMER_GROUP }}
-#  authenticationMechanism: {{ from env EVENT_LISTENER_AUTHENTICATION_MECHANISM }}
-#  kafkaSecurityEnabled: true
-#  brokers: "localhost:9092"
+   type: POLLING
 integration:
   # The identifier of this integration instance.
   identifier: "{{ from env INTEGRATION_IDENTIFIER }}"