From 6a82adf1438ba4535b41457624dd7f000472c261 Mon Sep 17 00:00:00 2001
From: tvallin <thibault.vallin@oracle.com>
Date: Thu, 13 Jul 2023 15:47:08 +0200
Subject: [PATCH] Update readme

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 archetypes/helidon/filters.properties          |  3 ++-
 .../src/main/archetype/common/extra.xml        |  2 +-
 .../main/archetype/common/observability.xml    |  2 +-
 .../archetype/nima/custom/observability.xml    | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/archetypes/helidon/filters.properties b/archetypes/helidon/filters.properties
index b78743f8318..5339ac28ed8 100644
--- a/archetypes/helidon/filters.properties
+++ b/archetypes/helidon/filters.properties
@@ -40,7 +40,8 @@ metrics=!${metrics} || (${metrics.builtin})
 tracing=!${tracing} || (${tracing} && ${metrics.provider} == 'microprofile')
 
 # group extra options
-extra=${extra} == [] || ${extra} == ['cors', 'fault-tolerance']
+extra=${extra} == [] || ${extra} == ['cors', 'fault-tolerance'] || \
+  ((${extra} && ${flavor} == 'nima') && ${extra} == ['fault-tolerance'])
 
 # group docker, k8s and v8o
 packaging=!(${docker} || ${k8s} || ${v8o}) || (${docker} && ${k8s} && ${v8o})
diff --git a/archetypes/helidon/src/main/archetype/common/extra.xml b/archetypes/helidon/src/main/archetype/common/extra.xml
index 6e3893c13f5..435539c6f11 100644
--- a/archetypes/helidon/src/main/archetype/common/extra.xml
+++ b/archetypes/helidon/src/main/archetype/common/extra.xml
@@ -66,7 +66,7 @@
                         </model>
                     </output>
                 </option>
-                <option value="cors" name="CORS" description="Cross-Origin Resource Sharing utilities">
+                <option value="cors" name="CORS" description="Cross-Origin Resource Sharing utilities" if="${flavor} != 'nima'">
                     <output>
                         <templates engine="mustache" transformations="mustache,packaged">
                             <directory>files</directory>
diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
index 0ece6bf418e..5800f14d55e 100644
--- a/archetypes/helidon/src/main/archetype/common/observability.xml
+++ b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -37,7 +37,7 @@
                                 description="Expose metrics using the MicroProfile API">
                             <output>
                                 <model>
-                                    <list key="readme-sections">
+                                    <list key="readme-sections" if="${flavor} == 'mp'">
                                         <value><![CDATA[
 ## Try metrics
 
diff --git a/archetypes/helidon/src/main/archetype/nima/custom/observability.xml b/archetypes/helidon/src/main/archetype/nima/custom/observability.xml
index 9be1b75666a..0cef11351b5 100644
--- a/archetypes/helidon/src/main/archetype/nima/custom/observability.xml
+++ b/archetypes/helidon/src/main/archetype/nima/custom/observability.xml
@@ -146,6 +146,24 @@ private static class TracedHandler implements Handler {
             assertThat(response.status(), is(Http.Status.OK_200));
         }
     }
+]]></value>
+            </list>
+            <list key="readme-sections" if="${metrics}">
+                <value><![CDATA[
+## Try metrics
+
+```
+# Prometheus Format
+curl -s -X GET http://localhost:8080/observe/metrics
+# TYPE base:gc_g1_young_generation_count gauge
+. . .
+
+# JSON Format
+curl -H 'Accept: application/json' -X GET http://localhost:8080/observe/metrics
+{"base":...
+. . .
+```
+
 ]]></value>
             </list>
         </model>