From 26be34e948b9c127c254cc174c3a5d9cd4499910 Mon Sep 17 00:00:00 2001
From: sjuarezgx <sjuarez@genexus.com>
Date: Sun, 15 Dec 2024 09:31:07 -0300
Subject: [PATCH] Cross platform changes of deploy engine (#111)

---------

Co-authored-by: Sabrina Juarez Garcia <sabrina.juarez@globant.com>
---
 src/AWSECS/deploy.msbuild                           | 2 +-
 src/AWSLambdaFunctions/createpackage.msbuild        | 2 +-
 src/AWSLambdaFunctions/deploy.msbuild               | 4 ++--
 src/AWSServerless/createpackage.msbuild             | 2 +-
 src/AWSServerless/deploy.msbuild                    | 2 +-
 src/AzureServerless/createpackage.msbuild           | 2 +-
 src/AzureServerless/deploy.msbuild                  | 4 ++--
 src/Docker/deploy.msbuild                           | 1 +
 src/HCP/deploy.msbuild                              | 6 +++---
 src/IBMCF/deploy.msbuild                            | 2 +-
 src/Local/deploy.msbuild                            | 2 +-
 src/SAPCloudFoundry/deploy.msbuild                  | 8 ++++----
 src/StaticFrontEnd/deploy.msbuild                   | 2 +-
 src/StaticFrontEnd/deploy/docker.targets            | 1 +
 src/StaticResources/deploy/azureblobstorage.targets | 2 +-
 15 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/AWSECS/deploy.msbuild b/src/AWSECS/deploy.msbuild
index a444007..eb8adef 100644
--- a/src/AWSECS/deploy.msbuild
+++ b/src/AWSECS/deploy.msbuild
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<GX_PROGRAM_DIR>..\..</GX_PROGRAM_DIR>
 		<POWERSHELL_PATH>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</POWERSHELL_PATH>
-		<DeployDirectory>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\..'))</DeployDirectory>
+		<DeployDirectory>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../..'))</DeployDirectory>
 		
 		<TIMESTAMP_APPLICATION_VERSION>$([System.DateTime]::Now.ToString("yyyyMMddHHmm"))</TIMESTAMP_APPLICATION_VERSION>
 		<EFFECTIVE_TAG_NAME>$(AWSECS_DOCKER_TAG_NAME).$(TIMESTAMP_APPLICATION_VERSION)</EFFECTIVE_TAG_NAME>
diff --git a/src/AWSLambdaFunctions/createpackage.msbuild b/src/AWSLambdaFunctions/createpackage.msbuild
index b39b5a0..9e5b2fb 100644
--- a/src/AWSLambdaFunctions/createpackage.msbuild
+++ b/src/AWSLambdaFunctions/createpackage.msbuild
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy" ToolsVersion="4.0">
 	<PropertyGroup>	
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>	
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>	
 		<ApplicationType Condition="'$(AWSLAMBDA_FUNCTION_TRIGGER_TYPE)' == 'http'">Web</ApplicationType>
 		<ApplicationType Condition="'$(AWSLAMBDA_FUNCTION_TRIGGER_TYPE)' != 'http'">Function</ApplicationType>		
 		<LambdaSourceDir>$(DeployFullPath)</LambdaSourceDir>
diff --git a/src/AWSLambdaFunctions/deploy.msbuild b/src/AWSLambdaFunctions/deploy.msbuild
index 082892f..04ce2d0 100644
--- a/src/AWSLambdaFunctions/deploy.msbuild
+++ b/src/AWSLambdaFunctions/deploy.msbuild
@@ -1,11 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy" ToolsVersion="4.0">
 	<PropertyGroup>
-		<PackageSource>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\$(APPLICATION_NAME)'))</PackageSource>
+		<PackageSource>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../$(APPLICATION_NAME)'))</PackageSource>
 		<RoleARN>$(AWSLAMBDA_ROLE_NAME)</RoleARN>
 		<IAMPolicyJSONFile>..\AWSServerless\template\aws-iam-policy.json</IAMPolicyJSONFile>
 		<S3BucketName>gx-deploy-$(AWSLAMBDA_DEFAULT_REGION)-$(AWSLAMBDA_ACCESS_KEY_ID)$(AWSLAMBDA_PROFILE_NAME)</S3BucketName>
 		<PackageName>$(JAVA_PACKAGE_NAME)</PackageName>
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
 		<LambdaOutputFile>$(DEPLOY_PATH)\AWS_Lambda_Package.zip</LambdaOutputFile>
 		<LambdaJavaNamespace>com.genexus.cloud.serverless.aws.handler</LambdaJavaNamespace>
 		<LambdaJavaHandlerName>handleRequest</LambdaJavaHandlerName>
diff --git a/src/AWSServerless/createpackage.msbuild b/src/AWSServerless/createpackage.msbuild
index 91d8648..4412a37 100644
--- a/src/AWSServerless/createpackage.msbuild
+++ b/src/AWSServerless/createpackage.msbuild
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy" ToolsVersion="4.0">
 	<PropertyGroup>	
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>	
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>	
 		<ApplicationType>Web</ApplicationType>		
 		<LambdaSourceDir>$(DeployFullPath)</LambdaSourceDir>
 		<LambdaOutputFile>$(DeployFullPath)\AWS_Lambda_Package.zip</LambdaOutputFile>    	
diff --git a/src/AWSServerless/deploy.msbuild b/src/AWSServerless/deploy.msbuild
index 0dd17a1..782b113 100644
--- a/src/AWSServerless/deploy.msbuild
+++ b/src/AWSServerless/deploy.msbuild
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy"  ToolsVersion="4.0">
   <PropertyGroup>    
     <AWSLambdaDescriptor>$(GX_PROGRAM_DIR)\GeneXus.AWS.targets</AWSLambdaDescriptor>
-    <GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+    <GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
     <LambdaOutputFile>$(DEPLOY_PATH)\AWS_Lambda_Package.zip</LambdaOutputFile>
     <OpenAPIForAWSServerlessOutputFile>$(DEPLOY_PATH)\api_gateway.swagger.json</OpenAPIForAWSServerlessOutputFile>
     <ApiGatewaySwaggerExtensionTemplate>template\aws-apigateway-swagger-lambda-extension.json</ApiGatewaySwaggerExtensionTemplate>
diff --git a/src/AzureServerless/createpackage.msbuild b/src/AzureServerless/createpackage.msbuild
index 255f117..7cbbc40 100644
--- a/src/AzureServerless/createpackage.msbuild
+++ b/src/AzureServerless/createpackage.msbuild
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CreatePackage"  ToolsVersion="4.0">
 
 <PropertyGroup>
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
 		<STATICRESOURCES_PROVIDER>azureblobstorage</STATICRESOURCES_PROVIDER>
 	</PropertyGroup>
 	<Import Project="$(GX_PROGRAM_DIR)\GeneXus.AzureDeploy.targets"/>
diff --git a/src/AzureServerless/deploy.msbuild b/src/AzureServerless/deploy.msbuild
index 584c0c5..10b42ed 100644
--- a/src/AzureServerless/deploy.msbuild
+++ b/src/AzureServerless/deploy.msbuild
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy" ToolsVersion="4.0">
 	
 	<PropertyGroup>
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
 	</PropertyGroup>
 
 	<Import Project= "createpackage.msbuild" Condition = "'$(CreateCloudPackage)' == 'true'" />
@@ -20,7 +20,7 @@
 
 	<Target Name="AzPublish">
 		<ItemGroup>
-	   		<pathToFile Include="$([MSBuild]::Escape('$(DeployFileFullPath)\$(ProjectName)_$(AZURE_SERVERLESS_FUNCTION_NAME).zip'))" />
+	   		<pathToFile Include="$([MSBuild]::Escape('$(DeployFileFullPath)/$(ProjectName)_$(AZURE_SERVERLESS_FUNCTION_NAME).zip'))" />
 	   </ItemGroup>
 
 	    <Message Text="Deploying to Azure functions ...." Importance="high"/>	
diff --git a/src/Docker/deploy.msbuild b/src/Docker/deploy.msbuild
index dbfada8..4bde715 100644
--- a/src/Docker/deploy.msbuild
+++ b/src/Docker/deploy.msbuild
@@ -29,6 +29,7 @@
 		
 		<PropertyGroup>
 			<UnslashedDeployDirectory>$([System.Text.RegularExpressions.Regex]::Replace ($(DeployDirectory), `\\$`, ""))</UnslashedDeployDirectory>
+			<UnslashedDeployDirectory>$([System.Text.RegularExpressions.Regex]::Replace ($(DeployDirectory), `\/$`, ""))</UnslashedDeployDirectory>
 			<Dockerfile>$(DeployDirectory)\Dockerfile</Dockerfile>
 		</PropertyGroup>
 		
diff --git a/src/HCP/deploy.msbuild b/src/HCP/deploy.msbuild
index bffa214..72f454e 100644
--- a/src/HCP/deploy.msbuild
+++ b/src/HCP/deploy.msbuild
@@ -2,14 +2,14 @@
 
 	<PropertyGroup>
 		<ApplicationLowerName>$([System.String]::new('$(HCP_APPNAME)').ToLower())</ApplicationLowerName>
-		<SourceWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\..\$(APPLICATION_NAME).war'))</SourceWar>
-		<TargetWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\..\$(ApplicationLowerName).war'))</TargetWar>
+		<SourceWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../../$(APPLICATION_NAME).war'))</SourceWar>
+		<TargetWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../../$(ApplicationLowerName).war'))</TargetWar>
 	</PropertyGroup>
 
 	<Target Name="Deploy">
 		<Message Text="$(Name)"/>
 		<Copy SourceFiles="$(SourceWar)" DestinationFiles="$(TargetWar)"/>
-		<Exec Command='"$(HCP_SDK_DIR)\Tools\neo" deploy --host $(HCP_HOST) --account $(HCP_ACCOUNT) --application $(ApplicationLowerName) --source "$(TargetWar)" --user $(HCP_USER) -p $(HCP_PASSWORD)' />
+		<Exec Command='"$(HCP_SDK_DIR)/Tools/neo" deploy --host $(HCP_HOST) --account $(HCP_ACCOUNT) --application $(ApplicationLowerName) --source "$(TargetWar)" --user $(HCP_USER) -p $(HCP_PASSWORD)' />
 	</Target>
 
 </Project>
diff --git a/src/IBMCF/deploy.msbuild b/src/IBMCF/deploy.msbuild
index d55306e..2a078bf 100644
--- a/src/IBMCF/deploy.msbuild
+++ b/src/IBMCF/deploy.msbuild
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">
 
 	<PropertyGroup>
-		<SourceWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\..\$(APPLICATION_NAME).war'))</SourceWar>
+		<SourceWar>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../../$(APPLICATION_NAME).war'))</SourceWar>
 		<SettingAPICommand>cf api https://api.ng.bluemix.net</SettingAPICommand>
 		<LoginCommand>cf login -u $(IBMCF_USER) -p $(IBMCF_PASSWORD) -o $(IBMCF_ORGANIZATION) -s $(IBMCF_SPACE)</LoginCommand>
 		<PushJavaApplicationCommand>cf push $(IBMCF_APPLICATION) -b liberty-for-java -p $(SourceWar)</PushJavaApplicationCommand>
diff --git a/src/Local/deploy.msbuild b/src/Local/deploy.msbuild
index e7280fc..c25c1e2 100644
--- a/src/Local/deploy.msbuild
+++ b/src/Local/deploy.msbuild
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy" ToolsVersion="4.0">
     <PropertyGroup>
-		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+		<GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
 	</PropertyGroup>
 
     <Import Project="$(GXDeployFileProject)" Condition="Exists('$(GXDeployFileProject)')"/>
diff --git a/src/SAPCloudFoundry/deploy.msbuild b/src/SAPCloudFoundry/deploy.msbuild
index 8d3605e..5dd1671 100644
--- a/src/SAPCloudFoundry/deploy.msbuild
+++ b/src/SAPCloudFoundry/deploy.msbuild
@@ -3,7 +3,7 @@
 
 	<PropertyGroup>
 		<ApplicationLowerName>$([System.String]::new('$(SAPCF_APPNAME)').ToLower())</ApplicationLowerName>
-		<DeployFileFullPath>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)\..\..\'))</DeployFileFullPath>
+		<DeployFileFullPath>$([System.IO.Path]::GetFullPath('$(DEPLOY_PATH)/../../'))</DeployFileFullPath>
 		<SourceWar>$(DeployFileFullPath)\$(APPLICATION_NAME).war</SourceWar>
 		<TargetWar>$(DeployFileFullPath)\$(ApplicationLowerName).war</TargetWar>
 		<ManifestFile>$(DEPLOY_PATH)\..\..\manifest.yml</ManifestFile>
