diff --git a/markdown/ep-connect-ep-broker/ep-connect-ep-broker.md b/markdown/ep-connect-ep-broker/ep-connect-ep-broker.md index c523b5e1..7495900e 100644 --- a/markdown/ep-connect-ep-broker/ep-connect-ep-broker.md +++ b/markdown/ep-connect-ep-broker/ep-connect-ep-broker.md @@ -25,10 +25,17 @@ This code lab establishes connectivity between Event Portal, Pub Sub+ Event Brok Duration: 0:07:00 -* Postman installed on a local machine, you can [download it for free](https://www.postman.com/downloads/). +* Postman installed on a local machine, you can [download it for free](https://www.postman.com/downloads/). * Docker installed on a local machine. If you are using Podman, please note that you will need to use different commands later in the lab. * A completely empty Event Portal account. Do **not** use accounts like se-demo or se-all. All TechMesh attendees should have received a dedicated account. If you have not, please reach out in the Slack channel **#techmesh-troubleshooting** +> aside positive +> If you'd rather use Newman, an open-source, non-cloud CLI alternative to Postman:
+> - Install nodeJS (on MacOS with homebrew: ```brew install node```
+> - Install Newman CLI: ```npm install -g newman``` +> - Use the "Alternative instructions for Newman" located at the end of Section 4 + + ## Start a local event broker Follow the instructions for [Setting Up Container Images](https://docs.solace.com/Software-Broker/SW-Broker-Set-Up/Containers/Set-Up-Container-Image.htm) @@ -80,6 +87,15 @@ Duration: 0:10:00 ```POST http://{{baseurl}}/api/v2/architecture/addressSpaces```
```Error: getaddrinfo ENOTFOUND {{baseurl}}``` +### Alternative Instructions for Newman-- only for those using Newman instead of Postman +> aside negative +> These instructions are only for those who want to use Newman instead of Postman. If you used Postman, skip this and continue onwards to the next section. + +1. Create API key as documented above +1. Download the environment and collection files as documented above. +1. Using a text editor, insert the API key into the downloaded environment file. +1. Run the 'Populate' collection with the modified environment file:
+```newman run -e ./EventPortalEnvironment.postman_environment.json ./PopulateEventPortaldemo.postman_collection.json``` ## Enable runtime configuration for your environments Duration: 0:03:00 diff --git a/markdown/ep-lifecycle/ep-lifecycle.md b/markdown/ep-lifecycle/ep-lifecycle.md index 91d74edc..1b825973 100644 --- a/markdown/ep-lifecycle/ep-lifecycle.md +++ b/markdown/ep-lifecycle/ep-lifecycle.md @@ -53,7 +53,7 @@ Then click on OK 1. Again click on Add Objects, and drag a Shared Event to the canvas
![Image](img/7.png)

1. In the popup, select *Customer Updated*, then click on Add. 1. Repeat this process to add the *Customer Created* shared event, which you discovered in the catalog earlier. -1. To define which events Customer 360 subscribes to, hover over the *Order Created* event and drag the arrow to the *Customer360* application. Repeat for *Customer Created* and *Customer Updated* events.
![Image](img/10.png)

+1. To define which events Customer 360 subscribes to, hover over the *Customer Created* event and drag the arrow to the *Customer360* application. Repeat for the *Customer Updated* event.
![Image](img/000096.png)

1. Drag a “New Event” onto the canvas and call it ```Customer Insight Generated```. 1. To define the event Customer 360 publishes, hover over the Customer360 application and drag the arrow to the Customer Insight Generated event.
![Image](img/published.png)

### Add an event directly from the catalog @@ -103,7 +103,7 @@ Duration: 0:05:00 1. Save the resulting .zip file to your hard drive. > aside positive ->You’ll use the source code zip file in the CICD/GitHub Actions portion of the lab. +>You’ll use the source code zip file in the CICD/GitHub Actions portion of the lab, so save it in a place you can remember. ## Provide exactly the events you need, when you need them Duration: 0:15:00 ### Assign your application to an environment/event broker @@ -111,7 +111,7 @@ Duration: 0:15:00 1. Click on the Runtime tab.
![Image](img/48.png)

1. Expand the Prod environment, then click on the three dots next to PROD-solace, then on Manage Credentials.
![Image](img/000083.png)

1. For the Username enter ```c360``` (1). For the Password enter ```c360``` (2). Click on Save. (3)
![Image](img/36.png)

-1. Back in the main screen, again click on the three dots, and then “Add Application”
![Image](img/000083.png)

+1. Back in the main screen, expand the Prod environment (1) again click on the three dots, and then “Add Application” (2)
![Image](img/000095.png)

1. The resulting popup previews the changes that will occur. Expand out the credentials (1) and queues (2) to see more details. Then click on Add (3)
![Image](img/38.png)

> aside negative @@ -143,7 +143,10 @@ Duration: 0:20:00 ### Create new repository with Event Portal GitHub Actions 1. Make sure you are logged into GitHub and go to the [Import Existing Repository page](https://github.com/new/import). 1. Use ```https://github.com/SolaceLabs/ep-scs-workflow``` for the URL, list yourself as the owner, and name the new repository ```customer360```. Click on Begin Import.
![Image](img/51.png)

-1. Wait for the import to complete, usually around 4 minutes. Then click on the link to open the repository. +1. Wait for the import to complete, usually around 3 minutes. Then click on the link to open the repository. + +> aside negative +>Cloning through GitHub occassionally takes a bit of time. After 3 minutes, try refreshing the page to see if it's done. ### Configure GitHub Actions 1. In the top menu of the repository, select Settings.
![Image](img/52.png)

diff --git a/markdown/ep-lifecycle/img/000095.png b/markdown/ep-lifecycle/img/000095.png new file mode 100644 index 00000000..fdb06451 Binary files /dev/null and b/markdown/ep-lifecycle/img/000095.png differ diff --git a/markdown/ep-lifecycle/img/000096.png b/markdown/ep-lifecycle/img/000096.png new file mode 100644 index 00000000..8146f848 Binary files /dev/null and b/markdown/ep-lifecycle/img/000096.png differ