SSH: use the new container name format #2648
Conversation
pipex
changed the title
pipex
force-pushed
the
simplify-container-names
branch
from
69214cc
to
832de64
Compare
pipex
force-pushed
the
simplify-container-names
branch
2 times, most recently
from
1485514
to
cefbb3d
Compare
The supervisor is changing the container name format from `<serviceName>_<imageId>_<releaseId>_<commit>` to `<serviceName>_<commit>`. This updates the SSH command to work with both formats. Change-type: minor Depends-on: balena-os/balena-supervisor#2136
pipex
force-pushed
the
simplify-container-names
branch
from
952c34a
to
b11160b
Compare
pipex
force-pushed
the
simplify-container-names
branch
from
b11160b
to
8eed1e0
Compare
| const regex = new RegExp( | ||
| `(?:^|\\/)${escapeRegExp( | ||
| opts.service, | ||
| )}_(?:\\d+_)?(?:\\d+_)?(?:[a-f0-9]*)?$`, |
There was a problem hiding this comment.
How about v ?
| )}_(?:\\d+_)?(?:\\d+_)?(?:[a-f0-9]*)?$`, | |
| )}_(?:(?:\\d+_\\d+)|(?:[a-f0-9]+)$)` |
There was a problem hiding this comment.
Is not really an OR, it can have numeric ids, numeric ids with commit or just commit. I think I can merge the numeric matching though
| // main_a000b111c222d333e444f555a666b777 | ||
| // main_10ca12e1ea5e | ||
| const nameRegex = | ||
| /(?:^|\/)([a-zA-Z0-9_-]+?)_(?:\d+_)?(?:\d+_)?(?:[a-f0-9]*)?$/; |
There was a problem hiding this comment.
How about v which is slightly stricter?
| /(?:^|\/)([a-zA-Z0-9_-]+?)_(?:\d+_)?(?:\d+_)?(?:[a-f0-9]*)?$/; | |
| /(?:^|\/)([a-zA-Z0-9_-]+?)_(?:(?:\d+_\d+(?:_[a-f0-9]+)?)|(?:[a-f0-9]+))$/; |
As far as I can tell though a user naming a service december_12_2023 would make the name ambiguous 🤔
There was a problem hiding this comment.
Nice catch, unfortunately that doesn't work either :(
'december_12_2023_11_22'.match(/(?:^|\/)([a-zA-Z0-9_-]+?)_(?:(?:\d+_\d+(?:_[a-f0-9]+)?)|(?:[a-f0-9]+))$/)
[
'december_12_2023_11_22',
'december_12',
index: 0,
input: 'december_12_2023_11_22',
groups: undefined
]
There was a problem hiding this comment.
Without lazy ? it matches the first number for some reason
'december_12_2023_11_22'.match(/(?:^|\/)([a-zA-Z0-9_-]+)_(?:(?:\d+_\d+(?:_[a-f0-9]+)?)|(?:[a-f0-9]+))$/)
[
'december_12_2023_11_22',
'december_12_2023_11',
index: 0,
input: 'december_12_2023_11_22',
groups: undefined
]
There was a problem hiding this comment.
Hmm, 'december_12_2023_11_22` matches both syntaxes
name 'december_12'
first id '2023'
second id '11'
commit '22'
It also matches
name 'december_12_2023'
first id '11'
second id '22'
commit 'none'
There was a problem hiding this comment.
I suspect the first one is the least of evils as container names have a release commit for a while
There was a problem hiding this comment.
What do you think @thgreasi ?
There was a problem hiding this comment.
Alternatively since at this point we alredy have access to the device, we could test depending on SV version, although that sounds a bit overkill particularly since we want the service name list just for the error message
The supervisor is changing the container name format from
<serviceName>_<imageId>_<releaseId>_<commit>to<serviceName>_<commit>. This updates the SSH command to work with bothformats.
Change-type: minor
Depends-on: balena-os/balena-supervisor#2136