difftreelog
feat use fleet-tf
in: trunk
10 files changed
cmds/fleet/Cargo.tomldiffbeforeafterboth--- a/cmds/fleet/Cargo.toml
+++ b/cmds/fleet/Cargo.toml
@@ -45,10 +45,10 @@
human-repr = { version = "1.1", optional = true }
indicatif = { version = "0.18", optional = true }
nom = "8.0.0"
+opentelemetry = "0.30.0"
+opentelemetry_sdk = "0.30.0"
tracing-indicatif = { version = "0.3", optional = true }
tracing-opentelemetry = "0.31.0"
-opentelemetry = "0.30.0"
-opentelemetry_sdk = "0.30.0"
[features]
default = []
cmds/fleet/src/cmds/tf.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/tf.rs
+++ b/cmds/fleet/src/cmds/tf.rs
@@ -38,7 +38,7 @@
{
debug!("generating terraform configs");
let system = &config.local_system;
- let config = &config.config_field;
+ let config = &config.flake_outputs;
let data = nix_go!(config.tf({ system }));
let data: PathBuf = spawn_blocking(move || data.build("out"))
.await
crates/fleet-base/src/host.rsdiffbeforeafterboth--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -34,6 +34,8 @@
pub nix_args: Vec<OsString>,
/// fleet_config.config
pub config_field: Value,
+ /// flake.output
+ pub flake_outputs: Value,
// TODO: Remove with connectivity refactor
pub localhost: String,
crates/fleet-base/src/opts.rsdiffbeforeafterboth1use std::{2 collections::BTreeMap,3 env::current_dir,4 ffi::OsString,5 str::FromStr,6 sync::{Arc, Mutex},7};89use anyhow::{Context, Result, bail};10use nix_eval::{11 FetchSettings, FlakeLockFlags, FlakeReference, FlakeReferenceParseFlags, FlakeSettings, Value,12 gc_now, nix_go, util::assert_warn,13};14use nom::{15 Parser,16 bytes::complete::take_while1,17 character::complete::char,18 combinator::{map, opt},19 multi::separated_list1,20 sequence::{preceded, separated_pair},21};2223use crate::{24 fleetdata::FleetData,25 host::{Config, ConfigHost, FleetConfigInternals},26};2728#[derive(Clone)]29pub enum HostItem {30 Host {31 name: String,32 attrs: BTreeMap<String, String>,33 },34 Tag {35 name: String,36 attrs: BTreeMap<String, String>,37 },38}39fn host_item_parser(input: &str) -> Result<HostItem, String> {40 fn err_to_string(err: nom::Err<nom::error::Error<&str>>) -> String {41 err.to_string()42 }4344 let (input, is_tag) = map(opt(char('@')), |c| c.is_some())45 .parse_complete(input)46 .map_err(err_to_string)?;47 let (input, name) = map(48 take_while1(|v| v != ',' && v != '?' && v != '@'),49 str::to_owned,50 )51 .parse_complete(input)52 .map_err(err_to_string)?;5354 let kw_item = separated_pair(55 map(take_while1(|v| v != '&' && v != '='), str::to_owned),56 char('='),57 map(take_while1(|v| v != '&'), str::to_owned),58 );59 let kw = map(separated_list1(char('&'), kw_item), |vec| {60 vec.into_iter().collect::<BTreeMap<_, _>>()61 });62 let mut opt_kw = map(opt(preceded(char('?'), kw)), Option::unwrap_or_default);6364 let (input, attrs) = opt_kw.parse_complete(input).map_err(err_to_string)?;6566 if !input.is_empty() {67 return Err(format!("unexpected trailing input: {input:?}"));68 }69 Ok(if is_tag {70 HostItem::Tag { name, attrs }71 } else {72 HostItem::Host { name, attrs }73 })74}7576// TODO: Rename to HostSelector77#[derive(clap::Parser, Clone)]78pub struct FleetOpts {79 /// All hosts except those would be skipped80 #[clap(long, number_of_values = 1, value_parser = host_item_parser)]81 pub only: Vec<HostItem>,8283 /// Hosts to skip84 #[clap(long, number_of_values = 1)]85 pub skip: Vec<String>,8687 /// Host, which should be threaten as current machine88 // TODO: Replace with connectivity refactor89 #[clap(long, default_value_t = hostname::get().expect("unknown hostname").to_str().expect("hostname is not utf-8").to_owned())]90 pub localhost: String,9192 /// Override detected system for host, to perform builds via93 /// binfmt-declared qemu instead of trying to crosscompile94 #[clap(long, default_value = env!("NIX_SYSTEM"))]95 pub local_system: String,9697 /// By default fleet continues on single derivation build failure98 /// this flag makes command fail immediately99 ///100 /// Opposite of Nix's --keep-going101 #[clap(long)]102 pub fail_fast: bool,103}104105impl FleetOpts {106 pub async fn filter_skipped(107 &self,108 hosts: impl IntoIterator<Item = ConfigHost>,109 ) -> Result<Vec<ConfigHost>> {110 let mut out = Vec::new();111 for host in hosts {112 if self.should_skip(&host).await? {113 continue;114 }115 out.push(host);116 }117 Ok(out)118 }119 pub async fn should_skip(&self, host: &ConfigHost) -> Result<bool> {120 if self.skip.iter().any(|h| h as &str == host.name) {121 return Ok(true);122 }123 if self.only.is_empty() {124 return Ok(false);125 }126 let mut have_group_matches = false;127 for item in self.only.iter() {128 match item {129 HostItem::Host { name, .. } if *name == host.name => {130 return Ok(false);131 }132 HostItem::Tag { .. } => {133 have_group_matches = true;134 }135 _ => {}136 }137 }138 if have_group_matches {139 let host_tags = host.tags().await?;140 for item in self.only.iter() {141 match item {142 HostItem::Tag { name, .. } if host_tags.contains(name) => {143 return Ok(false);144 }145 _ => {}146 }147 }148 }149 Ok(true)150 }151 pub async fn action_attr<T: FromStr>(&self, host: &ConfigHost, attr: &str) -> Result<Option<T>>152 where153 T::Err: Sync,154 anyhow::Error: From<T::Err>,155 {156 let str = self.action_attr_str(host, attr).await?;157 Ok(str.map(|v| T::from_str(&v)).transpose()?)158 }159 pub async fn action_attr_str(&self, host: &ConfigHost, attr: &str) -> Result<Option<String>> {160 if self.only.is_empty() {161 return Ok(None);162 }163 let mut have_group_matches = false;164 for item in self.only.iter() {165 match item {166 HostItem::Host { name, attrs }167 if *name == host.name && attrs.contains_key(attr) =>168 {169 return Ok(attrs.get(attr).cloned());170 }171 HostItem::Tag { attrs, .. } if attrs.contains_key(attr) => {172 have_group_matches = true;173 }174 _ => {}175 }176 }177 if have_group_matches {178 let host_tags = host.tags().await?;179 for item in self.only.iter() {180 match item {181 HostItem::Tag { name, attrs }182 if host_tags.contains(name) && attrs.contains_key(attr) =>183 {184 return Ok(attrs.get(attr).cloned());185 }186 _ => {}187 }188 }189 }190 Ok(None)191 }192 pub fn is_local(&self, host: &str) -> bool {193 self.localhost == host194 }195196 // TODO: Config should be detached from opts.197 pub async fn build(&self, nix_args: Vec<OsString>, assert: bool) -> Result<Config> {198 let cwd = current_dir()?;199 let mut directory = cwd.clone();200 let mut fleet_data_path = directory.join("fleet.nix");201 while !fleet_data_path.is_file() {202 // fleet.nix203 fleet_data_path.pop();204 if !directory.pop() || !fleet_data_path.pop() {205 bail!(206 "fleet.nix not found at {} or any of the parent directories",207 cwd.display()208 );209 }210 fleet_data_path.push("fleet.nix");211 }212 let bytes =213 std::fs::read_to_string(&fleet_data_path).context("reading fleet state (fleet.nix)")?;214 let data: Mutex<FleetData> = nixlike::parse_str(&bytes)?;215216 let mut fetch_settings = FetchSettings::new();217 fetch_settings.set(c"warn-dirty", c"false");218219 let mut flake_settings = FlakeSettings::new()?;220 let mut parse = FlakeReferenceParseFlags::new(&flake_settings)?;221 // For some reason, lazy trees not being used when there is no base dir set222 parse.set_base_dir("/")?;223224 let (mut flake, _) = FlakeReference::new(225 directory226 .to_str()227 .ok_or_else(|| anyhow::anyhow!("fleet dir should have utf-8 path"))?,228 &flake_settings,229 &parse,230 &fetch_settings,231 )?;232233 let lock = FlakeLockFlags::new(&flake_settings)?;234235 let flake = flake.lock(&fetch_settings, &flake_settings, &lock)?;236237 let flake = flake.get_attrs(&mut flake_settings)?;238239 let builtins_field = Value::eval("builtins")?;240241 let fleet_root = flake.get_field("fleetConfigurations")?;242 let data_val = Value::serialized(&data)?;243 let fleet_field = nix_go!(fleet_root.default(data_val));244245 let config_field = nix_go!(fleet_field.config);246247 if assert {248 assert_warn("fleet config evaluation", &config_field)249 .await250 .context("failed to verify assertions")?;251 }252253 let import = nix_go!(builtins_field.import);254 let overlays = nix_go!(config_field.nixpkgs.overlays);255 let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing);256 let nixpkgs_imported = nix_go!(import(nixpkgs));257258 let default_pkgs = nix_go!(nixpkgs_imported(Obj {259 overlays,260 system: self.local_system.clone(),261 }));262263 if cfg!(debug_assertions) {264 gc_now();265 }266267 Ok(Config(Arc::new(FleetConfigInternals {268 directory,269 data,270 local_system: self.local_system.clone(),271 nix_args,272 config_field,273 default_pkgs,274 nixpkgs,275 localhost: self.localhost.to_owned(),276 })))277 }278}1use std::{2 collections::BTreeMap,3 env::current_dir,4 ffi::OsString,5 str::FromStr,6 sync::{Arc, Mutex},7};89use anyhow::{Context, Result, bail};10use nix_eval::{11 FetchSettings, FlakeLockFlags, FlakeReference, FlakeReferenceParseFlags, FlakeSettings, Value,12 gc_now, nix_go, util::assert_warn,13};14use nom::{15 Parser,16 bytes::complete::take_while1,17 character::complete::char,18 combinator::{map, opt},19 multi::separated_list1,20 sequence::{preceded, separated_pair},21};2223use crate::{24 fleetdata::FleetData,25 host::{Config, ConfigHost, FleetConfigInternals},26};2728#[derive(Clone)]29pub enum HostItem {30 Host {31 name: String,32 attrs: BTreeMap<String, String>,33 },34 Tag {35 name: String,36 attrs: BTreeMap<String, String>,37 },38}39fn host_item_parser(input: &str) -> Result<HostItem, String> {40 fn err_to_string(err: nom::Err<nom::error::Error<&str>>) -> String {41 err.to_string()42 }4344 let (input, is_tag) = map(opt(char('@')), |c| c.is_some())45 .parse_complete(input)46 .map_err(err_to_string)?;47 let (input, name) = map(48 take_while1(|v| v != ',' && v != '?' && v != '@'),49 str::to_owned,50 )51 .parse_complete(input)52 .map_err(err_to_string)?;5354 let kw_item = separated_pair(55 map(take_while1(|v| v != '&' && v != '='), str::to_owned),56 char('='),57 map(take_while1(|v| v != '&'), str::to_owned),58 );59 let kw = map(separated_list1(char('&'), kw_item), |vec| {60 vec.into_iter().collect::<BTreeMap<_, _>>()61 });62 let mut opt_kw = map(opt(preceded(char('?'), kw)), Option::unwrap_or_default);6364 let (input, attrs) = opt_kw.parse_complete(input).map_err(err_to_string)?;6566 if !input.is_empty() {67 return Err(format!("unexpected trailing input: {input:?}"));68 }69 Ok(if is_tag {70 HostItem::Tag { name, attrs }71 } else {72 HostItem::Host { name, attrs }73 })74}7576// TODO: Rename to HostSelector77#[derive(clap::Parser, Clone)]78pub struct FleetOpts {79 /// All hosts except those would be skipped80 #[clap(long, number_of_values = 1, value_parser = host_item_parser)]81 pub only: Vec<HostItem>,8283 /// Hosts to skip84 #[clap(long, number_of_values = 1)]85 pub skip: Vec<String>,8687 /// Host, which should be threaten as current machine88 // TODO: Replace with connectivity refactor89 #[clap(long, default_value_t = hostname::get().expect("unknown hostname").to_str().expect("hostname is not utf-8").to_owned())]90 pub localhost: String,9192 /// Override detected system for host, to perform builds via93 /// binfmt-declared qemu instead of trying to crosscompile94 #[clap(long, default_value = env!("NIX_SYSTEM"))]95 pub local_system: String,9697 /// By default fleet continues on single derivation build failure98 /// this flag makes command fail immediately99 ///100 /// Opposite of Nix's --keep-going101 #[clap(long)]102 pub fail_fast: bool,103}104105impl FleetOpts {106 pub async fn filter_skipped(107 &self,108 hosts: impl IntoIterator<Item = ConfigHost>,109 ) -> Result<Vec<ConfigHost>> {110 let mut out = Vec::new();111 for host in hosts {112 if self.should_skip(&host).await? {113 continue;114 }115 out.push(host);116 }117 Ok(out)118 }119 pub async fn should_skip(&self, host: &ConfigHost) -> Result<bool> {120 if self.skip.iter().any(|h| h as &str == host.name) {121 return Ok(true);122 }123 if self.only.is_empty() {124 return Ok(false);125 }126 let mut have_group_matches = false;127 for item in self.only.iter() {128 match item {129 HostItem::Host { name, .. } if *name == host.name => {130 return Ok(false);131 }132 HostItem::Tag { .. } => {133 have_group_matches = true;134 }135 _ => {}136 }137 }138 if have_group_matches {139 let host_tags = host.tags().await?;140 for item in self.only.iter() {141 match item {142 HostItem::Tag { name, .. } if host_tags.contains(name) => {143 return Ok(false);144 }145 _ => {}146 }147 }148 }149 Ok(true)150 }151 pub async fn action_attr<T: FromStr>(&self, host: &ConfigHost, attr: &str) -> Result<Option<T>>152 where153 T::Err: Sync,154 anyhow::Error: From<T::Err>,155 {156 let str = self.action_attr_str(host, attr).await?;157 Ok(str.map(|v| T::from_str(&v)).transpose()?)158 }159 pub async fn action_attr_str(&self, host: &ConfigHost, attr: &str) -> Result<Option<String>> {160 if self.only.is_empty() {161 return Ok(None);162 }163 let mut have_group_matches = false;164 for item in self.only.iter() {165 match item {166 HostItem::Host { name, attrs }167 if *name == host.name && attrs.contains_key(attr) =>168 {169 return Ok(attrs.get(attr).cloned());170 }171 HostItem::Tag { attrs, .. } if attrs.contains_key(attr) => {172 have_group_matches = true;173 }174 _ => {}175 }176 }177 if have_group_matches {178 let host_tags = host.tags().await?;179 for item in self.only.iter() {180 match item {181 HostItem::Tag { name, attrs }182 if host_tags.contains(name) && attrs.contains_key(attr) =>183 {184 return Ok(attrs.get(attr).cloned());185 }186 _ => {}187 }188 }189 }190 Ok(None)191 }192 pub fn is_local(&self, host: &str) -> bool {193 self.localhost == host194 }195196 // TODO: Config should be detached from opts.197 pub async fn build(&self, nix_args: Vec<OsString>, assert: bool) -> Result<Config> {198 let cwd = current_dir()?;199 let mut directory = cwd.clone();200 let mut fleet_data_path = directory.join("fleet.nix");201 while !fleet_data_path.is_file() {202 // fleet.nix203 fleet_data_path.pop();204 if !directory.pop() || !fleet_data_path.pop() {205 bail!(206 "fleet.nix not found at {} or any of the parent directories",207 cwd.display()208 );209 }210 fleet_data_path.push("fleet.nix");211 }212 let bytes =213 std::fs::read_to_string(&fleet_data_path).context("reading fleet state (fleet.nix)")?;214 let data: Mutex<FleetData> = nixlike::parse_str(&bytes)?;215216 let mut fetch_settings = FetchSettings::new();217 fetch_settings.set(c"warn-dirty", c"false");218219 let mut flake_settings = FlakeSettings::new()?;220 let mut parse = FlakeReferenceParseFlags::new(&flake_settings)?;221 // For some reason, lazy trees not being used when there is no base dir set222 parse.set_base_dir("/")?;223224 let (mut flake, _) = FlakeReference::new(225 directory226 .to_str()227 .ok_or_else(|| anyhow::anyhow!("fleet dir should have utf-8 path"))?,228 &flake_settings,229 &parse,230 &fetch_settings,231 )?;232233 let lock = FlakeLockFlags::new(&flake_settings)?;234235 let flake = flake.lock(&fetch_settings, &flake_settings, &lock)?;236237 let flake = flake.get_attrs(&mut flake_settings)?;238239 let builtins_field = Value::eval("builtins")?;240241 let fleet_root = flake.get_field("fleetConfigurations")?;242 let data_val = Value::serialized(&data)?;243 let fleet_field = nix_go!(fleet_root.default(data_val));244245 let config_field = nix_go!(fleet_field.config);246247 if assert {248 assert_warn("fleet config evaluation", &config_field)249 .await250 .context("failed to verify assertions")?;251 }252253 let import = nix_go!(builtins_field.import);254 let overlays = nix_go!(config_field.nixpkgs.overlays);255 let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing);256 let nixpkgs_imported = nix_go!(import(nixpkgs));257258 let default_pkgs = nix_go!(nixpkgs_imported(Obj {259 overlays,260 system: self.local_system.clone(),261 }));262263 if cfg!(debug_assertions) {264 gc_now();265 }266267 Ok(Config(Arc::new(FleetConfigInternals {268 directory,269 data,270 flake_outputs: flake,271 local_system: self.local_system.clone(),272 nix_args,273 config_field,274 default_pkgs,275 nixpkgs,276 localhost: self.localhost.to_owned(),277 })))278 }279}crates/fleet-shared/src/encoding.rsdiffbeforeafterboth--- a/crates/fleet-shared/src/encoding.rs
+++ b/crates/fleet-shared/src/encoding.rs
@@ -1,5 +1,7 @@
use std::{
- collections::BTreeMap, fmt::{self, Display}, str::FromStr
+ collections::BTreeMap,
+ fmt::{self, Display},
+ str::FromStr,
};
use base64::engine::{Engine, general_purpose::STANDARD_NO_PAD};
crates/nix-eval/src/logging.ccdiffbeforeafterboth--- a/crates/nix-eval/src/logging.cc
+++ b/crates/nix-eval/src/logging.cc
@@ -9,12 +9,14 @@
bool isVerbose() override { return true; }
void log(Verbosity lvl, std::string_view s) override {
- rust::Slice<const unsigned char> str(reinterpret_cast<const unsigned char*>(s.data()), s.size());
+ rust::Slice<const unsigned char> str(
+ reinterpret_cast<const unsigned char *>(s.data()), s.size());
emit_log(lvl, str);
}
void logEI(const ErrorInfo &ei) override {
auto s = ei.msg.str();
- rust::Slice<const unsigned char> str(reinterpret_cast<const unsigned char*>(s.data()), s.size());
+ rust::Slice<const unsigned char> str(
+ reinterpret_cast<const unsigned char *>(s.data()), s.size());
emit_log(ei.level, str);
}
@@ -27,7 +29,8 @@
b->add_int_field(f.i);
} else if (f.type == Logger::Field::tString) {
auto s = &f.s;
- rust::Slice<const unsigned char> str(reinterpret_cast<const unsigned char*>(s->data()), s->size());
+ rust::Slice<const unsigned char> str(
+ reinterpret_cast<const unsigned char *>(s->data()), s->size());
b->add_string_field(str);
} else {
unreachable();
@@ -45,7 +48,8 @@
b->add_int_field(f.i);
} else if (f.type == Logger::Field::tString) {
auto s = &f.s;
- rust::Slice<const unsigned char> str(reinterpret_cast<const unsigned char*>(s->data()), s->size());
+ rust::Slice<const unsigned char> str(
+ reinterpret_cast<const unsigned char *>(s->data()), s->size());
b->add_string_field(str);
} else {
unreachable();
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -71,6 +71,31 @@
"url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
}
},
+ "fleet-tf": {
+ "inputs": {
+ "flake-parts": [
+ "flake-parts"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "shelly": [
+ "shelly"
+ ]
+ },
+ "locked": {
+ "lastModified": 1759080490,
+ "owner": "CertainLach",
+ "repo": "fleet-tf",
+ "rev": "878bd8c23933d628bf750378bbe527b841901c3d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "CertainLach",
+ "repo": "fleet-tf",
+ "type": "github"
+ }
+ },
"git-hooks-nix": {
"inputs": {
"flake-compat": "flake-compat",
@@ -183,6 +208,7 @@
"inputs": {
"crane": "crane",
"flake-parts": "flake-parts",
+ "fleet-tf": "fleet-tf",
"nix": "nix",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay",
flake.nixdiffbeforeafterboth--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,12 @@
};
crane.url = "github:ipetkov/crane";
shelly.url = "github:CertainLach/shelly";
+ fleet-tf = {
+ url = "github:CertainLach/fleet-tf";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.shelly.follows = "shelly";
+ inputs.flake-parts.follows = "flake-parts";
+ };
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
@@ -42,7 +48,7 @@
};
flakeModule = flakeModules.default;
- fleetModules.tf = ./modules/extras/tf.nix;
+ flakeModules.fleet-tf = ./modules/extras/tf.nix;
# Used to test nix-eval bindings
testData = {
@@ -114,13 +120,16 @@
{
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
- overlays = [ (inputs.rust-overlay.overlays.default) (final: prev: {
- boehmgc = prev.boehmgc.overrideAttrs (prevAttrs: {
- configureFlags = prevAttrs.configureFlags ++ [
- "--enable-gc-assertions"
- ];
- });
- }) ];
+ overlays = [
+ (inputs.rust-overlay.overlays.default)
+ (final: prev: {
+ boehmgc = prev.boehmgc.overrideAttrs (prevAttrs: {
+ configureFlags = prevAttrs.configureFlags ++ [
+ "--enable-gc-assertions"
+ ];
+ });
+ })
+ ];
};
# Reference fleet package should be built with nightly rust, specified in rust-toolchain.toml.
packages = lib.mkIf deployerSystem (
modules/extras/tf-bootstrap.nixdiffbeforeafterboth--- /dev/null
+++ b/modules/extras/tf-bootstrap.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ inputs',
+ pkgs,
+ config,
+ ...
+}:
+let
+ inherit (lib.options) mkOption mkPackageOption;
+ inherit (lib.types) listOf package functionTo;
+in
+{
+ options = {
+ tf.package = mkPackageOption pkgs "terraform" {
+ extraDescription = "Terraform package to use";
+ };
+ tf.providers = mkOption {
+ description = "List of used terraform providers";
+ type = functionTo (listOf package);
+ default = _: [ ];
+ };
+ tf.finalPackage = mkOption {
+ description = "Terraform package with all providers";
+ type = package;
+ };
+ };
+ config = {
+ tf.finalPackage = inputs'.fleet-tf.packages.terraform-locked.override {
+ inherit (config.tf) providers;
+ terraform = config.tf.package;
+ };
+ shelly.shells.default = {
+ packages = [ config.tf.finalPackage ];
+ };
+ packages.terraform = config.tf.finalPackage;
+ };
+}
modules/extras/tf.nixdiffbeforeafterboth--- a/modules/extras/tf.nix
+++ b/modules/extras/tf.nix
@@ -11,6 +11,7 @@
inherit (fleetLib.options) mkDataOption;
in
{
+
options = {
tf = mkOption {
type = deferredModule;
@@ -18,7 +19,7 @@
module: system:
inputs.terranix.lib.terranixConfiguration {
inherit system;
- pkgs = config.nixpkgs.buildUsing.legacyPackages.${system};
+ pkgs = inputs.nixpkgs.legacyPackages.${system};
modules = [
module
];
@@ -35,6 +36,8 @@
};
config = {
+ flake.tf = config.tf;
+
tf.output.fleet = {
value = {
managed = true;
@@ -43,6 +46,8 @@
# will be somehow processed by fleet tf.
sensitive = true;
};
- hosts = config.data.extra.terraformHosts;
+ fleetConfigurations.default.hosts = config.data.extra.terraformHosts;
+
+ perSystem.imports = [ ./tf-bootstrap.nix ];
};
}