Added compartment id from vault key

Author: fmeheust

interface.yaml

@@ -27,7 +27,7 @@ variableGroups:
     variables:
       - compartment_id
       - availability_domain
-###APPLICATION_GROUP###
+  ###APPLICATION_GROUP###
   - title: "Stack authentication"
     variables:
       - use_existing_token
@@ -36,6 +36,7 @@ variableGroups:
       - new_vault_display_name
       - vault_compartment_id
       - vault_id
+      - vault_key_comparment
       - key_id
   - title: "Application Performance Monitoring"
     variables:
@@ -52,7 +53,7 @@ variableGroups:
       - autonomous_database
       - autonomous_database_user
       - autonomous_database_password
-###APP_CONFIG_GROUP###
+  ###APP_CONFIG_GROUP###
   - title: "Application URL"
     variables:
       - create_fqdn
@@ -106,7 +107,7 @@ variables:
     dependsOn:
       compartmentId: ${compartment_id}
   # Application
-###APPLICATION###
+  ###APPLICATION###
   # APM
   is_free_tier:
     type: boolean
@@ -125,7 +126,7 @@ variables:
     required: true
     title: Autonomous Database display name
     description: A user-friendly name to help you easily identify the resource.
-    visible: 
+    visible:
       not:
         - use_existing_database
   autonomous_database_admin_password:
