feat: add alternative github bundle urls for dxp

lgdd · Apr 26, 2024 · 3468c35 · 3468c35
1 parent 3f30ef0
commit 3468c35
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/lfr/pkg/assets/tpl/ws/gradle/gradle.properties b/lfr/pkg/assets/tpl/ws/gradle/gradle.properties
@@ -9,5 +9,5 @@ liferay.workspace.modules.dir=modules
 liferay.workspace.themes.dir=themes
 liferay.workspace.wars.dir=modules
 liferay.workspace.product={{.Product}}
-#liferay.workspace.bundle.url={{.BundleUrl}}
+#liferay.workspace.bundle.url={{.GithubBundleUrl}}
 #liferay.workspace.docker.image.liferay={{.DockerImage}}
diff --git a/lfr/pkg/assets/tpl/ws/maven/pom.xml b/lfr/pkg/assets/tpl/ws/maven/pom.xml
@@ -14,6 +14,7 @@
   <properties>
     <liferay.bom.version>{{.TargetPlatform}}</liferay.bom.version>
     <liferay.workspace.bundle.url>{{.BundleUrl}}</liferay.workspace.bundle.url>
+    <!-- <liferay.workspace.bundle.url>{{.GithubBundleUrl}}</liferay.workspace.bundle.url> -->
     <liferay.repository.url>https://repository-cdn.liferay.com/nexus/content/groups/public/</liferay.repository.url>
     <liferay.workspace.environment>local</liferay.workspace.environment>
     <liferay.docker.image>{{.DockerImage}}</liferay.docker.image>

diff --git a/lfr/pkg/generate/workspace/workspace_test.go b/lfr/pkg/generate/workspace/workspace_test.go
@@ -58,16 +58,16 @@ func TestGenerate_Gradle_ShouldHaveExpectedFiles(t *testing.T) {
 		t.Fatalf("gradle.properties doesn't contain %v", metadata.Product)
 	}
 
-	hasExpectedValue = strings.Contains(string(gradleProps), metadata.BundleUrl)
+	hasExpectedValue = strings.Contains(string(gradleProps), metadata.GithubBundleUrl)
 
 	if !hasExpectedValue {
-		t.Fatalf("gradle.properties doesn't contain %v", metadata.Product)
+		t.Fatalf("gradle.properties doesn't contain %v", metadata.GithubBundleUrl)
 	}
 
 	hasExpectedValue = strings.Contains(string(gradleProps), metadata.DockerImage)
 
 	if !hasExpectedValue {
-		t.Fatalf("gradle.properties doesn't contain %v", metadata.Product)
+		t.Fatalf("gradle.properties doesn't contain %v", metadata.DockerImage)
 	}
 
 }
@@ -138,6 +138,12 @@ func TestGenerate_Maven_ShouldHaveExpectedFiles(t *testing.T) {
 		t.Fatalf("pom.xml doesn't contain %v", metadata.BundleUrl)
 	}
 
+	hasExpectedValue = strings.Contains(string(pomXml), metadata.GithubBundleUrl)
+
+	if !hasExpectedValue {
+		t.Fatalf("pom.xml doesn't contain %v", metadata.GithubBundleUrl)
+	}
+
 	hasExpectedValue = strings.Contains(string(pomXml), metadata.GroupId)
 
 	if !hasExpectedValue {

diff --git a/lfr/pkg/project/metadata.go b/lfr/pkg/project/metadata.go
@@ -19,15 +19,16 @@ import (
 
 // Metadata represents the basic informations associated with a Liferay project
 type Metadata struct {
-	Edition        string
-	Product        string
-	BundleUrl      string
-	TomcatVersion  string
-	TargetPlatform string
-	DockerImage    string
-	GroupId        string
-	ArtifactId     string
-	Name           string
+	Edition         string
+	Product         string
+	BundleUrl       string
+	GithubBundleUrl string
+	TomcatVersion   string
+	TargetPlatform  string
+	DockerImage     string
+	GroupId         string
+	ArtifactId      string
+	Name            string
 }
 
 type Release struct {
@@ -158,14 +159,15 @@ func NewMetadata(base, version, edition string) (*Metadata, error) {
 	latestRelease.BuildGithubBundleURL()
 
 	return &Metadata{
-		Edition:        edition,
-		Product:        latestRelease.ReleaseKey,
-		BundleUrl:      latestRelease.ReleaseProperties.BundleURL,
-		TargetPlatform: latestRelease.ReleaseProperties.TargetPlatformVersion,
-		DockerImage:    latestRelease.ReleaseProperties.LiferayDockerImage,
-		GroupId:        strcase.ToDelimited(PackageName, '.'),
-		ArtifactId:     strcase.ToKebab(strings.ToLower(base)),
-		Name:           strcase.ToCamel(strings.ToLower(base)),
+		Edition:         edition,
+		Product:         latestRelease.ReleaseKey,
+		BundleUrl:       latestRelease.ReleaseProperties.BundleURL,
+		GithubBundleUrl: latestRelease.ReleaseProperties.GithubBundleURL,
+		TargetPlatform:  latestRelease.ReleaseProperties.TargetPlatformVersion,
+		DockerImage:     latestRelease.ReleaseProperties.LiferayDockerImage,
+		GroupId:         strcase.ToDelimited(PackageName, '.'),
+		ArtifactId:      strcase.ToKebab(strings.ToLower(base)),
+		Name:            strcase.ToCamel(strings.ToLower(base)),
 	}, nil
 }