Skip to content

Commit

Permalink
* add uploading of .aar files (Android libraries with resources)
Browse files Browse the repository at this point in the history 
 * add uploadinf of .klib and metadata files (Kotlin Multiplatform artifacts)
 * update regexp at removeExtension() to support name with several works (like -kotlin-tooling-metadata.json)
 * add asset11 to cover all new files
  • Loading branch information
@fAntel
fAntel committed Dec 23, 2024
1 parent 6a7f1b8 commit ff7b232
Show file tree
Hide file tree
Showing 4 changed files with 238 additions and 19 deletions.
22 changes: 22 additions & 0 deletions configs/swagger/nexus3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1982,6 +1982,28 @@
"description": "maven2 Asset 10 Extension",
"required": false,
"type": "string"
},

{
"name": "maven2.asset11",
"in": "formData",
"description": "maven2 Asset 11",
"required": false,
"type": "file"
},
{
"name": "maven2.asset11.classifier",
"in": "formData",
"description": "maven2 Asset 11 Classifier",
"required": false,
"type": "string"
},
{
"name": "maven2.asset11.extension",
"in": "formData",
"description": "maven2 Asset 11 Extension",
"required": false,
"type": "string"
}
],
"responses": {
Expand Down
2 changes: 1 addition & 1 deletion docs/development/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ curl http://localhost:8081/service/rest/swagger.json -o \

Lookup the `maven2.asset3` json snippet, septuple it and change it to:
`maven2.asset4`, `maven2.asset5`, `maven2.asset6`, `maven2.asset7`,
`maven2.asset8`, `maven2.asset9` and `maven2.asset10` respectively. After
`maven2.asset8`, `maven2.asset9`, `maven2.asset10` and `maven2.asset11` respectively. After
adding the seven snippets and renaming them, download go-swagger and generate
internal go-swagger code:

Expand Down
142 changes: 124 additions & 18 deletions internal/app/n3dr/artifactsv2/upload/upload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

type artifactFiles struct {
f2, f3, f4, f5, f6, f7 *os.File
f2, f3, f4, f5, f6, f7, f8, f9, f10, f11 *os.File
}

type mavenParts struct {
Expand Down Expand Up @@ -293,12 +293,82 @@ func (af artifactFiles) mavenJarAndOtherExtensions(c *components.UploadComponent
}).Trace("Maven2 asset6")
}

filePathAar := fileNameWithoutExtIncludingDir + ".aar"
if _, err := os.Stat(filePathAar); err == nil {
af.f8, err = os.Open(filepath.Clean(filePathAar))
if err != nil {
return err
}
c.Maven2Asset8 = af.f8
ext8 := "aar"
c.Maven2Asset8Extension = &ext8

log.WithFields(log.Fields{
"file": c.Maven2Asset8.Name(),
"extension": *c.Maven2Asset8Extension,
}).Trace("Maven2 asset8")
}

filePathKotlinToolingMetadata := fileNameWithoutExtIncludingDir + "-kotlin-tooling-metadata.json"
if _, err := os.Stat(filePathKotlinToolingMetadata); err == nil {
af.f9, err = os.Open(filepath.Clean(filePathKotlinToolingMetadata))
if err != nil {
return err
}
c.Maven2Asset9 = af.f9
ext9 := "json"
c.Maven2Asset9Extension = &ext9
classifier9 := "kotlin-tooling-metadata"
c.Maven2Asset9Classifier = &classifier9

log.WithFields(log.Fields{
"file": c.Maven2Asset9.Name(),
"extension": *c.Maven2Asset9Extension,
"classifier": *c.Maven2Asset9Classifier,
}).Trace("Maven2 asset9")
}

filePathMetadata := fileNameWithoutExtIncludingDir + "-metadata.jar"
if _, err := os.Stat(filePathMetadata); err == nil {
af.f10, err = os.Open(filepath.Clean(filePathMetadata))
if err != nil {
return err
}
c.Maven2Asset10 = af.f10
ext10 := "jar"
c.Maven2Asset10Extension = &ext10
classifier10 := "metadata"
c.Maven2Asset10Classifier = &classifier10

log.WithFields(log.Fields{
"file": c.Maven2Asset10.Name(),
"extension": *c.Maven2Asset10Extension,
"classifier": *c.Maven2Asset10Classifier,
}).Trace("Maven2 asset10")
}

filePathKlib := fileNameWithoutExtIncludingDir + ".klib"
if _, err := os.Stat(filePathKlib); err == nil {
af.f11, err = os.Open(filepath.Clean(filePathKlib))
if err != nil {
return err
}
c.Maven2Asset11 = af.f11
ext11 := "klib"
c.Maven2Asset11Extension = &ext11

log.WithFields(log.Fields{
"file": c.Maven2Asset11.Name(),
"extension": *c.Maven2Asset11Extension,
}).Trace("Maven2 asset11")
}

return nil
}

