Skip to content

Commit c1a6f6d

Browse files
gcaveliergcavelier
authored
Merge pull request #115 from cnieg/rust-1.91
Update to rust 1.91
2 parents 50ad922 + 87a88f9 commit c1a6f6d

File tree

7 files changed

+67
-69
lines changed

7 files changed

+67
-69
lines changed

‎.github/workflows/pr_pipeline.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: cargo test
3030

3131
- name: Install GitVersion
32-
uses: gittools/actions/gitversion/setup@v4.1.0
32+
uses: gittools/actions/gitversion/setup@v4.2.0
3333

3434
- name: Create GitVersion.yml
3535
run: |
@@ -40,9 +40,13 @@ jobs:
4040
no-bump-message: '(none|skip|no-release|trivial|docs|documentation|style|refactor|chore|chore\(deps\)|test):'
4141
EOF
4242
43-
- name: Determine Version
43+
- name: Run GitVersion
4444
id: gitversion
45-
uses: gittools/actions/gitversion/[email protected]
45+
uses: gittools/actions/gitversion/[email protected]
46+
47+
- name: Display GitVersion majorMinorPatch
48+
run: |
49+
echo "majorMinorPatch : ${{ env.majorMinorPatch }}"
4650
4751
- name: Set up Docker Buildx
4852
uses: docker/setup-buildx-action@v3

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: cargo test
3030

3131
- name: Install GitVersion
32-
uses: gittools/actions/gitversion/setup@v4.1.0
32+
uses: gittools/actions/gitversion/setup@v4.2.0
3333

3434
- name: Create GitVersion.yml
3535
run: |
@@ -40,9 +40,13 @@ jobs:
4040
no-bump-message: '(none|skip|no-release|trivial|docs|documentation|style|refactor|chore|chore\(deps\)|test):'
4141
EOF
4242
43-
- name: Determine Version
43+
- name: Run GitVersion
4444
id: gitversion
45-
uses: gittools/actions/gitversion/[email protected]
45+
uses: gittools/actions/gitversion/[email protected]
46+
47+
- name: Display GitVersion majorMinorPatch
48+
run: |
49+
echo "majorMinorPatch : ${{ env.majorMinorPatch }}"
4650
4751
- name: Set up Docker Buildx
4852
uses: docker/setup-buildx-action@v3

‎Cargo.lock‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "gitlab-tokens-exporter"
3-
version = "2.5.1"
3+
version = "2.5.2"
44
edition = "2024"
55
description = "Export gitlab tokens remaining validity days as prometheus metrics"
66
license = "Apache-2.0 license"

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.90.0-alpine3.22 AS builder
1+
FROM rust:1.91.1-alpine3.22 AS builder
22

33
RUN apk update && apk add --no-cache musl-dev
44

‎src/gitlab/token.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub enum AccessLevel {
1919
}
2020

2121
impl Display for AccessLevel {
22-
#[expect(clippy::min_ident_chars, reason = "Parameter name from std trait")]
2322
#[expect(clippy::absolute_paths, reason = "Use a specific Result type")]
2423
fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
2524
write!(
@@ -95,10 +94,6 @@ pub enum AccessTokenScope {
9594

9695
#[expect(clippy::absolute_paths, reason = "Specific Trait and Result type")]
9796
impl core::fmt::Display for AccessTokenScope {
98-
#[expect(
99-
clippy::min_ident_chars,
100-
reason = "Using the default function parameter name"
101-
)]
10297
fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
10398
match *self {
10499
Self::AiFeatures => write!(f, "ai_features"),
@@ -187,10 +182,6 @@ pub enum PersonalAccessTokenScope {
187182

188183
#[expect(clippy::absolute_paths, reason = "Specific Trait and Result type")]
189184
impl core::fmt::Display for PersonalAccessTokenScope {
190-
#[expect(
191-
clippy::min_ident_chars,
192-
reason = "Using the default function parameter name"
193-
)]
194185
fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
195186
match *self {
196187
Self::AdminMode => write!(f, "admin_mode"),

‎src/state_actor.rs‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -482,47 +482,46 @@ pub async fn gitlab_tokens_actor(
482482

483483
// We now wait for some messages
484484
loop {
485-
let msg = receiver.recv().await;
486-
if let Some(msg_value) = msg {
487-
match msg_value {
488-
Message::Get { respond_to } => {
489-
debug!("received Message::Get");
490-
respond_to.send(state.clone()).unwrap_or_else(|_| {
491-
warn!("Failed to send reponse : oneshot channel was closed");
492-
});
493-
}
494-
Message::Update => {
495-
// We are going to spawn a async task to get the data from gitlab.
496-
// This task will send us Message::Set with the result to
497-
// update our 'state' variable
498-
debug!("received Message::Update");
499-
tokio::spawn(get_gitlab_data(
500-
gitlab_connection.clone(),
501-
owned_entities_only,
502-
sender.clone(),
503-
max_concurrent_requests,
504-
skip_users_tokens,
505-
skip_non_expiring_tokens,
506-
));
507-
}
508-
Message::Set(gitlab_data) => {
509-
debug!("received Message::Set");
510-
match gitlab_data {
511-
Ok(data) => {
512-
if data.is_empty() {
513-
warn!("No token has been found");
514-
state = ActorState::NoToken;
515-
} else {
516-
state = ActorState::Loaded(data);
517-
}
485+
let Some(msg) = receiver.recv().await else {
486+
error!("recv failed");
487+
break;
488+
};
489+
490+
match msg {
491+
Message::Get { respond_to } => {
492+
debug!("received Message::Get");
493+
respond_to.send(state.clone()).unwrap_or_else(|_| {
494+
warn!("Failed to send reponse : oneshot channel was closed");
495+
});
496+
}
497+
Message::Update => {
498+
// We are going to spawn a async task to get the data from gitlab.
499+
// This task will send us Message::Set with the result to
500+
// update our 'state' variable
501+
debug!("received Message::Update");
502+
tokio::spawn(get_gitlab_data(
503+
gitlab_connection.clone(),
504+
owned_entities_only,
505+
sender.clone(),
506+
max_concurrent_requests,
507+
skip_users_tokens,
508+
skip_non_expiring_tokens,
509+
));
510+
}
511+
Message::Set(gitlab_data) => {
512+
debug!("received Message::Set");
513+
match gitlab_data {
514+
Ok(data) => {
515+
if data.is_empty() {
516+
warn!("No token has been found");
517+
state = ActorState::NoToken;
518+
} else {
519+
state = ActorState::Loaded(data);
518520
}
519-
Err(err) => state = ActorState::Error(err),
520521
}
522+
Err(err) => state = ActorState::Error(err),
521523
}
522524
}
523-
} else {
524-
error!("recv failed");
525-
break;
526525
}
527526
}
528527
}

0 commit comments

Comments
 (0)