Merge pull request #98 from oracle-devrel/iopanait-develop35

informatica solutions upgrades

Author: ionelpanaitescu

cloud-foundation/solutions-for-oracle-res-mgr/Informatica-Secure-Agent-create-a-secure-ready-to-go-complete-data-platform-on-OCI-RM.zip

@@ -1,4 +1,4 @@
-# Oracle Cloud Foundation Terraform Solution - Deploy Informatica Secure Agent – create a secure ready to go complete data platform on OCI
+# Oracle Cloud Foundation Terraform Solution - Informatica Secure Agent – create a ready to go development data platform on OCI
 
 ## Table of Contents
 1. [Overview](#overview)
@@ -45,7 +45,7 @@ For more options of deployment the Informatica IDMC please check the link: see [
 
 ## Prerequisites
 
-- Permission to `manage` the following types of resources in your Oracle Cloud Infrastructure tenancy: `vcns`, `nat-gateways`, `route-tables`, `subnets`, `service-gateways`, `security-lists`, `autonomous database`, `Object Storage` and `compute instances`.
+- Permission to `manage` the following types of resources in your Oracle Cloud Infrastructure tenancy: `vcns`, `nat-gateways`, `route-tables`, `subnets`, `service-gateways`, `security-lists`, `autonomous database`, `Object Storage` and `compute instance`.
 - Quota to create the following resources: 1 ADW database instance and 2 VM instance, 1 Object Storage
 If you don't have the required permissions and quota, contact your tenancy administrator. See [Policy Reference](https://docs.cloud.oracle.com/en-us/iaas/Content/Identity/Reference/policyreference.htm), [Service Limits](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm), [Compartment Quotas](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcequotas.htm).
 
@@ -202,7 +202,7 @@ variable "private_key_path" {
 ## Repository files
 * **images(folder)** - Contains images to be used inside the README.md file
 * **modules(folder)** - ( this folder will be pressent only for the Resource Manager zipped files) Contains folders with subsystems and modules for each section of the project: networking, autonomous database, analytics cloud, etc.
-* **scripts(folder)** - this folder contains the necessary scripts that will run on the compute instances, for the bastion and also for the Secure Agent VM.
+* **scripts(folder)** - this folder contains the necessary scripts that will run on the compute instance for the Secure Agent VM.
 * **CONTRIBUTING.md** - Contributing guidelines, also called Contribution guidelines, the CONTRIBUTING.md file, or software contribution guidelines, is a text file which project managers include in free and open-source software packages or other open media packages for the purpose of describing how others may contribute user-generated content to the project.The file explains how anyone can engage in activities such as formatting code for submission or submitting patches
 * **LICENSE** - The Universal Permissive License (UPL), Version 1.0 
 * **local.tf** - Local values can be helpful to avoid repeating the same values or expressions multiple times in a configuration, but if overused they can also make a configuration hard to read by future maintainers by hiding the actual values used.Here is the place where all the resources are defined.
@@ -245,7 +245,7 @@ Below is an example:
 ```
 variable "db_name" {
   type    = string
-  default = "ADWSecureAgent"
+  default = "ADWSecureAgentOCI"
 }
 
 variable "db_password" {
@@ -327,7 +327,7 @@ Below is an example:
 ```
 variable "bucket_name" {
   type    = string
-  default = "InformaticaSecureAgent"
+  default = "InformaticaSecureAgentOCI"
 }
 
 variable "bucket_access_type" {
@@ -389,14 +389,19 @@ variable "bastion_shape" {
 }
 ```
 
+
+# Compute Informatica Secure Agent VM 
+The compute module will create the informatica VM's one VM.
+
 * Parameters for the Infromatica Secure Agent VM Configuration
     * __informatica_instance_shape__ - (Required) (Updatable) The shape of an instance. The shape determines the number of CPUs, amount of memory, and other resources allocated to the instance.
-    * __hostname_label__ - Required. The hostname/dns name for the Informatica VM.
+    * __informatica_secure_agent_display_name__ - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
     * __iics_user__ - Required. The user name to access IDMC.
     * __iics_token__ - Required. Paste the Secure Agent install token that you get from the IDMC Administrator service. To get the install token, perform the following steps: 1. Log in to IDMC. 2. Select Administrator, and then click Runtime Environments. 3. Click Generate Install Token. 4. Click Copy to copy the install token string.
     * __iics_gn__ - Optional. Name of the Secure Agent group.If your account does not contain the group specified or if you do not specify a group name, the Secure Agent is assigned to an unnamed group.
-    * __iics_dc__ - Required. The data center location for the deployment. Choose the data center location based on the user details registered in IDMC.
-    * __iics_dc_enum__ - the available center locations for Informatica.
+    * __iics_provider__ - Required. The Cloud Provider where you have your IDMC account. Choose the cloud provider based on the user details registered in IDMC.
+    * __iics_provider_enum__ - the available cloud providers for Informatica.
+    * __mp_subscription_enabled__ - As the Informatica VM image it's a narketplace image you need to subscribe to it - as the default it's true.
 
 
 # Infromatica Secure Agent VM Configuration
@@ -406,8 +411,8 @@ variable "informatica_instance_shape" {
   default = "VM.Standard2.4" # Example instance shape: VM.Standard2.4
 }
 
-variable "hostname_label" {
-  default = "iopanait-nl" #
+variable "informatica_secure_agent_display_name" {
+  default = "InformaticaVMOCI"
 }
 
 variable "iics_user" {
@@ -425,20 +430,30 @@ variable "iics_gn" {
   default     = "" <enter your group (optional)>
 }
 
-variable "iics_dc" {
+variable "iics_provider" {
   description = "The data center location for the deployment. Choose the data center location based on the user details registered in Informatica Intelligent Data Management Cloud"
-  default = "United States of America"
+  default = "Oracle Cloud Infrastructure"
+    # default = "Amazon Web Services"
+    # default = "Microsoft Azure"
+    # default = "Google Cloud"
 }
 
-variable "iics_dc_enum" {
+variable "iics_provider_enum" {
   type = map
   default = {
-    USA  = "United States of America"
-    SGP  = "Singapore"
-    GER  = "Germany"
-    JPN  = "Japan"
+    OCI    = "Oracle Cloud Infrastructure"
+    AWS    = "Amazon Web Services"
+    Azure  = "Microsoft Azure"
+    GCP    = "Google Cloud"
   }
 }
+
+variable "mp_subscription_enabled" {
+  description = "Subscribe to Marketplace listing?"
+  type        = bool
+  //default     = false
+  default     = true
+}
 ```
 
 # Network
@@ -501,6 +516,7 @@ Activate the web console with: systemctl enable --now cockpit.socket
 [opc@informatica-bastion ~]$ touch key
 [opc@informatica-bastion ~]$ chmod 600 key
 [opc@informatica-bastion ~]$ vi key   ---- !! Here you will need to paste your private key generated on the terraform output !.
+
 [opc@informatica-bastion ~]$ ssh -i key opc@orivate_ip_address_of_the_informatica_secure_agent_vm
 The authenticity of host '10.0.1.134 (10.0.1.134)' can't be established.
 ECDSA key fingerprint is SHA256:Hktppc3mgt0IS8on/gZhjnGRelgFrWDGYuIg+8HFVos.
@@ -524,31 +540,49 @@ __Step #2:__ - You can access the log files at the following locations:
 When the installation and configuration it's done the output will look like the one below.
 
 ```
-[infa@informatica-secure-agent ~]$ cat /opt/infaagent/apps/agentcore/infaagent.log
+[infa@informaticagcp agentcore]$ cat /opt/infaagent/apps/agentcore/agentcore.log
+2023-11-16 11:27:10,385 GMT  tid="1" tn="main" INFO [com.informatica.runtime.common.util.NetworkUtil] - Determining network interface used for device based encryption
+2023-11-16 11:27:10,782 GMT  tid="1" tn="main" INFO [com.informatica.runtime.common.util.AgentIdUtil] - Successfully created agent_nwid.dat
+2023-11-16 11:27:12,070 GMT  tid="1" tn="main" INFO [com.informatica.saas.infaagent.agentcore.admin.Administrator] - Ignore agentcore packages package-agentcoreupgrade.6713, package-agentcoreupgradefips.6713
+2023-11-16 11:27:12,080 GMT  tid="1" tn="main" INFO [com.informatica.saas.infaagent.agentcore.impls.MainApp] - Regular agent configuration with token
+2023-11-16 11:27:12,095 GMT  tid="1" tn="main" INFO [com.informatica.saas.infaagentv3.agentcore.AgentCorePublisher] - Starting RMI server...
+2023-11-16 11:27:12,129 GMT  tid="1" tn="main" INFO [com.informatica.saas.infaagent.agentcore.impls.MainApp] - Agent Core's RMI started up.
+2023-11-16 11:29:09,985 GMT  tid="25" tn="RMI TCP Connection(2)-127.0.0.1" INFO [com.informatica.saas.infaagent.agentcore.impls.AgentConfiguratorTokenImpl] - Register agent to org 8ee6nPfuGAakd7TjaRFXEh with name informaticagcp
+2023-11-16 11:29:11,743 GMT  tid="25" tn="RMI TCP Connection(2)-127.0.0.1" INFO [com.informatica.runtime.common.security.DeviceEncryption] - Key file required for device based encryption doesn't exists
+2023-11-16 11:29:11,744 GMT  tid="25" tn="RMI TCP Connection(2)-127.0.0.1" INFO [com.informatica.runtime.common.security.DeviceEncryption] - Generating a new key for device based encryption
+2023-11-16 11:29:14,708 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.app.path = /opt/infaagent/apps
+2023-11-16 11:29:14,708 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.port.low = 14000
+2023-11-16 11:29:14,708 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.port.high = 14999
+2023-11-16 11:29:14,709 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.cache.charset.name = UTF-8
+2023-11-16 11:29:14,709 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.manifest.threads = 1
+2023-11-16 11:29:14,709 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \twait_for_apps_to_stop = false
+2023-11-16 11:29:14,709 GMT  tid="27" tn="LifecycleManagerFactoryDefault-akka.actor.default-dispatcher-2" INFO [com.informatica.saas.lcm.lcmnative.LCMComponents] - \tlcm.temp.dir = /opt/infaagent/apps/agentcore/logs/temp
+
+[infa@informaticagcp agentcore]$ cat /opt/infaagent/apps/agentcore/infaagent.log
 Successfully started up InfaAgent.
 InfaAgent is starting up... Please ensure InfaAgent has come up successfully on the web page.
-63.17
+[2023-11-16T11:27:08+0000]: Starting agent core
+67.13
 /opt/infaagent/apps/agentcore
-SLF4J: Class path contains multiple SLF4J bindings.
-SLF4J: Found binding in [jar:file:/opt/infaagent/apps/agentcore/63.17/org.apache.logging.log4j.log4j-slf4j-impl-2.17.1.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: Found binding in [jar:file:/opt/infaagent/apps/agentcore/63.17/org.slf4j.slf4j-log4j12-1.7.21.jar!/org/slf4j/impl/StaticLoggerBinder.class]
-SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
-SLF4J: Actual binding is of type [org.apache.logging.slf4j.Log4jLoggerFactory]
 ConfigProperties: Loading properties from /opt/infaagent/apps/agentcore/../../apps/agentcore/conf/infaagent.ini
 ConfigProperties: Done loading properties from /opt/infaagent/apps/agentcore/../../apps/agentcore/conf/infaagent.ini
 ConfigProperties: Loading properties from /opt/infaagent/apps/agentcore/../../apps/agentcore/conf/proxy.ini
 ConfigProperties: Done loading properties from /opt/infaagent/apps/agentcore/../../apps/agentcore/conf/proxy.ini
-[infa@informatica-secure-agent ~]$ cat /opt/agent_setup.log
+[infa@informaticagcp agentcore]$ 
+
+
+[infa@informaticagcp agentcore]$ cat /opt/agent_setup.log
 Starting IICS secure agent installation...
 Starting agent registration...
 Setting Data Center location...
 Adding secure agent to group 
 Starting IICS Agent
 Registering IICS Agent
 Execution complete
-[infa@informatica-secure-agent ~]$ cat /opt/DO_NOT_DELETE_INFA_IICS_SA.txt
+
+[root@securenl ~]# cat /opt/DO_NOT_DELETE_INFA_IICS_SA.txt
 Secure agent installation script completed.
-[infa@informatica-secure-agent ~]$ 
+[root@securenl ~]# 
 ```
 
 ## <a name="documentation"></a>Documentation

cloud-foundation/solutions-for-oracle-res-mgr/Informatica-Secure-Agent–create-a-ready-to-go-development-data-platform-on-OCI-RM.zip renamed to cloud-foundation/solutions-for-oracle-res-mgr/Informatica-Secure-AgentCreate-a-ready-to-go-development-data-platform-on-OCI-RM.zip

@@ -48,21 +48,23 @@ data "template_cloudinit_config" "bastion-config" {
 }
 
 locals {
-  informatica_image = "ocid1.image.oc1..aaaaaaaal2pawq4ysiekxkf7jbk2i5x5ctolj22a2gfsw576mx7kjfu4xyha"
+  # Local to control subscription to Marketplace image.
+  mp_subscription_enabled = var.mp_subscription_enabled ? 1 : 0
+  informatica_image = "ocid1.image.oc1..aaaaaaaa7cz5dtoycldn2362uitvswgoozfxeahfpxusky67nsd6vxhxcvua"
   mp_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaanfkuyh67srgtyxv7lfzrec3yaauspa5petil2clgizlarqgkmxwa"
-  mp_listing_resource_id = "ocid1.image.oc1..aaaaaaaal2pawq4ysiekxkf7jbk2i5x5ctolj22a2gfsw576mx7kjfu4xyha"
-  mp_listing_resource_version = "August_2022.03"
+  mp_listing_resource_id = "ocid1.image.oc1..aaaaaaaa7cz5dtoycldn2362uitvswgoozfxeahfpxusky67nsd6vxhxcvua"
+  mp_listing_resource_version = "November_2023.11"
 
   ad_names                          = compact(data.template_file.ad_names.*.rendered)
   public_subnet_availability_domain = local.ad_names[0]
 
   #Secure agent data
-  iics_dc_usa = var.iics_dc == var.iics_dc_enum["USA"] ? true : false
-  iics_dc_sgp = var.iics_dc == var.iics_dc_enum["SGP"] ? true : false
-  iics_dc_ger = var.iics_dc == var.iics_dc_enum["GER"] ? true : false
-  iics_dc_jpn = var.iics_dc == var.iics_dc_enum["JPN"] ? true : false
+  iics_provider_oci   = var.iics_provider == var.iics_provider_enum["OCI"] ? true : false
+  iics_provider_aws   = var.iics_provider == var.iics_provider_enum["AWS"] ? true : false
+  iics_provider_azure = var.iics_provider == var.iics_provider_enum["Azure"] ? true : false
+  iics_provider_gcp   = var.iics_provider == var.iics_provider_enum["GCP"] ? true : false
 
-  iics_dc = (local.iics_dc_usa == true) ? "USA" : (local.iics_dc_sgp == true) ? "SGP" : (local.iics_dc_ger == true) ? "GER" : (local.iics_dc_jpn == true) ? "JPN" : "USA" 
+  iics_provider = (local.iics_provider_oci == true) ? "OCI" : (local.iics_provider_aws == true) ? "AWS" : (local.iics_provider_azure == true) ? "Azure" : (local.iics_provider_gcp == true) ? "GCP" : "OCI" 
 
 # Create Autonomous Data Warehouse
   adw_params = { 
@@ -128,34 +130,33 @@ bastion_instance_params = {
   }
 }
 
-
 #create Informatica Secure Agent instance
   informatica_secure_agent_params = {
   informatica_secure_agent = {
     availability_domain = 1
     compartment_id = var.compartment_id
-    display_name   = "informatica_secure_agent"
+    display_name   = var.informatica_secure_agent_display_name
     shape          = var.informatica_instance_shape
     defined_tags   = {}
     freeform_tags  = {}
     subnet_id        = lookup(module.network-subnets.subnets,"private-subnet").id
     vnic_display_name = ""
     assign_public_ip = false
-    hostname_label   = var.hostname_label
+    hostname_label = ""
     source_type = "image"
     source_id   = local.informatica_image
     metadata = {
       ssh_authorized_keys = module.keygen.OPCPrivateKey.public_key_openssh
       user_data = base64encode(templatefile(format("%s/%s", "./scripts", "install.sh"),
       {
-        iics_dc      = local.iics_dc
-        iics_un      = var.iics_user
-        iics_tk      = var.iics_token
-        iics_gn      = var.iics_gn
-        region       = var.region
-        bucket_name  = var.bucket_name
-        tenancy      = data.oci_identity_tenancy.tenancy.name
-        db_name      = var.db_name
+        iics_provider = local.iics_provider
+        iics_un       = var.iics_user
+        iics_tk       = var.iics_token
+        iics_gn       = var.iics_gn
+        region        = var.region
+        bucket_name   = var.bucket_name
+        tenancy       = data.oci_identity_tenancy.tenancy.name
+        db_name       = var.db_name
     }))
     }
     fault_domain = ""