Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions util/maven/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,17 @@ func (p *Project) Interpolate() error {

return nil
}

// InterpolateRepositories resolves placeholders in repositories metadata with best effort.
func (p *Project) InterpolateRepositories() error {
properties, err := p.propertyMap()
if err != nil {
return err
}

for i := range p.Repositories {
p.Repositories[i].interpolate(properties)
}

return nil
}
90 changes: 90 additions & 0 deletions util/maven/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
)

func TestProject(t *testing.T) {
Expand Down Expand Up @@ -784,3 +785,92 @@ func TestInterpolate(t *testing.T) {
t.Errorf("interpolate:\n(-got, +want):\n%s", diff)
}
}

func TestInterpolateRepositories(t *testing.T) {
proj := Project{
ProjectKey: ProjectKey{
GroupID: "com.example",
ArtifactID: "basic",
Version: "1.2.3",
},
Properties: Properties{
Properties: []Property{
{Name: "repo.id", Value: "my-repo"},
{Name: "repo.url", Value: "https://www.my-repo.example.com"},
{Name: "repo.layout", Value: "default"},
{Name: "dep.version", Value: "1.0.0"},
},
},
Repositories: []Repository{{
ID: "${repo.id}",
URL: "${repo.url}",
Layout: "${repo.layout}",
Releases: RepositoryPolicy{
Enabled: "true",
},
Snapshots: RepositoryPolicy{
Enabled: "false",
},
}, {
ID: "another-repo",
URL: "https://www.another-repo.example.com",
}},
Dependencies: []Dependency{{
GroupID: "org.example",
ArtifactID: "dep",
Version: "${dep.version}",
}},
}
want := Project{
ProjectKey: ProjectKey{
GroupID: "com.example",
ArtifactID: "basic",
Version: "1.2.3",
},
Properties: Properties{
Properties: []Property{
{Name: "repo.id", Value: "my-repo"},
{Name: "repo.url", Value: "https://www.my-repo.example.com"},
{Name: "repo.layout", Value: "default"},
{Name: "dep.version", Value: "1.0.0"},
},
},
Repositories: []Repository{{
ID: "my-repo",
URL: "https://www.my-repo.example.com",
Layout: "default",
Releases: RepositoryPolicy{
Enabled: "true",
},
Snapshots: RepositoryPolicy{
Enabled: "false",
},
}, {
ID: "another-repo",
URL: "https://www.another-repo.example.com",
}},
Dependencies: []Dependency{{
GroupID: "org.example",
ArtifactID: "dep",
Version: "${dep.version}",
}},
}
if err := proj.InterpolateRepositories(); err != nil {
t.Fatalf("InterpolateRepositories() err = %v, want nil", err)
}
if diff := cmp.Diff(proj, want, cmpopts.EquateEmpty()); diff != "" {
t.Errorf("interpolate repositories:\n(-got, +want):\n%s", diff)
}

want.Dependencies = []Dependency{{
GroupID: "org.example",
ArtifactID: "dep",
Version: "1.0.0",
}}
if err := proj.Interpolate(); err != nil {
t.Fatalf("Interpolate() err = %v, want nil", err)
}
if diff := cmp.Diff(proj, want, cmpopts.EquateEmpty()); diff != "" {
t.Errorf("interpolate repositories then interpolate:\n(-got, +want):\n%s", diff)
}
}
Loading