@@ -15,9 +15,9 @@
 		<Error Text="The HANA Instance name cannot be empty" Condition="'$(SAPCF_HANAINSTANCENAME)' == ''"/>
 		<Error Text="The Application Name cannot be empty" Condition="'$(SAPCF_APPNAME)' == ''"/>
 		<Copy SourceFiles="$(SourceWar)" DestinationFiles="$(TargetWar)"/>
-		<Exec Command='"$(SAPCF_CLI_DIR)\cf" login -a $(SAPCF_APIEP) -u $(SAPCF_USER) -p $(SAPCF_PASSWORD) -o $(SAPCF_ORG) -s $(SAPCF_SPACE)' Condition="'$(SAPCF_ORIGIN)' == ''"/>
-		<Exec Command='"$(SAPCF_CLI_DIR)\cf" login -a $(SAPCF_APIEP) -u $(SAPCF_USER) -p $(SAPCF_PASSWORD) -o $(SAPCF_ORG) -s $(SAPCF_SPACE) --origin $(SAPCF_ORIGIN)' Condition="'$(SAPCF_ORIGIN)' != ''"/>
-		<Exec Command='"$(SAPCF_CLI_DIR)\cf" push -f "$(ManifestFile)"' />
+		<Exec Command='"$(SAPCF_CLI_DIR)/cf" login -a $(SAPCF_APIEP) -u $(SAPCF_USER) -p $(SAPCF_PASSWORD) -o $(SAPCF_ORG) -s $(SAPCF_SPACE)' Condition="'$(SAPCF_ORIGIN)' == ''"/>
+		<Exec Command='"$(SAPCF_CLI_DIR)/cf" login -a $(SAPCF_APIEP) -u $(SAPCF_USER) -p $(SAPCF_PASSWORD) -o $(SAPCF_ORG) -s $(SAPCF_SPACE) --origin $(SAPCF_ORIGIN)' Condition="'$(SAPCF_ORIGIN)' != ''"/>
+		<Exec Command='"$(SAPCF_CLI_DIR)/cf" push -f "$(ManifestFile)"' />
 	</Target>
 
 	<Target Name="GenerateContextXML">
