From d9ad1b57033c787b367480608f4e02d626ab2a49 Mon Sep 17 00:00:00 2001
From: Jose Melo <JoseMelo@criticalmanufacturing.com>
Date: Thu, 1 Aug 2024 15:51:31 +0100
Subject: [PATCH] fix (app manifest): Fixed packageType to "Grafana"

The packageType attribute was changed from "General" to "Grafana"
---
 .../init/app_deployment_manifest.xml          | 23 +++++---------
 .../pack/app/app_deployment_manifest.xml      | 30 +++++--------------
 tests/Specs/Pack.cs                           |  5 +---
 3 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/cmf-cli/resources/template_feed/init/app_deployment_manifest.xml b/cmf-cli/resources/template_feed/init/app_deployment_manifest.xml
index 4d601412..a4944b6a 100644
--- a/cmf-cli/resources/template_feed/init/app_deployment_manifest.xml
+++ b/cmf-cli/resources/template_feed/init/app_deployment_manifest.xml
@@ -162,24 +162,17 @@
 					<deployContainer:EnvironmentVariable name="GF_SECURITY_ALLOW_EMBEDDING"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_DISABLE_LOGIN_FORM"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_DISABLE_SIGNOUT_MENU"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_USERS_AUTO_ASSIGN_ORG_ROLE">
-						Viewer </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_USERS_AUTO_ASSIGN_ORG_ROLE"> Viewer </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_USERS_EDITORS_CAN_ADMIN"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_ENABLED"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_NAME">
-						X-FORWARDED-USER </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_PROPERTY">
-						username </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_NAME"> X-FORWARDED-USER </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_PROPERTY"> username </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_AUTO_SIGN_UP"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADERS">
-						Role:X-Forwarded-Grafana-Role </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADERS"> Role:X-Forwarded-Grafana-Role </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_BASIC"> false </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="INSTALLATION_ID">{{
-						Global.GetInstallationId() }}</deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="INSTALLATION_DATA_ROOT_PATH">
-						/var/opt/envmanager/installation/$(SYSTEM_NAME)</deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="DATABASE_APP_FRAMEWORK_CDM_NAME">{{
-						Global.Deployable.BaseSystemName }}CDM</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="INSTALLATION_ID">{{ Global.GetInstallationId() }}</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="INSTALLATION_DATA_ROOT_PATH"> /var/opt/envmanager/installation/$(SYSTEM_NAME)</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="DATABASE_APP_FRAMEWORK_CDM_NAME">{{ Global.Deployable.BaseSystemName }}CDM</deployContainer:EnvironmentVariable>
 
 					<!-- Env Manager Boot Sync -->
 					<deployContainer:EnvironmentVariable name="ENV_MANAGER_BOOT_SYNC_ENABLED">true</deployContainer:EnvironmentVariable>
@@ -269,7 +262,7 @@
 						internal="/var/lib/grafana/" />
 					<deployContainer:Volume size="10" name="installation_data"
 						label="Installation Data"
-						internal="/var/opt/envmanager/installation" 
+						internal="/var/opt/envmanager/installation"
 						usage="Reference" />
 				</deployContainer:Volumes>
 			</deploy:Step>
diff --git a/tests/Fixtures/pack/app/app_deployment_manifest.xml b/tests/Fixtures/pack/app/app_deployment_manifest.xml
index a69dabf9..1a23799c 100644
--- a/tests/Fixtures/pack/app/app_deployment_manifest.xml
+++ b/tests/Fixtures/pack/app/app_deployment_manifest.xml
@@ -167,33 +167,17 @@
 					<deployContainer:EnvironmentVariable name="GF_SECURITY_ALLOW_EMBEDDING"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_DISABLE_LOGIN_FORM"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_DISABLE_SIGNOUT_MENU"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_USERS_AUTO_ASSIGN_ORG_ROLE">
-						Viewer
-					</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_USERS_AUTO_ASSIGN_ORG_ROLE"> Viewer </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_USERS_EDITORS_CAN_ADMIN"> true </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_ENABLED"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_NAME">
-						X-FORWARDED-USER
-					</deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_PROPERTY">
-						username
-					</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_NAME"> X-FORWARDED-USER </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADER_PROPERTY"> username </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_AUTO_SIGN_UP"> true </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADERS">
-						Role:X-Forwarded-Grafana-Role
-					</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="GF_AUTH_PROXY_HEADERS"> Role:X-Forwarded-Grafana-Role </deployContainer:EnvironmentVariable>
 					<deployContainer:EnvironmentVariable name="GF_AUTH_BASIC"> false </deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="INSTALLATION_ID">
-						{{
-						Global.GetInstallationId() }}
-					</deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="INSTALLATION_DATA_ROOT_PATH">
-						/var/opt/envmanager/installation/$(SYSTEM_NAME)
-					</deployContainer:EnvironmentVariable>
-					<deployContainer:EnvironmentVariable name="DATABASE_APP_FRAMEWORK_CDM_NAME">
-						{{
-						Global.Deployable.BaseSystemName }}CDM
-					</deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="INSTALLATION_ID">{{ Global.GetInstallationId() }} </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="INSTALLATION_DATA_ROOT_PATH"> /var/opt/envmanager/installation/$(SYSTEM_NAME) </deployContainer:EnvironmentVariable>
+					<deployContainer:EnvironmentVariable name="DATABASE_APP_FRAMEWORK_CDM_NAME"> {{ Global.Deployable.BaseSystemName }}CDM </deployContainer:EnvironmentVariable>
 
 					<!-- Env Manager Boot Sync -->
 					<deployContainer:EnvironmentVariable name="ENV_MANAGER_BOOT_SYNC_ENABLED">true</deployContainer:EnvironmentVariable>
diff --git a/tests/Specs/Pack.cs b/tests/Specs/Pack.cs
index 11b46edf..6e7f4b9d 100644
--- a/tests/Specs/Pack.cs
+++ b/tests/Specs/Pack.cs
@@ -195,10 +195,7 @@ public void Grafana()
                     ""packageId"": ""Cmf.Custom.Grafana"",
                     ""version"": ""{version}"",
                     ""description"": ""Cmf Custom Grafana Package"",
-                    ""packageType"": ""Generic"",
-                    ""targetLayer"": ""grafana"",
-                    ""isInstallable"": true,
-                    ""isUniqueInstall"": true,
+                    ""packageType"": ""Grafana"",
 	                ""steps"": [
 		                {{
 			                ""order"": ""1"",