fix CE appid deployment wrong internal URL create. Feedback from Mike M.

But the version for in the UI

```-->log: error  Error: Invalid version
    at t.exports.decodeAndValidate (appid.umd.min.js:27:211169)
    at t.exports.retrieveTokens (appid.umd.min.js:27:217577)
    at async t.exports.performOAuthFlowAndGetTokens (appid.umd.min.js:27:216641)``` is not valid

Author: thomassuedbroecker

CE/appid-ce-deploy-apps.sh

@@ -34,7 +34,7 @@ export ARTICLES=articles-appid
 # Application URLs
 export WEBAPI_URL="http://localhost:8083"
 export WEBAPP_URL="http://localhost:8080"
-export ARTICEL_URL="http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA"
+#export ARTICEL_URL="http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA"
 
 #--------------------
 # App ID
@@ -78,17 +78,27 @@ function setupCLIenvCE() {
 
   ibmcloud target -g $RESOURCE_GROUP
   ibmcloud target -r $REGION
-  ibmcloud ce project get --name $PROJECT_NAME
-  ibmcloud ce project select -n $PROJECT_NAME
-  
+
+  RESULT=$(ibmcloud ce project get --name $PROJECT_NAME | grep "Status" |  awk '{print $2;}')
+  if [[ $RESULT == "active" ]]; then
+        echo "*** The project $PROJECT_NAME exists."
+        ibmcloud ce project select -n $PROJECT_NAME
+  else
+        ibmcloud ce project create --name $PROJECT_NAME 
+        ibmcloud ce project select -n $PROJECT_NAME
+  fi
+
   #to use the kubectl commands
   ibmcloud ce project select -n $PROJECT_NAME --kubecfg
 
-  NAMESPACE=$(ibmcloud ce project get --name $PROJECT_NAME --output json | grep "namespace" | awk '{print $2;}' | sed 's/"//g' | sed 's/,//g')
-  echo "Namespace: $NAMESPACE"
-  kubectl get pods -n $NAMESPACE
+  export PROJECT_NAMESPACE=$(ibmcloud ce project get --name $PROJECT_NAME --output json | grep "namespace" | awk '{print $2;}' | sed 's/"//g' | sed 's/,//g')
+  echo "Code Engine project namespace: $PROJECT_NAMESPACE"
+  kubectl get pods -n $PROJECT_NAMESPACE
+  export ARTICEL_URL="http://$ARTICLES.$PROJECT_NAMESPACE.svc.cluster.local/articlesA"
+
 
   CHECK=$(ibmcloud ce project get -n $PROJECT_NAME | awk '/Apps/ {print $2;}')
+  
   echo "**********************************"
   echo "Check for existing apps? '$CHECK'"
   echo "**********************************"
@@ -296,12 +306,12 @@ function deployArticles(){
 
     ibmcloud ce application get --name "$ARTICLES"
 
-    echo "ARTICLES URL: http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA"
+    echo "ARTICLES URL: http://$ARTICLES..svc.cluster.local/articlesA"
 }
 
 function deployWebAPI(){
 
-    echo "Needed Articles URL: http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA"
+    echo "Needed Articles URL: http://$ARTICLES.$PROJECT_NAMESPACE.svc.cluster.local/articlesA"
 
     # Valid vCPU and memory combinations: https://cloud.ibm.com/docs/codeengine?topic=codeengine-mem-cpu-combo
     ibmcloud ce application create --name "$WEBAPI" \
@@ -310,7 +320,7 @@ function deployWebAPI(){
                                    --memory "1G" \
                                    --env APPID_AUTH_SERVER_URL_TENANT_A="$APPLICATION_OAUTHSERVERURL" \
                                    --env APPID_CLIENT_ID_TENANT_A="$APPLICATION_CLIENTID" \
-                                   --env CNS_ARTICLES_URL_TENANT_A="http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA" \
+                                   --env CNS_ARTICLES_URL_TENANT_A="http://$ARTICLES.$PROJECT_NAMESPACE.svc.cluster.local/articlesA" \
                                    --max-scale 1 \
                                    --min-scale 0 \
                                    --port 8080 
@@ -347,9 +357,9 @@ function kubeDeploymentVerification(){
     echo " pods, deployments and configmaps details "
     echo "************************************"
 
-    kubectl get pods -n $NAMESPACE
-    kubectl get deployments -n $NAMESPACE
-    kubectl get configmaps -n $NAMESPACE
+    kubectl get pods -n $PROJECT_NAMESPACE
+    kubectl get deployments -n $PROJECT_NAMESPACE
+    kubectl get configmaps -n $PROJECT_NAMESPACE
 
 }
 
@@ -360,7 +370,7 @@ function getKubeContainerLogs(){
     echo "************************************"
 
     FIND=$WEBAPI
-    WEBAPI_LOG=$(kubectl get pod -n $NAMESPACE | grep $FIND | awk '{print $1}')
+    WEBAPI_LOG=$(kubectl get pod -n $PROJECT_NAMESPACE | grep $FIND | awk '{print $1}')
     echo $WEBAPI_LOG
     kubectl logs $WEBAPI_LOG user-container
 
@@ -369,7 +379,7 @@ function getKubeContainerLogs(){
     echo "************************************"
 
     FIND=$ARTICLES
-    ARTICLES_LOG=$(kubectl get pod -n $NAMESPACE | grep $FIND | awk '{print $1}')
+    ARTICLES_LOG=$(kubectl get pod -n $PROJECT_NAMESPACE | grep $FIND | awk '{print $1}')
     echo $ARTICLES_LOG
     kubectl logs $ARTICLES_LOG user-container
 
@@ -378,7 +388,7 @@ function getKubeContainerLogs(){
     echo "************************************"
 
     FIND=$WEBAPP
-    WEBAPP_LOG=$(kubectl get pod -n $NAMESPACE | grep $FIND | awk '{print $1}')
+    WEBAPP_LOG=$(kubectl get pod -n $PROJECT_NAMESPACE | grep $FIND | awk '{print $1}')
     echo $WEBAPP_LOG
     kubectl logs $WEBAPP_LOG user-container
 }
@@ -395,7 +405,7 @@ function checkKubernetesPod (){
         while :
         do
             FIND=$i
-            STATUS_CHECK=$(kubectl get pod -n $NAMESPACE | grep $FIND | awk '{print $3}')
+            STATUS_CHECK=$(kubectl get pod -n $PROJECT_NAMESPACE | grep $FIND | awk '{print $3}')
             echo "Status: $STATUS_CHECK"
             if [ "$STATUS" = "$STATUS_CHECK" ]; then
                 echo "$(date +'%F %H:%M:%S') Status: $FIND is Ready"
@@ -477,5 +487,5 @@ echo "************************************"
 echo " - oAuthServerUrl   : $APPLICATION_OAUTHSERVERURL"
 echo " - discoveryEndpoint: $APPLICATION_DISCOVERYENDPOINT"
 echo " - Web-API          : $WEBAPI_URL/articlesA"
-echo " - Articles         : http://$ARTICLES.$NAMESPACE.svc.cluster.local/articlesA"
+echo " - Articles         : http://$ARTICLES.$PROJECT_NAMESPACE.svc.cluster.local/articlesA"
 echo " - Web-App          : $WEBAPP_URL"

CE/ce-deploy-apps.sh

@@ -36,19 +36,25 @@ function setupCLIenvCE() {
 
   ibmcloud target -g $RESOURCE_GROUP
   ibmcloud target -r $REGION
-  ibmcloud ce project get --name $PROJECT_NAME
-  ibmcloud ce project select -n $PROJECT_NAME
-  
+
+  RESULT=$(ibmcloud ce project get --name $PROJECT_NAME | grep "Status" |  awk '{print $2;}')
+  if [[ $RESULT == "active" ]]; then
+        echo "*** The project $PROJECT_NAME exists."
+        ibmcloud ce project select -n $PROJECT_NAME
+  else
+        ibmcloud ce project create --name $PROJECT_NAME 
+        ibmcloud ce project select -n $PROJECT_NAME
+  fi
+
   #to use the kubectl commands
   ibmcloud ce project select -n $PROJECT_NAME --kubecfg
 
-  # NAMESPACE=$(kubectl get namespaces | awk '/NAME/ { getline; print $0;}' | awk '{print $1;}')
-  # NAMESPACE=$(ibmcloud ce project get --name $PROJECT_NAME --output json | sed -n 's|.*"namespace":"\([^"]*\)".*|\1|p')
-  NAMESPACE=$(ibmcloud ce project get --name $PROJECT_NAME --output json | grep "namespace" | awk '{print $2;}' | sed 's/"//g' | sed 's/,//g')
-  echo "Namespace: $NAMESPACE"
-  kubectl get pods -n $NAMESPACE
+  export PROJECT_NAMESPACE=$(ibmcloud ce project get --name $PROJECT_NAME --output json | grep "namespace" | awk '{print $2;}' | sed 's/"//g' | sed 's/,//g')
+  echo "Code Engine project namespace: $PROJECT_NAMESPACE"
+  kubectl get pods -n $PROJECT_NAMESPACE
 
   CHECK=$(ibmcloud ce project get -n $PROJECT_NAME | awk '/Apps/ {print $2;}')
+
   echo "**********************************"
   echo "Check for existing apps? '$CHECK'"
   echo "**********************************"

documentation/README.md

@@ -106,7 +106,7 @@ The workshop uses following IBM Cloud Services:
  * [IBM Cloud Monitoring](https://cloud.ibm.com/docs/monitoring?topic=monitoring-getting-started#getting-started) (lite plan)
  * [IBM Cloud Log Analysis](https://cloud.ibm.com/docs/log-analysis?topic=log-analysis-getting-started#getting-started) (lite plan)
 
-`IBM Cloud Code Engine` is build on [Open Source](https://en.wikipedia.org/wiki/Open_source) technologies:
+`IBM Cloud `Code Engine` is built on [Open](https://en.wikipedia.org/wiki/Open_source) Source](https://en.wikipedia.org/wiki/Open_source) technologies:
 
   * [Knative](https://knative.dev/)
   * [Kubernetes](https://knative.dev/)
@@ -115,7 +115,7 @@ The workshop uses following IBM Cloud Services:
 
 ### Technology Used
 
-The example mircorservices application example is build with following `technologies/tools/frameworks`.
+The example microservices application example is built with the following `technologies/`tools/frameworks`.
 
   * [Microservices architecture](https://en.wikipedia.org/wiki/Microservices)
   * [Keycloak](https://www.keycloak.org)

documentation/app-id-optional.md

@@ -1,6 +1,6 @@
 # Optional Lab 3: Run the example application with App ID
 
-In this optional lab we use an [IBM Cloud App ID](https://www.ibm.com/cloud/app-id) service instance for authentication and authorization .
+In this optional lab, we use an [IBM Cloud App ID](https://www.ibm.com/cloud/app-id) service instance for authentication and authorization.
 
 We will create an [IBM Cloud App ID](https://www.ibm.com/cloud/app-id) service instance using a **"lite"** plan, this plan type does not create additional costs for us.
 
@@ -22,7 +22,7 @@ Here is a simplified architecture diagram which shows the **Web-App** and the tw
 
 ### Deploy the example application with App ID
 
-#### (optional) Step 1 : Clone the GitHub project to the **`IBM Cloud Shell`**
+#### (optional) Step 1: Clone the GitHub project to the **`IBM Cloud Shell`**
 
 > Only needed, if you haven't done it before.
 
@@ -44,6 +44,19 @@ ROOT_FOLDER=$(pwd)
 export MYPROJECT=cloud-native-starter-[YOUR-EXTENTION]
 ```
 
+Optional setting:
+
+```sh
+export RESOURCE_GROUP=[YOUR-GROUP]
+export REGION=[YOUR-REGION]
+```
+
+> Log on to IBM Cloud!
+
+```sh
+ibmcloud login  -g $RESOURCE_GROUP -r $REGION (-sso Optional)
+```
+
 #### Step 3: Execute following bash automation
 
 > Be patient, because the script may take several minutes (_up to 10 min_).
@@ -66,7 +79,7 @@ Here are the simplified steps that are carried out in the bash script using main
 
 #### Step 5: Inspect the output
 
-The relevant urls will be listed.
+The relevant URLs will be listed.
 
 ```sh
 ************************************

documentation/build-container-image.md

@@ -19,9 +19,7 @@ The following simplified architecture diagram show the dependencies of the `Code
 
 ### Steps
 
-#### Step 1: Create an IBM Cloud Container image `Namespace`
-
- 1. Open following link:
+#### Step 1: Create an IBM Cloud Container image `Namespace`Open the following link:
 
     ```sh
     https://cloud.ibm.com/registry/namespaces
@@ -49,10 +47,7 @@ The following simplified architecture diagram show the dependencies of the `Code
     *   Registry name: `ibm-container-registry`
     *   Registry server: `us.icr.io`
     *   As you see, we need an `IAM API Key`. So we leave this browser tab open and we create a new browser tab.
-
-    ![](images/ibm-ce-registry-access-02.png)
-
- 3. Open following link in the new browser tab
+Open the following link in the new browser tab
 
     ```sh
     https://cloud.ibm.com/iam/apikeys
@@ -87,10 +82,8 @@ The following simplified architecture diagram show the dependencies of the `Code
     ![](images/ibm-ce-container-build-01.png)
 
  2. The `Specify build details` wizard appears, which contains three steps `Sources`, `Strategy` and `Output`.
-    
-    ![](images/ibm-ce-container-build-02.png)
 
- 3. Insert following values for `Sources` and press `Next`
+ 3. Insert the following values for `Sources` and press `Next`
 
     * Name: `web-app-image`
     * Code repo URL: `https://github.com/IBM/ce-cns`
@@ -107,7 +100,7 @@ The following simplified architecture diagram show the dependencies of the `Code
 
     ![](images/ibm-ce-container-build-03.png)
 
- 5. Insert or select following values for `Output` and press `Done`
+ 5. Insert or select the following values for `Output` and press `Done`
 
     * Registry server: `us.icr.io`
     * Registry access: `ibm-container-registry`

documentation/cleanup-example.md

@@ -8,7 +8,7 @@ Here we just delete all applications to avoid additional costs for you.
 
 #### Step 1: Open the `IBM Cloud Shell`
 
-Use following link to directly open the `IBM Cloud Shell`.
+Use the following link to directly open the `IBM Cloud Shell`.
 
 <https://cloud.ibm.com/shell>
 
@@ -26,7 +26,7 @@ Now you are logged on with your IBM Cloud account.
 #### Step 3: (Optional) Clone the GitHub project to the `IBM Cloud Shell` 
 
 In case your `IBM Cloud Shell` **session has expired** it might be possible that the cloned project was deleted.
-If this happened, you need to clone the project again, because we will be using a bash script for the deletion of the project.
+If this happens, you need to clone the project again, because we will be using a bash script for the deletion of the project.
 
 ```sh
 git clone https://github.com/thomassuedbroecker/ce-cns.git
@@ -43,13 +43,9 @@ cd $ROOT_FOLDER/CE
 export MYPROJECT=cloud-native-starter-[YOUR-EXTENTION]
 ```
 
-#### Step 5: Execute following bash automation
+#### Step 5: Execute the following bash automation
 
-```sh
-bash ce-remove-apps.sh
-```
-
-Relevant for your configuration are following variables in the bash script:
+Relevant to your configuration are the following variables in the bash script:
 
 ```sh
 export PROJECT_NAME=$MYPROJECT #your project name

documentation/inspect-the-project.md

@@ -2,18 +2,17 @@
 
 ### Step 1: Open the `Code Engine` project
 
-Use following link to directly navigate to the Code Engine projects and open the created project.
+Use the following link to directly navigate to the Code Engine projects and open the created project.
 
 <https://cloud.ibm.com/codeengine/projects>
 
 ![](images/cns-ce-create-project-02.png)
 
 ### Step 2: Select `Overview`
 
-In the following image you see:
-
-1. The summary containing the Applications, Jobs, Image builds, Registry access, Secrets and Configmaps. In our case only the four applications are relevant.
-2. The currenly usage of our application.
+In the following image, you see:
+The summary contains the Applications, Jobs, Image builds, Registry access, Secrets and Configmaps. In our case only the four applications are relevant.
+2. The current usage of our application.
 
 ![](images/cns-ce-inspect-project-01.png)
 
@@ -39,7 +38,7 @@ The `overview tab` shows the number of the running instances and the revisons of
 
 Here we find four tabs used to configure the application instance on `Code Engine`.
 
-* First select the `Code` tab. Here you see our container image reference to the Quay container registry.
+* First, select the `Code` tab. Here you see our container image reference to the Quay container registry.
 
 ![](images/cns-ce-inspect-project-update-02.png)
 
@@ -53,7 +52,7 @@ Here we find four tabs used to configure the application instance on `Code Engin
 
 * Now select the `Environment variables` tab. 
 
-Here you see the routes for the `wep-api` microservice to setup the connections **internal** `articels` microservice and the external `Keycloak` application.
+Here you see the routes for the `wep-api` microservice to set up the connections **internal** `articels` microservice and the external `Keycloak` application.
 
 ![](images/cns-ce-inspect-project-update-04.png)
 
@@ -65,17 +64,17 @@ A short extract of the Code Engine documentation:
 
 > _"These metadata fields are called Entrypoint and Command. For those users who are familiar with Dockerfile, the fields equate to the **ENTRYPOINT and CMD commands**. These two fields contain arrays of strings that are combined to create the command line that is used when you run your container."_
 
-For details  visit the [IBM Cloud documentation](https://cloud.ibm.com/docs/codeengine?topic=codeengine-cmd-args).
+For details visit the [IBM Cloud documentation](https://cloud.ibm.com/docs/codeengine?topic=codeengine-cmd-args).
 
 ### Step 6: Endpoints tab
 
-Here you can change the `endpoint` visibility. For our `web-api` application we need a public visibility because the application is invoked by our `web-app` frontend.
+Here you can change the `endpoint` visibility. For our `web-api` application, we need public visibility because the application is invoked by our `web-app` frontend.
 
 ![](images/cns-ce-inspect-project-update-05.png)
 
 ### Step 7: Verify the `Code Engine CLI` application instance configuration
 
-In following code you see the `Code Engine CLI` invocation for the `web-api` microservice, this code is used in the bash script to create a Code Engine application instance. It reflects what you have seen in the [`Code Engine UI`](https://cloud.ibm.com/codeengine/projects).
+In the following code you see the `Code Engine CLI` invocation for the `web-api` microservice, this code is used in the bash script to create a Code Engine application instance. It reflects what you have seen in the [`Code Engine UI`](https://cloud.ibm.com/codeengine/projects).
 
 > Note: The only difference is the threshold of concurrent requests per instance at which one or more additional instances are created is defined. Use this value to scale up instances based on concurrent number of requests. If `--concurrency-target` is not specified, this option defaults to the value of the `--concurrency` option. This value is optional. The default value is `0`.
 
@@ -88,7 +87,7 @@ In following code you see the `Code Engine CLI` invocation for the `web-api` mic
                                 --cpu "0.5" \
                                 --memory "1G" \
                                 --env QUARKUS_OIDC_AUTH_SERVER_URL="$KEYCLOAK_URL/auth/realms/quarkus" \
-                                --env CNS_ARTICLES_URL="http://articles.$NAMESPACE.svc.cluster.local/articles" \
+                                --env CNS_ARTICLES_URL="http://articles.$PROJECT_NAMESPACE.svc.cluster.local/articles" \
                                 --max-scale 1 \
                                 --min-scale 0 \
                         --concurrency-target 100 \
@@ -97,7 +96,7 @@ In following code you see the `Code Engine CLI` invocation for the `web-api` mic
 
 ### Step 8: Estimate cost
 
-You can easily estimate cost for your Code Engine application. 
+You can easily estimate the cost for your Code Engine application. 
 Just select `estimate cost` and configure your region, cpu and storage,  estimated monthly runtime for your application and the number of application instances. For more details visit the [IBM Cloud documentation](https://cloud.ibm.com/codeengine/overview).
 
 ![](images/cns-ce-inspect-project-update-01.gif)

documentation/push-to-container-registry.md

@@ -77,7 +77,7 @@ _Note:_ In the image below you see an example where you can find the name, you s
 
 ![](images/quay-user.png)
 
-### Step 6: Execute following bash automation
+### Step 6: Execute the following bash automation
 
 This bash script will build and push your container images to [Red Hat Quay.io](https://quay.io).