cybercyst/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix]: [AH-1232]: move maven routes to new routes (#3723)

Browse Source 
* [fix]: [AH-1243]: move maven routes to new routes
* [fix]: [AH-1243]: move maven routes to new routes
* [fix]: [AH-1243]: move maven routes to new routes
* [fix]: [AH-1243]: move maven routes to new routes
* [fix]: [AH-1243]: move maven routes to new routes
This commit is contained in:
Pragyesh Mishra 2025-04-23 05:23:05 +00:00 committed by Harness
parent d493a9bf87
commit fc18529e08
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
registry/app/api/controller/metadata/get_client_setup_details.go
View File

@ -492,7 +492,7 @@ func (c *APIController) generateMavenClientSetupDetail(
Commands: &[]artifact.ClientSetupStepCommand{
{
//nolint:lll
Value: utils.StringPtr("<repositories>\n <repository>\n <id>maven-dev</id>\n <url><REGISTRY_URL>/<REGISTRY_NAME></url>\n <releases>\n <enabled>true</enabled>\n <updatePolicy>always</updatePolicy>\n </releases>\n <snapshots>\n <enabled>true</enabled>\n <updatePolicy>always</updatePolicy>\n </snapshots>\n </repository>\n</repositories>"),
Value: utils.StringPtr("<repositories>\n <repository>\n <id>maven-dev</id>\n <url><REGISTRY_URL></url>\n <releases>\n <enabled>true</enabled>\n <updatePolicy>always</updatePolicy>\n </releases>\n <snapshots>\n <enabled>true</enabled>\n <updatePolicy>always</updatePolicy>\n </snapshots>\n </repository>\n</repositories>"),
},
},
},
@ -543,7 +543,7 @@ func (c *APIController) generateMavenClientSetupDetail(
Commands: &[]artifact.ClientSetupStepCommand{
{
//nolint:lll
Value: utils.StringPtr("<distributionManagement>\n <snapshotRepository>\n <id>maven-dev</id>\n <url><REGISTRY_URL>/<REGISTRY_NAME></url>\n </snapshotRepository>\n <repository>\n <id>maven-dev</id>\n <url><REGISTRY_URL>/<REGISTRY_NAME></url>\n </repository>\n</distributionManagement>"),
Value: utils.StringPtr("<distributionManagement>\n <snapshotRepository>\n <id>maven-dev</id>\n <url><REGISTRY_URL></url>\n </snapshotRepository>\n <repository>\n <id>maven-dev</id>\n <url><REGISTRY_URL></url>\n </repository>\n</distributionManagement>"),
},
},
},
@ -582,7 +582,7 @@ func (c *APIController) generateMavenClientSetupDetail(
Commands: &[]artifact.ClientSetupStepCommand{
{
//nolint:lll
Value: utils.StringPtr("repositories{\n maven{\n url \"<REGISTRY_URL>/<REGISTRY_NAME>\"\n\n credentials {\n username \"<USERNAME>\"\n password \"identity-token\"\n }\n }\n}"),
Value: utils.StringPtr("repositories{\n maven{\n url \"<REGISTRY_URL>\"\n\n credentials {\n username \"<USERNAME>\"\n password \"identity-token\"\n }\n }\n}"),
},
},
},
@ -658,7 +658,7 @@ func (c *APIController) generateMavenClientSetupDetail(
Commands: &[]artifact.ClientSetupStepCommand{
{
//nolint:lll
Value: utils.StringPtr("resolver += \"Harness Registry\" at \"<REGISTRY_URL>/<REGISTRY_NAME>\"\ncredentials += Credentials(Path.userHome / \".sbt\" / \".Credentials\")"),
Value: utils.StringPtr("resolver += \"Harness Registry\" at \"<REGISTRY_URL>\"\ncredentials += Credentials(Path.userHome / \".sbt\" / \".Credentials\")"),
},
},
},
@ -706,7 +706,7 @@ func (c *APIController) generateMavenClientSetupDetail(
Type: &staticStepType,
Commands: &[]artifact.ClientSetupStepCommand{
{
Value: utils.StringPtr("publishTo := Some(\"Harness Registry\" at \"<REGISTRY_URL>/<REGISTRY_NAME>\")"),
Value: utils.StringPtr("publishTo := Some(\"Harness Registry\" at \"<REGISTRY_URL>\")"),
},
},
},
@ -770,8 +770,7 @@ func (c *APIController) generateMavenClientSetupDetail(
}
}
rootSpace, _, _ := paths.DisectRoot(registryRef)
registryURL := c.URLProvider.RegistryURL(ctx, "maven", rootSpace)
registryURL := c.URLProvider.PackageURL(ctx, registryRef, "maven")
//nolint:lll
c.replacePlaceholders(ctx, &clientSetupDetails.Sections, username, registryRef, artifactName, version, registryURL,

6
registry/app/api/handler/maven/base.go
View File

@ -168,7 +168,11 @@ func ExtractPathVars(path string) (rootIdentifier, registry, groupID, artifactID
registry = segments[2]
fileName = segments[len(segments)-1]
segments = segments[3 : len(segments)-1]
if "pkg" == segments[0] {
segments = segments[4 : len(segments)-1]
} else {
segments = segments[3 : len(segments)-1]
}
version = segments[len(segments)-1]
if isMetadataFile(fileName) && !strings.HasSuffix(version, "-SNAPSHOT") {