From bca62f63fa0c57bf3bb5d8ebde9d6969b55b8429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20Onur=20=C3=87e=C3=A7en?= <cecenonur0@gmail.com>
Date: Sat, 7 Aug 2021 04:53:48 +0300
Subject: [PATCH] Openapi-definitions file loader fix (#7417)

* excluded openapi-definitions resource folder

jar class loader comes before runtime config folder

* update CHANGES.md

* include openapi-definitions folder in bin packages.

Co-authored-by: Halil Onur Cecen <HalilOnur.Cecen@sahibinden.com>
---
 CHANGES.md                                    | 1 +
 apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
 apm-dist/src/main/assembly/binary.xml         | 1 +
 oap-server/server-bootstrap/pom.xml           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index abbd7afe2..53a3e47b1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Release Notes.
 * Add `event` http receiver
 * Support Metric level function `serviceRelation` in `MAL`. 
 * Support envoy metrics binding into the topology.
+* Fix openapi-definitions folder not being read correctly.
 
 #### UI
 
diff --git a/apm-dist-es7/src/main/assembly/binary-es7.xml b/apm-dist-es7/src/main/assembly/binary-es7.xml
index 337217b65..049c0fff2 100644
--- a/apm-dist-es7/src/main/assembly/binary-es7.xml
+++ b/apm-dist-es7/src/main/assembly/binary-es7.xml
@@ -63,6 +63,7 @@
                 <include>envoy-metrics-rules/*.yaml</include>
                 <include>meter-analyzer-config/*.yaml</include>
                 <include>zabbix-rules/*.yaml</include>
+                <include>openapi-definitions/*</include>
                 <include>otel-oc-rules/*</include>
                 <include>ui-initialized-templates/*</include>
                 <include>lal/*</include>
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index 562fe8b11..bd8093f0c 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -63,6 +63,7 @@
                 <include>envoy-metrics-rules/*.yaml</include>
                 <include>meter-analyzer-config/*.yaml</include>
                 <include>zabbix-rules/*.yaml</include>
+                <include>openapi-definitions/*</include>
                 <include>otel-oc-rules/*</include>
                 <include>ui-initialized-templates/*</include>
                 <include>lal/*</include>
diff --git a/oap-server/server-bootstrap/pom.xml b/oap-server/server-bootstrap/pom.xml
index af09132b8..a9e8964f7 100644
--- a/oap-server/server-bootstrap/pom.xml
+++ b/oap-server/server-bootstrap/pom.xml
@@ -280,6 +280,7 @@
                         <exclude>fetcher-prom-rules/</exclude>
                         <exclude>envoy-metrics-rules/</exclude>
                         <exclude>meter-analyzer-config/</exclude>
+                        <exclude>openapi-definitions/</exclude>
                         <exclude>otel-oc-rules/</exclude>
                         <exclude>ui-initialized-templates/</exclude>
                         <exclude>zabbix-rules/</exclude>