Deuxfleurs/garage
48
56
Fork 73
Code Issues 99 Pull requests 13 Releases 30 Wiki Activity

Configure structopt to report the right version #352

Merged
quentin merged 1 commit from bug/reported-version into main 2022-08-12 08:18:16 +00:00
Conversation 0 Commits 1 Files changed 12 +97 -90
quentin commented 2022-08-10 13:09:38 +00:00
Owner
Copy link

By default, structopt reports the value provided by
the env var CARGO_PKG_VERSION, feeded by Cargo when reading
Cargo.toml. However for Garage we use a versioning based on git,
so we often report a version that is behind the real version.
In this commit, we create garage_util::version::garage() that
reports the right version and configure all structopt subcommands
to call this function instead of using the env var.

Fix #350

You can try it by yourself, I tagged this commit with v0.7.2_ci-test-2 in git and then:

$ wget garagehq.deuxfleurs.fr/_releases/v0.7.2_ci-test-2/x86_64-unknown-linux-musl/garage
$ chmod +x garage
$ ./garage --version
garage v0.7.2_ci-test-2
$ ./garage bucket list --version
garage-bucket-list v0.7.2_ci-test-2
By default, structopt reports the value provided by the env var CARGO_PKG_VERSION, feeded by Cargo when reading Cargo.toml. However for Garage we use a versioning based on git, so we often report a version that is behind the real version. In this commit, we create garage_util::version::garage() that reports the right version and configure all structopt subcommands to call this function instead of using the env var. Fix #350 You can try it by yourself, I tagged this commit with `v0.7.2_ci-test-2` in git and then: ``` $ wget garagehq.deuxfleurs.fr/_releases/v0.7.2_ci-test-2/x86_64-unknown-linux-musl/garage $ chmod +x garage $ ./garage --version garage v0.7.2_ci-test-2 $ ./garage bucket list --version garage-bucket-list v0.7.2_ci-test-2 ```
quentin force-pushed bug/reported-version from 6e58748545 to e9488683e0 2022-08-10 13:50:53 +00:00 Compare
quentin force-pushed bug/reported-version from e9488683e0 to e757bbe181 2022-08-10 13:56:34 +00:00 Compare
quentin force-pushed bug/reported-version from e757bbe181 to c2554d0953 2022-08-10 14:32:03 +00:00 Compare
quentin changed title from Configure structopt to report the right version to WIP: Configure structopt to report the right version 2022-08-10 18:12:30 +00:00
quentin force-pushed bug/reported-version from c2554d0953 to 4a693ff29e 2022-08-10 20:34:55 +00:00 Compare
quentin force-pushed bug/reported-version from 4a693ff29e to 2c7bae935a 2022-08-11 08:23:28 +00:00 Compare
quentin changed title from WIP: Configure structopt to report the right version to Configure structopt to report the right version 2022-08-11 10:02:39 +00:00
quentin merged commit 2c7bae935a into main 2022-08-12 08:18:16 +00:00
quentin deleted branch bug/reported-version 2022-08-12 08:18:18 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
action
check-aws
The behaviour should be checked against AWS S3

  
action
discussion-needed
We need to discuss if the feature is desirable and/or better specify the envisioned behavior or technical implementation

  
action
for-external-contributors
Core team does not plan working on this in the near future however an external contribution will be reviewed & merged

  
action
for-newcomers
An issue that should be newcomer friendly.

  
action
more-info-needed
More information is needed to investigate this issue

  
action
need-funding
This issue represents lots of work, we need to find money to pay our core team work

  
action
triage-required
It's not very clear what we want to do with this issue yet, more thoughts is required

  
kind
correctness
Issues of theoretical correctness that may impact edge-case scenarios

  
kind
ideas
For abstract ideas/proposal to make Garage better, to better communicate our not yet achieved aims

  
kind
improvement
Feature requests that do not fall in other categories

  
kind
performance
Deceptive performance observed OR idea to improve performances

  
kind
testing
Functional tests, integration tests, Jepsen, etc.

  
kind
usability
Propositions to make Garage easier to operate, by improving error reporting, CLI, etc.

  
kind
wrong-behavior
Unintended behavior

  
prio
critical
Could impact integrity or availability of production clusters

  
prio
low
For issues that we don't want to spend time on until made absolutely necessary

  
scope
admin-api
Issues concerning the administration API

  
scope
background-healing
Background healing covers repair tasks, anti-entropy, merkle trees, etc. ; everything related to replicating data appropriately.

  
scope
build
Issues with Nix, Drone, Rust Compiler, etc.

  
scope
documentation

  
scope
k8s
Kubernetes related, including Helm Charts

  
scope
layout
Linked to the cluster layout and storage management

  
scope
metadata
Metadata Engine (LMDB, sqlite, etc.)

  
scope
ops
Operations related to operations/maintenance issue, tooling related (like CLI missing info ; impossible, too dangerous, too complicated migration, etc.)

  
scope
rpc
Linked to RPC

  
scope
s3-api
Related to the S3 API (especially compatibility issues).

  
scope
security
Cryptography-related, auth-related, authorization-related issues

  
scope
telemetry
OpenTelemetry (traces, metrics, etc.)

No labels
action
check-aws
action
discussion-needed
action
for-external-contributors
action
for-newcomers
action
more-info-needed
action
need-funding
action
triage-required
kind
correctness
kind
ideas
kind
improvement
kind
performance
kind
testing
kind
usability
kind
wrong-behavior
prio
critical
prio
low
scope
admin-api
scope
background-healing
scope
build
scope
documentation
scope
k8s
scope
layout
scope
metadata
scope
ops
scope
rpc
scope
s3-api
scope
security
scope
telemetry
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Deuxfleurs/garage#352
No description provided.
Delete branch "bug/reported-version"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?