Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
heroku-buildpack-nodejs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
heroku-buildpack-nodejs
Commits
d9867fee
Unverified
Commit
d9867fee
authored
Apr 19, 2019
by
Jeremy Morrell
Committed by
GitHub
Apr 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add functions for choosing a release based on semver and exact match (#653)
parent
4bae05b1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
150 additions
and
0 deletions
+150
-0
main.go
cmd/resolve-version/main.go
+67
-0
main_test.go
cmd/resolve-version/main_test.go
+83
-0
No files found.
cmd/resolve-version/main.go
View file @
d9867fee
...
@@ -8,6 +8,7 @@ import (
...
@@ -8,6 +8,7 @@ import (
"net/http"
"net/http"
"net/url"
"net/url"
"regexp"
"regexp"
"sort"
"time"
"time"
"github.com/Masterminds/semver"
"github.com/Masterminds/semver"
...
@@ -40,6 +41,72 @@ type release struct {
...
@@ -40,6 +41,72 @@ type release struct {
version
*
semver
.
Version
version
*
semver
.
Version
}
}
type
matchResult
struct
{
versionRequirement
string
release
release
matched
bool
}
func
matchReleaseSemver
(
releases
[]
release
,
versionRequirement
string
)
(
matchResult
,
error
)
{
constraints
,
err
:=
semver
.
NewConstraint
(
versionRequirement
)
if
err
!=
nil
{
return
matchResult
{},
err
}
filtered
:=
[]
release
{}
for
_
,
release
:=
range
releases
{
if
constraints
.
Check
(
release
.
version
)
{
filtered
=
append
(
filtered
,
release
)
}
}
versions
:=
make
([]
*
semver
.
Version
,
len
(
filtered
))
for
i
,
rel
:=
range
filtered
{
versions
[
i
]
=
rel
.
version
}
coll
:=
semver
.
Collection
(
versions
)
sort
.
Sort
(
coll
)
if
len
(
coll
)
==
0
{
return
matchResult
{
versionRequirement
:
versionRequirement
,
release
:
release
{},
matched
:
false
,
},
nil
}
resolvedVersion
:=
coll
[
len
(
coll
)
-
1
]
for
_
,
rel
:=
range
filtered
{
if
rel
.
version
.
Equal
(
resolvedVersion
)
{
return
matchResult
{
versionRequirement
:
versionRequirement
,
release
:
rel
,
matched
:
true
,
},
nil
}
}
return
matchResult
{},
errors
.
New
(
"Unknown error"
)
}
func
matchReleaseExact
(
releases
[]
release
,
version
string
)
matchResult
{
for
_
,
release
:=
range
releases
{
if
release
.
version
.
String
()
==
version
{
return
matchResult
{
versionRequirement
:
version
,
release
:
release
,
matched
:
true
,
}
}
}
return
matchResult
{
versionRequirement
:
version
,
release
:
release
{},
matched
:
false
,
}
}
// Parses an S3 key into a struct of information about that release
// Parses an S3 key into a struct of information about that release
// Example input: node/release/linux-x64/node-v6.2.2-linux-x64.tar.gz
// Example input: node/release/linux-x64/node-v6.2.2-linux-x64.tar.gz
func
parseObject
(
key
string
)
(
release
,
error
)
{
func
parseObject
(
key
string
)
(
release
,
error
)
{
...
...
cmd/resolve-version/main_test.go
View file @
d9867fee
...
@@ -3,6 +3,8 @@ package main
...
@@ -3,6 +3,8 @@ package main
import
(
import
(
"testing"
"testing"
"github.com/Masterminds/semver"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/assert"
)
)
...
@@ -39,3 +41,84 @@ func TestParseObject(t *testing.T) {
...
@@ -39,3 +41,84 @@ func TestParseObject(t *testing.T) {
assert
.
NotNil
(
t
,
err
)
assert
.
NotNil
(
t
,
err
)
assert
.
Equal
(
t
,
err
.
Error
(),
"Failed to parse key: something/weird"
)
assert
.
Equal
(
t
,
err
.
Error
(),
"Failed to parse key: something/weird"
)
}
}
func
genReleasesFromArray
(
versions
[]
string
)
[]
release
{
out
:=
[]
release
{}
for
_
,
version
:=
range
versions
{
out
=
append
(
out
,
release
{
binary
:
"node"
,
stage
:
"release"
,
platform
:
"linux-x64"
,
url
:
"https://heroku.com"
,
version
:
semver
.
MustParse
(
version
),
})
}
return
out
}
func
TestMatchReleaseExact
(
t
*
testing
.
T
)
{
releases
:=
genReleasesFromArray
([]
string
{
"1.0.0"
,
"1.0.1"
,
"1.0.2"
})
result
:=
matchReleaseExact
(
releases
,
"1.0.1"
)
assert
.
True
(
t
,
result
.
matched
)
assert
.
Equal
(
t
,
result
.
release
.
version
.
String
(),
"1.0.1"
)
result
=
matchReleaseExact
(
releases
,
"1.0.2"
)
assert
.
True
(
t
,
result
.
matched
)
assert
.
Equal
(
t
,
result
.
release
.
version
.
String
(),
"1.0.2"
)
result
=
matchReleaseExact
(
releases
,
"1.0.3"
)
assert
.
False
(
t
,
result
.
matched
)
assert
.
Equal
(
t
,
result
.
versionRequirement
,
"1.0.3"
)
}
type
Case
struct
{
input
string
output
string
}
func
TestMatchReleaseSemver
(
t
*
testing
.
T
)
{
// The current supported releases as of 9/16/2019
releases
:=
genReleasesFromArray
([]
string
{
"10.0.0"
,
"10.1.0"
,
"10.10.0"
,
"10.11.0"
,
"10.12.0"
,
"10.13.0"
,
"10.14.0"
,
"10.14.1"
,
"10.14.2"
,
"10.15.0"
,
"10.15.1"
,
"10.15.2"
,
"10.15.3"
,
"10.2.0"
,
"10.2.1"
,
"10.3.0"
,
"10.4.0"
,
"10.4.1"
,
"10.5.0"
,
"10.6.0"
,
"10.7.0"
,
"10.8.0"
,
"10.9.0"
,
"11.0.0"
,
"11.1.0"
,
"11.10.0"
,
"11.10.1"
,
"11.11.0"
,
"11.12.0"
,
"11.13.0"
,
"11.14.0"
,
"11.2.0"
,
"11.3.0"
,
"11.4.0"
,
"11.5.0"
,
"11.6.0"
,
"11.7.0"
,
"11.8.0"
,
"11.9.0"
,
"6.0.0"
,
"6.1.0"
,
"6.10.0"
,
"6.10.1"
,
"6.10.2"
,
"6.10.3"
,
"6.11.0"
,
"6.11.1"
,
"6.11.2"
,
"6.11.3"
,
"6.11.4"
,
"6.11.5"
,
"6.12.0"
,
"6.12.1"
,
"6.12.2"
,
"6.12.3"
,
"6.13.0"
,
"6.13.1"
,
"6.14.0"
,
"6.14.1"
,
"6.14.2"
,
"6.14.3"
,
"6.14.4"
,
"6.15.0"
,
"6.15.1"
,
"6.16.0"
,
"6.17.0"
,
"6.17.1"
,
"6.2.0"
,
"6.2.1"
,
"6.2.2"
,
"6.3.0"
,
"6.3.1"
,
"6.4.0"
,
"6.5.0"
,
"6.6.0"
,
"6.7.0"
,
"6.8.0"
,
"6.8.1"
,
"6.9.0"
,
"6.9.1"
,
"6.9.2"
,
"6.9.3"
,
"6.9.4"
,
"6.9.5"
,
"8.0.0"
,
"8.1.0"
,
"8.1.1"
,
"8.1.2"
,
"8.1.3"
,
"8.1.4"
,
"8.10.0"
,
"8.11.0"
,
"8.11.1"
,
"8.11.2"
,
"8.11.3"
,
"8.11.4"
,
"8.12.0"
,
"8.13.0"
,
"8.14.0"
,
"8.14.1"
,
"8.15.0"
,
"8.15.1"
,
"8.16.0"
,
"8.2.0"
,
"8.2.1"
,
"8.3.0"
,
"8.4.0"
,
"8.5.0"
,
"8.6.0"
,
"8.7.0"
,
"8.8.0"
,
"8.8.1"
,
"8.9.0"
,
"8.9.1"
,
"8.9.2"
,
"8.9.3"
,
"8.9.4"
,
})
// Semver requirements pulled from real apps
cases
:=
[]
Case
{
Case
{
input
:
"10.x"
,
output
:
"10.15.3"
},
Case
{
input
:
"10.*"
,
output
:
"10.15.3"
},
Case
{
input
:
"10"
,
output
:
"10.15.3"
},
Case
{
input
:
"8.x"
,
output
:
"8.16.0"
},
Case
{
input
:
"^8.11.3"
,
output
:
"8.16.0"
},
Case
{
input
:
"~8.11.3"
,
output
:
"8.11.4"
},
Case
{
input
:
">= 6.0.0"
,
output
:
"11.14.0"
},
Case
{
input
:
"^6.9.0 || ^8.9.0 || ^10.13.0"
,
output
:
"10.15.3"
},
Case
{
input
:
"6.* || 8.* || >= 10.*"
,
output
:
"11.14.0"
},
// TODO: these fail to parse with the library
// Case{input: ">= 6.11.1 <= 10", output: "8.16.0"},
// Case{input: ">=8.10 <11", output: "10.15.3"},
}
for
_
,
c
:=
range
cases
{
result
,
err
:=
matchReleaseSemver
(
releases
,
c
.
input
)
assert
.
Nil
(
t
,
err
)
assert
.
True
(
t
,
result
.
matched
)
assert
.
Equal
(
t
,
result
.
release
.
version
.
String
(),
c
.
output
)
}
result
,
err
:=
matchReleaseSemver
(
releases
,
"99.x"
)
assert
.
Nil
(
t
,
err
)
assert
.
False
(
t
,
result
.
matched
)
assert
.
Equal
(
t
,
result
.
versionRequirement
,
"99.x"
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment