From 282827ffdac4fa88867d87945dcbd0fc67bdcd1a Mon Sep 17 00:00:00 2001 From: Paul Wright <5154224+pwright@users.noreply.github.com> Date: Fri, 10 Jan 2020 14:29:36 +0000 Subject: [PATCH] INTLY-4594 edit 1A (#121) * INTLY-4594 edit 1A * --- .../walkthrough.adoc | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/walkthroughs/1A-integrate-event-and-api-driven-apps/walkthrough.adoc b/walkthroughs/1A-integrate-event-and-api-driven-apps/walkthrough.adoc index 69a8688..8c780e0 100644 --- a/walkthroughs/1A-integrate-event-and-api-driven-apps/walkthrough.adoc +++ b/walkthroughs/1A-integrate-event-and-api-driven-apps/walkthrough.adoc @@ -117,7 +117,7 @@ Create a table to store orders. . Log into link:{openshift-host}/console/project/{walkthrough-namespace}/overview[OpenShift Namespace, window="_blank"] for this walkthrough. . Select *Applications > Pods* from the left hand menu. -. Click the Pod that has the name *rhmi-lab-orders-db* followed by an ID. +. Click the Pod that has the name *rhmi-lab-orders-db* followed by an ID, for example *rhmi-lab-orders-db-1-cfqh2*. . Select the *Terminal* tab on the Pod details screen. . Log in to the *orders* database using the command: + @@ -132,9 +132,10 @@ psql -U {user-username} -W -d orders password ---- + -NOTE: For security reasons, the password is not shown in the terminal. -Type or paste the password then press the `Enter` key and it will be accepted. -. Paste the following as SQL to create the *received_orders* table: +For security reasons, the password is not shown in the terminal. +Paste the password then press the *Enter* key. + +. Paste the following as SQL to create the `received_orders` table: + [subs="attributes+"] ---- @@ -148,7 +149,7 @@ CREATE TABLE received_orders ( ---- [type=verification] -Is the newly created table listed when you enter the `\d` command from the `psql` client? +Is the `received_orders` table listed when you enter the `\d` command in the terminal for the PostgreSQL pod? [type=verificationFail] Verify that you followed each step in the procedure above. If you are still having issues, contact your administrator. @@ -169,12 +170,13 @@ Verify that you followed each step in the procedure above. If you are still havi === Creating an API Connector Fuse Online is an enterprise integration platform that provides connectors for many services, such as Gmail and IRC. -It can be extended with custom connectors, using either OpenAPI definitions (Swagger) or JAR files. -To create a connector for the Fuse RESTful API, register the OpenAPI definition as a *Customization*. +You can extend Fuse Online with custom connectors, using either OpenAPI definitions (Swagger) or JAR files. +To create a connector for the Fuse RESTful API, register the OpenAPI definition as a *Customization*: . Log in to the link:{fuse-url}[Red Hat Fuse Online, window="_blank", id="{context}-1"] console. + -NOTE: You are not logging into the shared Fuse Online instance, available from the link:/[Applications menu] with this step. Starting this Solution Pattern provisioned an instance of Fuse Online which is not shared with other cluster users. +NOTE: You are not logging into the shared Fuse Online instance, available from the link:/[All services tab]. +Starting this Solution Pattern provisioned an instance of Fuse Online which is not shared with other cluster users. . Select *Customizations > API Client Connectors* from the left hand menu. @@ -187,6 +189,7 @@ NOTE: You are not logging into the shared Fuse Online instance, available from t ---- {route-orders-fuse-api-host}/openapi.json ---- +This OpenAPI (swagger) file defines the API for querying and creating orders in the underlying PostgreSQL database. .. Click *Next*. @@ -205,18 +208,13 @@ Order System REST API Connector .. Click *Save*. [type=verification] -Is the new connector displayed on the *Customizations > API Client Connectors* screen of the link:{fuse-url}[Red Hat Fuse Online, window="_blank", id="{context}-2"] console? +Is the new connector *Order System REST API Connector* displayed on the *Customizations > API Client Connectors* screen of the link:{fuse-url}[Red Hat Fuse Online, window="_blank", id="{context}-2"] console? [type=verificationFail] Verify that you followed each step in the procedure above. If you are still having issues, contact your administrator. // end::creating-api-connector[] -// tag::creating-amqp-connection-in-fuse[] - -// Module included in the following assemblies: -// -// // tag::creating-http-connection[] @@ -224,7 +222,7 @@ Verify that you followed each step in the procedure above. If you are still hav [.integr8ly-docs-header] === Creating HTTP connection to CRUD App -To enable Fuse Online to send messages from the queue to the Order Management System, create a connection in Red Hat Fuse Online using the API connector you just created. +To enable Fuse Online to send messages from the queue to the Order Management System, create a connection in Red Hat Fuse Online using the API connector you created earlier. . Log in to the link:{fuse-url}[Red Hat Fuse Online, window="_blank", id="{context}-3"] console. @@ -242,7 +240,9 @@ To enable Fuse Online to send messages from the queue to the Order Management Sy ---- {route-orders-fuse-api-host} ---- -.. Enter forward slash, i.e `/`, in the *Base path* field and click *Next* +This is the location of the *rhmi-lab-internal-fuse-api* application that was created by the API Connector above + +.. Enter a forward slash, that is, `/`, in the *Base path* field and click *Next* . When prompted with *Name connection*: .. Enter the following in the *Name* field: @@ -264,9 +264,9 @@ Verify that you followed each step in the procedure above. If you are still hav [id='creating-amqp-connection-in-fuse_{context}'] [.integr8ly-docs-header] -=== Creating AMQP connection in Red Hat Fuse Online +=== Creating an AMQP connection in Red Hat Fuse Online -To allow Fuse Online to consume messages placed on the queue by the Order Entry System, create a connection in Red Hat Fuse Online. +To allow Fuse Online to consume messages placed on the queue by the Order Entry System, create a connection in Red Hat Fuse Online: :fuse-url: https://eval.apps.city.openshiftworkshop.com/ @@ -288,14 +288,14 @@ To allow Fuse Online to consume messages placed on the queue by the Order Entry amqp://{enmasse-broker-url}:5672?amqp.saslMechanisms=PLAIN ---- -. Enter the username relating to {enmasse}: +. Enter the username for {enmasse}: + [subs="attributes+"] ---- {enmasse-credentials-username} ---- -. Enter the password relating to {enmasse}: +. Enter the password for {enmasse}: + [subs="attributes+"] ---- @@ -342,7 +342,7 @@ Verify that you followed each step in the procedure above. If you are still hav // end::task-creating-fuse-integration[] -To use the Fuse connections, create an integration in Red Hat Fuse Online. +To use the Fuse connections, create an integration in Red Hat Fuse Online: . Log in to the link:{fuse-url}[Red Hat Fuse Online, window="_blank", id="wt1a_2_3_1_fuse-url"] console. @@ -352,7 +352,7 @@ To use the Fuse connections, create an integration in Red Hat Fuse Online. . Choose *Incoming Order Queue Connection* as the *Start Connection*. -. When prompted to *Choose an action*, select *Subscribe for messages*. +. When prompted to *Choose an action*, select *Subscribe for messages* and click the *Select* button. . When prompted for a *Destination name*, enter: + @@ -392,7 +392,7 @@ work-queue-requests . Choose *Order System REST API Connection* as the *Finish Connection*. -. When prompted to *Choose an action*, select *Create an order*. +. When prompted to *Choose an action*, select *Create an order* and click the *Select* button. . When prompted with *Configure the action* click *Next*.