@@ -134,17 +135,17 @@ variables:
     # validate
     description: Password must be 12 to 30 characters and contain at least one uppercase letter, one lowercase letter, and one number. The password cannot contain the double quote (") character or the username "admin".
     required: true
-    
-    visible: 
-      not: 
+
+    visible:
+      not:
         - use_existing_database
   data_storage_size_in_tbs:
     type: number
     required: true
     title: Storage (TB)
     description: The amount of storage to allocate.
     default: 1
-    visible: 
+    visible:
       not:
         - use_existing_database
   # cpu_core_count:
@@ -153,7 +154,7 @@ variables:
   #   title: CPU core count
   #   description: The number of OCPU cores to be made available to the database
   #   default: 2
-  #   visible: 
+  #   visible:
   #     not:
   #       - use_existing_database
   ocpu_count:
@@ -162,7 +163,7 @@ variables:
     title: OCPU count
     description: The number of OCPU cores to enable. Available cores are subject to your tenancy's service limits.
     default: 1
-    visible: 
+    visible:
       not:
         - use_existing_database
   db_compartment:
@@ -171,35 +172,35 @@ variables:
     title: Autonomous Database compartment
     description: The compartment conataining the Autonomous Database.
     default: ${compartment_id}
-    visible: 
-      and: 
-        - use_existing_database    
+    visible:
+      and:
+        - use_existing_database
   autonomous_database:
     type: oci:database:autonomousdatabase:id
     required: true
     title: Autonomous Database
     description: The Autonomous Database used by the application.
     dependsOn:
       compartmentId: ${db_compartment}
-    visible: 
-      and: 
+    visible:
+      and:
         - use_existing_database
   autonomous_database_user:
     type: string
     required: true
     title: DB username
     default: ""
     description: The username used to connect to the database.
-    visible: 
-      and: 
+    visible:
+      and:
         - use_existing_database
   autonomous_database_password:
     type: password
     title: DB user password
     required: true
     description: The password of the user used to access the database.
-    visible: 
-      and: 
+    visible:
+      and:
         - use_existing_database
   # Vault
   use_existing_vault:
@@ -215,7 +216,7 @@ variables:
     required: true
     visible:
       not:
-      - use_existing_vault
+        - use_existing_vault
   vault_compartment_id:
     type: oci:identity:compartment:id
     required: true
@@ -235,13 +236,22 @@ variables:
     visible:
       and:
         - use_existing_vault
+  vault_key_comparment:
+    type: oci:identity:compartment:id
+    required: true
+    title: Vault key compartment
+    description: Compartment containing the vault key.
+    default: compartment_ocid
+    visible:
+      and:
+        - use_existing_vault
   key_id:
     type: oci:kms:key:id
     required: true
     title: Encryption key
     description: This key will be used to encrypt the sensitive information stored as vault secrets.
     dependsOn:
-      compartmentId: ${vault_compartment_id}
+      compartmentId: ${vault_key_comparment}
       vaultId: ${vault_id}
     visible:
       and:
@@ -257,13 +267,13 @@ variables:
     required: true
     title: User's authentication token
     visible: use_existing_token
-###APP_CONFIG###
+  ###APP_CONFIG###
   # FQDN
   create_fqdn:
-    type : boolean
+    type: boolean
     required: true
     default: true
-    title : Create DNS record
+    title: Create DNS record
     description: If you check this checkbox the stack will create a DNS record that will resolve to the load balancer's IP address.
   dns_compartment:
     type: oci:identity:compartment:id
@@ -272,24 +282,24 @@ variables:
     title: DNS and Certificate compartement
     description: Compartment containing the DNS Zone and the Certificate
     visible: create_fqdn
-  zone :
+  zone:
     type: string
     required: true
     title: DNS Zone
-    description : Domain name in which the host name will be created.
-    visible : create_fqdn
+    description: Domain name in which the host name will be created.
+    visible: create_fqdn
   subdomain:
     type: string
     required: true
     title: Host name
     description: The host name will be created on the selected Zone and will resolve to the the load balancer's IP address.
-    visible : create_fqdn
+    visible: create_fqdn
   certificate_ocid:
     type: string
     required: true
     title: Certificate OCID
     description: You must have a SSL certificate available in OCI Certificates service. Provide the certificate OCID for the host name.
-    visible : create_fqdn
+    visible: create_fqdn
   # Network
   create_new_vcn:
     type: boolean
@@ -301,14 +311,14 @@ variables:
     required: true
     title: The compartment of the existing VCN.
     default: compartment_ocid
-    visible: 
+    visible:
       not:
         - create_new_vcn
   existing_vcn_id:
     type: oci:core:vcn:id
     required: true
     title: Select to VCN
-    visible: 
+    visible:
       not:
         - create_new_vcn
     dependsOn:
@@ -326,8 +336,8 @@ variables:
     required: true
     title: Use existing Application Subnet
     default: false
-    visible: 
-      not : 
+    visible:
+      not:
         - create_new_vcn
   existing_app_subnet_id:
     type: oci:core:subnet:id
@@ -354,11 +364,11 @@ variables:
     title: Use existing Database Subnet
     default: false
     visible:
-      and: 
-        - not: 
-          - create_new_vcn
+      and:
         - not:
-          - use_existing_database
+            - create_new_vcn
+        - not:
+            - use_existing_database
   existing_db_subnet_id:
     type: oci:core:subnet:id
     required: true
@@ -371,23 +381,23 @@ variables:
   db_subnet_cidr:
     type: string
     required: true
-    title: 'Database Subnet Creation: IPv4 CIDR Blocks'
-    description: 'The Autonomous Database will be created in this subnet. For example: 10.0.0.128/26'
+    title: "Database Subnet Creation: IPv4 CIDR Blocks"
+    description: "The Autonomous Database will be created in this subnet. For example: 10.0.0.128/26"
     default: "10.0.0.128/26"
     pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\/(3[0-2]|[1-2]?[0-9])$"
-    visible: 
+    visible:
       and:
-        - not: 
-          - use_existing_db_subnet
         - not:
-          - use_existing_database
+            - use_existing_db_subnet
+        - not:
+            - use_existing_database
   use_existing_lb_subnet:
     type: boolean
     required: true
     title: Use existing Load Balancer Subnet
     default: false
-    visible: 
-      not : 
+    visible:
+      not:
         - create_new_vcn
   existing_lb_subnet_id:
     type: oci:core:subnet:id
@@ -405,15 +415,15 @@ variables:
     description: The load balancer will be created in this subnet.
     pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\/(3[0-2]|[1-2]?[0-9])$"
     default: "10.0.0.192/26"
-    visible: 
+    visible:
       not:
         - use_existing_lb_subnet
   open_https_port:
     type: boolean
     required: true
     title: Open load balancer's HTTPS port
-    description: By checking this checkbox you agree to make the load balancer 
-      subnet public and to open the HTTPS port of the load balancer to the 
+    description: By checking this checkbox you agree to make the load balancer
+      subnet public and to open the HTTPS port of the load balancer to the
       Internet.
     default: false
   # Container instances configuration
@@ -452,7 +462,7 @@ variables:
     type: number
     required: true
     title: Maximum bandwidth (Mbps)
-    description : 10Mbps for always free load balancer
+    description: 10Mbps for always free load balancer
     default: 10
     visible:
       not:
@@ -461,7 +471,7 @@ variables:
     type: number
     required: true
     title: Minimum bandwidth (Mbps)
-    description : 10Mbps for always free load balancer
+    description: 10Mbps for always free load balancer
     default: 10
     visible:
       not:
@@ -489,7 +499,7 @@ variables:
     required: true
     default: false
     title: Enable cookie-based session persistence
-    visible: 
+    visible:
       not: use_default_lb_configuration
   session_affinity:
     type: enum
@@ -518,7 +528,3 @@ outputs:
     type: link
     title: Application URL
     visible: true
-
-
-
-

variables.tf

@@ -394,6 +394,12 @@ variable "new_vault_display_name" {
   default = ""
 }
 
+variable "vault_key_comparment" {
+  type = string
+  description = "Vault encryption key compartment"
+  default = ""
+}
+
 variable "is_free_tier" {
   type = bool
   description = "APM free tier"