Skip to content

Commit e0e5f27

Browse files
Merge pull request 1Password#211 from MOmarMiraj/omar/fix-go-package
Only assert if go package is present if generating go types
2 parents f1188cb + 3d67aae commit e0e5f27

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

cli/src/main.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,13 @@ fn override_configuration(mut config: Config, options: &Args) -> anyhow::Result<
256256
if let Some(go_package) = options.go_package.as_ref() {
257257
config.go.package = go_package.to_string();
258258
}
259-
assert_go_package_present(&config)?;
259+
260+
if matches!(options.language, Some(args::AvailableLanguage::Go)) {
261+
anyhow::ensure!(
262+
!config.go.package.is_empty(),
263+
"Please provide a package name in the typeshare.toml or using --go-package <package name>"
264+
);
265+
}
260266
}
261267

262268
config.target_os = options.target_os.as_deref().unwrap_or_default().to_vec();
@@ -287,13 +293,3 @@ fn check_parse_errors(parsed_crates: &BTreeMap<CrateName, ParsedData>) -> anyhow
287293
Ok(())
288294
}
289295
}
290-
291-
#[cfg(feature = "go")]
292-
fn assert_go_package_present(config: &Config) -> anyhow::Result<()> {
293-
if config.go.package.is_empty() {
294-
return Err(anyhow!(
295-
"Please provide a package name in the typeshare.toml or using --go-package <package name>"
296-
));
297-
}
298-
Ok(())
299-
}

0 commit comments

Comments
 (0)