diff --git a/src/StaticFrontEnd/deploy.msbuild b/src/StaticFrontEnd/deploy.msbuild
index ef3fbfe..488784a 100644
--- a/src/StaticFrontEnd/deploy.msbuild
+++ b/src/StaticFrontEnd/deploy.msbuild
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GX_PROGRAM_DIR>..\..</GX_PROGRAM_DIR>
     <UploadBasePath>/</UploadBasePath>
-    <GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)\..\..\..\..\web\$(ProjectName).gxdproj'))</GXDeployFileProject>
+    <GXDeployFileProject>$([System.IO.Path]::GetFullPath('$(DeployFullPath)/../../../../web/$(ProjectName).gxdproj'))</GXDeployFileProject>
     <DeployProviderImplementation>..\StaticFrontEnd\deploy\$(STATICFRONTEND_PROVIDER).targets</DeployProviderImplementation>
   </PropertyGroup>
   
diff --git a/src/StaticFrontEnd/deploy/docker.targets b/src/StaticFrontEnd/deploy/docker.targets
index 6aa144a..3337caa 100644
--- a/src/StaticFrontEnd/deploy/docker.targets
+++ b/src/StaticFrontEnd/deploy/docker.targets
@@ -6,6 +6,7 @@
 		<DeployDirectory>$(DeployFullPath)\context</DeployDirectory>
 		<Dockerfile>$(DeployDirectory)\Dockerfile</Dockerfile>
 		<UnslashedDeployDirectory>$([System.Text.RegularExpressions.Regex]::Replace ($(DeployDirectory), `\\$`, ""))</UnslashedDeployDirectory>
