Skip to content

Commit d6553b9

Browse files
siegfriedwebersiegfriedweber
committed
chore: Fix clippy warnings
1 parent fe01914 commit d6553b9

2 files changed

Lines changed: 40 additions & 20 deletions

File tree

‎crates/stackable-operator/src/crd/git_sync/v1alpha1_impl.rs‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,27 @@ pub enum Error {
3636
source: crate::builder::pod::container::Error,
3737
},
3838

39+
#[snafu(display("invalid environment variable"))]
40+
InvalidEnvVar {
41+
source: crate::v2::builder::pod::container::Error,
42+
},
43+
44+
#[snafu(display("invalid environment variable name"))]
45+
InvalidEnvVarName {
46+
source: crate::v2::macros::attributed_string_type::Error,
47+
},
48+
49+
#[snafu(display("invalid Secret key"))]
50+
InvalidSecretKey {
51+
source: crate::v2::macros::attributed_string_type::Error,
52+
},
53+
3954
#[snafu(display("invalid Secret name {name:?}"))]
4055
InvalidSecretName {
4156
source: crate::v2::macros::attributed_string_type::Error,
4257
name: String,
4358
},
4459

45-
#[snafu(display("invalid environment variable"))]
46-
InvalidEnvVar {
47-
source: crate::v2::builder::pod::container::Error,
48-
},
49-
5060
#[snafu(display("failed to add needed volumeMount"))]
5161
AddVolumeMount {
5262
source: crate::builder::pod::container::Error,
@@ -105,23 +115,23 @@ impl GitSyncResources {
105115
env_vars = env_vars
106116
.with_secret_key_ref(
107117
&EnvVarName::from_str("GITSYNC_USERNAME")
108-
.expect("must be a valid environment variable name"),
118+
.context(InvalidEnvVarNameSnafu)?,
109119
&SecretName::from_str(git_credentials_secret).with_context(|_| {
110120
InvalidSecretNameSnafu {
111121
name: git_credentials_secret,
112122
}
113123
})?,
114-
&SecretKey::from_str("user").expect("must be a valid Secret key"),
124+
&SecretKey::from_str("user").context(InvalidSecretKeySnafu)?,
115125
)
116126
.with_secret_key_ref(
117127
&EnvVarName::from_str("GITSYNC_PASSWORD")
118-
.expect("must be a valid environment variable name"),
128+
.context(InvalidEnvVarNameSnafu)?,
119129
&SecretName::from_str(git_credentials_secret).with_context(|_| {
120130
InvalidSecretNameSnafu {
121131
name: git_credentials_secret,
122132
}
123133
})?,
124-
&SecretKey::from_str("password").expect("must be a valid Secret key"),
134+
&SecretKey::from_str("password").context(InvalidSecretKeySnafu)?,
125135
);
126136
}
127137
for extra_env_var in extra_env_vars {

‎crates/stackable-operator/src/crd/git_sync/v1alpha2_impl.rs‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,27 @@ pub enum Error {
4949
source: crate::builder::pod::container::Error,
5050
},
5151

52+
#[snafu(display("invalid environment variable"))]
53+
InvalidEnvVar {
54+
source: crate::v2::builder::pod::container::Error,
55+
},
56+
57+
#[snafu(display("invalid environment variable name"))]
58+
InvalidEnvVarName {
59+
source: crate::v2::macros::attributed_string_type::Error,
60+
},
61+
62+
#[snafu(display("invalid Secret key"))]
63+
InvalidSecretKey {
64+
source: crate::v2::macros::attributed_string_type::Error,
65+
},
66+
5267
#[snafu(display("invalid Secret name {name:?}"))]
5368
InvalidSecretName {
5469
source: crate::v2::macros::attributed_string_type::Error,
5570
name: String,
5671
},
5772

58-
#[snafu(display("invalid environment variable"))]
59-
InvalidEnvVar {
60-
source: crate::v2::builder::pod::container::Error,
61-
},
62-
6373
#[snafu(display("failed to add needed volumeMount"))]
6474
AddVolumeMount {
6575
source: crate::builder::pod::container::Error,
@@ -136,35 +146,35 @@ impl GitSyncResources {
136146
env_vars = env_vars
137147
.with_secret_key_ref(
138148
&EnvVarName::from_str("GITSYNC_USERNAME")
139-
.expect("must be a valid environment variable name"),
149+
.context(InvalidEnvVarNameSnafu)?,
140150
&SecretName::from_str(basic_auth_secret_name).with_context(|_| {
141151
InvalidSecretNameSnafu {
142152
name: basic_auth_secret_name,
143153
}
144154
})?,
145-
&SecretKey::from_str("user").expect("must be a valid Secret key"),
155+
&SecretKey::from_str("user").context(InvalidSecretKeySnafu)?,
146156
)
147157
.with_secret_key_ref(
148158
&EnvVarName::from_str("GITSYNC_PASSWORD")
149-
.expect("must be a valid environment variable name"),
159+
.context(InvalidEnvVarNameSnafu)?,
150160
&SecretName::from_str(basic_auth_secret_name).with_context(|_| {
151161
InvalidSecretNameSnafu {
152162
name: basic_auth_secret_name,
153163
}
154164
})?,
155-
&SecretKey::from_str("password").expect("must be a valid Secret key"),
165+
&SecretKey::from_str("password").context(InvalidSecretKeySnafu)?,
156166
);
157167
}
158168
if let Some(Credentials::SshPrivateKeySecretName { .. }) = git_sync.credentials {
159169
env_vars = env_vars
160170
.with_value(
161171
&EnvVarName::from_str("GITSYNC_SSH_KEY_FILE")
162-
.expect("must be a valid environment variable name"),
172+
.context(InvalidEnvVarNameSnafu)?,
163173
format!("{SSH_MOUNT_PATH_PREFIX}-{i}/key"),
164174
)
165175
.with_value(
166176
&EnvVarName::from_str("GITSYNC_SSH_KNOWN_HOSTS_FILE")
167-
.expect("must be a valid environment variable name"),
177+
.context(InvalidEnvVarNameSnafu)?,
168178
format!("{SSH_MOUNT_PATH_PREFIX}-{i}/knownHosts"),
169179
);
170180
}

0 commit comments

Comments
 (0)