func removeExtension(fileName string) string {
ext := filepath.Ext(fileName)
re := regexp.MustCompile(`(-[a-zA-Z]+)?` + ext + `$`)
re := regexp.MustCompile(`(-[a-zA-Z]+)*\` + ext + `$`)
result := re.ReplaceAllString(fileName, "")
filename := filepath.Base(result)
return filename
Expand Down Expand Up @@ -415,6 +485,10 @@ func (n *Nexus3) UploadSingleArtifact(client *client.Nexus3, path, localDiskRepo
maven2Asset5 := "empty"
maven2Asset6 := "empty"
maven2Asset7 := "empty"
maven2Asset8 := "empty"
maven2Asset9 := "empty"
maven2Asset10 := "empty"
maven2Asset11 := "empty"

if c.Maven2Asset1 != nil {
maven2Asset1 = c.Maven2Asset1.Name()
Expand All @@ -437,15 +511,31 @@ func (n *Nexus3) UploadSingleArtifact(client *client.Nexus3, path, localDiskRepo
if c.Maven2Asset7 != nil {
maven2Asset7 = c.Maven2Asset7.Name()
}
if c.Maven2Asset8 != nil {
maven2Asset8 = c.Maven2Asset8.Name()
}
if c.Maven2Asset9 != nil {
maven2Asset9 = c.Maven2Asset9.Name()
}
if c.Maven2Asset10 != nil {
maven2Asset10 = c.Maven2Asset10.Name()
}
if c.Maven2Asset11 != nil {
maven2Asset11 = c.Maven2Asset11.Name()
}

log.WithFields(log.Fields{
"1": maven2Asset1,
"2": maven2Asset2,
"3": maven2Asset3,
"4": maven2Asset4,
"5": maven2Asset5,
"6": maven2Asset6,
"7": maven2Asset7,
"1": maven2Asset1,
"2": maven2Asset2,
"3": maven2Asset3,
"4": maven2Asset4,
"5": maven2Asset5,
"6": maven2Asset6,
"7": maven2Asset7,
"8": maven2Asset8,
"9": maven2Asset9,
"10": maven2Asset10,
"11": maven2Asset11,
}).Debug("Maven2 asset upload")
} else {
log.Debugf("folder: '%s' does not contain a pom file: '%s'", dirPath, filePathPom)
Expand Down Expand Up @@ -486,7 +576,7 @@ func (n *Nexus3) UploadSingleArtifact(client *client.Nexus3, path, localDiskRepo
generatePOM := true
c.Maven2GeneratePom = &generatePOM

maven2Asset1, maven2Asset2, maven2Asset3, maven2Asset4, maven2Asset5, maven2Asset6, maven2Asset7 := "empty", "empty", "empty", "empty", "empty", "empty", "empty"
maven2Asset1, maven2Asset2, maven2Asset3, maven2Asset4, maven2Asset5, maven2Asset6, maven2Asset7, maven2Asset8, maven2Asset9, maven2Asset10, maven2Asset11 := "empty", "empty", "empty", "empty", "empty", "empty", "empty", "empty", "empty", "empty", "empty"

if c.Maven2Asset1 != nil {
maven2Asset1 = c.Maven2Asset1.Name()
Expand All @@ -509,15 +599,31 @@ func (n *Nexus3) UploadSingleArtifact(client *client.Nexus3, path, localDiskRepo
if c.Maven2Asset7 != nil {
maven2Asset7 = c.Maven2Asset7.Name()
}
if c.Maven2Asset8 != nil {
maven2Asset8 = c.Maven2Asset8.Name()
}
if c.Maven2Asset9 != nil {
maven2Asset9 = c.Maven2Asset9.Name()
}
if c.Maven2Asset10 != nil {
maven2Asset10 = c.Maven2Asset10.Name()
}
if c.Maven2Asset11 != nil {
maven2Asset11 = c.Maven2Asset11.Name()
}

log.WithFields(log.Fields{
"1": maven2Asset1,
"2": maven2Asset2,
"3": maven2Asset3,
"4": maven2Asset4,
"5": maven2Asset5,
"6": maven2Asset6,
"7": maven2Asset7,
"1": maven2Asset1,
"2": maven2Asset2,
"3": maven2Asset3,
"4": maven2Asset4,
"5": maven2Asset5,
"6": maven2Asset6,
"7": maven2Asset7,
"8": maven2Asset8,
"9": maven2Asset9,
"10": maven2Asset10,
"11": maven2Asset11,
}).Debug("Maven2 asset upload")
}

Expand Down Expand Up @@ -570,7 +676,7 @@ func (n *Nexus3) UploadSingleArtifact(client *client.Nexus3, path, localDiskRepo
return false, nil
}

files := []*os.File{f, af.f2, af.f3, af.f4, af.f5, af.f6, af.f2, af.f7}
files := []*os.File{f, af.f2, af.f3, af.f4, af.f5, af.f6, af.f2, af.f7, af.f8, af.f9, af.f10, af.f11}
if err := upload(c, client, path, files); err != nil {
return false, err
}
Expand Down
91 changes: 91 additions & 0 deletions internal/app/n3dr/goswagger/client/components/upload_component_parameters.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ff7b232

Please sign in to comment.