+		<UnslashedDeployDirectory>$([System.Text.RegularExpressions.Regex]::Replace ($(DeployDirectory), `\/$`, ""))</UnslashedDeployDirectory>
 	</PropertyGroup>
 	
 	<Message Text="Building Docker image $(STATICFRONTEND_DOCKER_IMAGE_NAME)" Importance="high" Condition="'$(DOCKER_EXIT_CODE)' == '0'"/>
diff --git a/src/StaticResources/deploy/azureblobstorage.targets b/src/StaticResources/deploy/azureblobstorage.targets
index c133a79..80ad97c 100644
--- a/src/StaticResources/deploy/azureblobstorage.targets
+++ b/src/StaticResources/deploy/azureblobstorage.targets
@@ -9,7 +9,7 @@
     <Message Text="Uploading resources to Azure Blob Storage (this may take a while)... $(DeployFullPath)\%(StaticResources.Identity)" Importance="high"/>
     
     <Exec 
-      Command="az storage blob upload-batch -s $(DeployFullPath)\%(StaticResources.Identity) -d $web\%(StaticResources.Identity) --account-name $(STATICRESOURCES_AZURE_STORAGE_ACCOUNT) --account-key $(STATICRESOURCES_AZURE_STORAGE_ACCOUNT_KEY) &gt; NUL 2&gt;1" ConsoleToMSBuild="true" 
+      Command="az storage blob upload-batch -s $(DeployFullPath)/%(StaticResources.Identity) -d $web/%(StaticResources.Identity) --account-name $(STATICRESOURCES_AZURE_STORAGE_ACCOUNT) --account-key $(STATICRESOURCES_AZURE_STORAGE_ACCOUNT_KEY) &gt; NUL 2&gt;1" ConsoleToMSBuild="true" 
       WorkingDirectory="$(DeployFullPath)\%(StaticResources.Identity)" Condition = "Exists('$(DeployFullPath)\%(StaticResources.Identity)')">
         <Output TaskParameter="ConsoleOutput" PropertyName="OUTPUT_MESSAGE" />
         <Output TaskParameter="ExitCode" PropertyName="AZ_EXIT_CODE"/>