Skip to content

Commit e123736

Browse files
NatoandroNatoandro
committed
Merge branch 'main' into upload/s3
# Conflicts: # typegate/tests/utils/test.ts
2 parents 85958d7 + 2752d4a commit e123736

File tree

22 files changed

+223
-226
lines changed

22 files changed

+223
-226
lines changed

‎.ghjk/deno.lock

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

‎.ghjk/lock.json

Lines changed: 25 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "0",
3-
"platform": "aarch64-darwin",
3+
"platform": "x86_64-linux",
44
"moduleEntries": {
55
"ports": {
66
"version": "0",
@@ -84,11 +84,6 @@
8484
"portRef": "[email protected]",
8585
"pluginRepo": "https://github.com/asdf-community/asdf-cmake"
8686
},
87-
"468769528cbf87576285bfcd000271d6398bf3c2b20083d90105d083d61854ba": {
88-
"version": "2.40.1",
89-
"depConfigs": {},
90-
"portRef": "[email protected]"
91-
},
9287
"402fae54fb94ffdba9cd2617602c7b33c55002275f3c3bb588615b01ff0c3c26": {
9388
"version": "v1.6.4",
9489
"depConfigs": {},
@@ -99,7 +94,7 @@
9994
"depConfigs": {},
10095
"portRef": "[email protected]"
10196
},
102-
"f6c92b4425a3c13dfde7fe516efd376287e66cfa74aefd7b6a7a7bb0f3547a47": {
97+
"80635b3a3967246789cc5f09137a8334fcfae9e96d507b6f8143d385093f024f": {
10398
"version": "0.116.0",
10499
"depConfigs": {
105100
"cargo_binstall_ghrel": {
@@ -241,7 +236,7 @@
241236
"version": "1.0.0",
242237
"depConfigs": {
243238
"node_org": {
244-
"version": "v21.7.1",
239+
"version": "v21.7.2",
245240
"depConfigs": {
246241
"tar_aa": {
247242
"version": "1.35",
@@ -256,7 +251,7 @@
256251
"packageName": "@bytecodealliance/jco"
257252
},
258253
"77a0197285cae563176871bd72f2ea24504c195dc596f5c33d4c9cc95eda1fba": {
259-
"version": "v21.7.1",
254+
"version": "v21.7.2",
260255
"depConfigs": {
261256
"tar_aa": {
262257
"version": "1.35",
@@ -270,7 +265,7 @@
270265
"version": "10.0.1",
271266
"depConfigs": {
272267
"node_org": {
273-
"version": "v21.7.1",
268+
"version": "v21.7.2",
274269
"depConfigs": {
275270
"tar_aa": {
276271
"version": "1.35",
@@ -414,37 +409,6 @@
414409
"portRef": "[email protected]",
415410
"crateName": "whiz",
416411
"locked": true
417-
},
418-
"80635b3a3967246789cc5f09137a8334fcfae9e96d507b6f8143d385093f024f": {
419-
"version": "0.116.0",
420-
"depConfigs": {
421-
"cargo_binstall_ghrel": {
422-
"version": "v1.6.4",
423-
"depConfigs": {},
424-
"portRef": "[email protected]"
425-
},
426-
"rust_rustup": {
427-
"version": "1.76.0",
428-
"depConfigs": {
429-
"rustup_rustlang": {
430-
"version": "1.27.0",
431-
"depConfigs": {
432-
"git_aa": {
433-
"version": "2.43.0",
434-
"depConfigs": {},
435-
"portRef": "[email protected]"
436-
}
437-
},
438-
"portRef": "[email protected]"
439-
}
440-
},
441-
"portRef": "[email protected]",
442-
"profile": "minimal"
443-
}
444-
},
445-
"portRef": "[email protected]",
446-
"crateName": "wasm-opt",
447-
"locked": true
448412
}
449413
}
450414
},
@@ -470,6 +434,7 @@
470434
"dd83a99f49f3f0fba11cdd014ff718cc9539316b",
471435
"4d1916871a40b6ac730709f7721f740df192c84d",
472436
"4df902463d60efc5b8e760ea4899f6ab6df0f16e",
437+
"88f6aa5ddb513712623d31a17096ea26286064da",
473438
"40d9babcd5c8e79379e58dbc2f2a967ef68fbb09",
474439
"5549508f1f5eddf9cb2465f07cf0c7603dc0c849",
475440
"5c041a4209ae50657ea5acacc26683688f2913a9",
@@ -884,6 +849,25 @@
884849
},
885850
"packageName": "node-gyp"
886851
},
852+
"88f6aa5ddb513712623d31a17096ea26286064da": {
853+
"version": "v2.4.0",
854+
"port": {
855+
"ty": "denoWorker@v1",
856+
"name": "mold_ghrel",
857+
"platforms": [
858+
"aarch64-linux",
859+
"x86_64-linux"
860+
],
861+
"version": "0.1.0",
862+
"deps": [
863+
{
864+
"name": "tar_aa"
865+
}
866+
],
867+
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/mold.ts"
868+
},
869+
"replaceLd": false
870+
},
887871
"40d9babcd5c8e79379e58dbc2f2a967ef68fbb09": {
888872
"version": "3.8.18",
889873
"port": {

‎libs/common/src/node.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub struct Node {
2323
pub base_url: Url,
2424
pub prefix: Option<String>,
2525
pub auth: Option<BasicAuth>,
26-
pub env: HashMap<String, String>,
2726
}
2827

2928
#[derive(Debug, thiserror::Error)]
@@ -39,13 +38,11 @@ impl Node {
3938
url: U,
4039
prefix: Option<String>,
4140
auth: Option<BasicAuth>,
42-
env: HashMap<String, String>,
4341
) -> Result<Self> {
4442
Ok(Self {
4543
base_url: url.into_url()?,
4644
prefix,
4745
auth,
48-
env,
4946
})
5047
}
5148

‎libs/metagen/src/tests/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ async fn spin_up_typegate() -> anyhow::Result<(tokio::process::Child, common::no
113113
username: "admin".into(),
114114
password: tg_admin_password.into(),
115115
}),
116-
Default::default(),
117116
)?;
118117
Ok((typegate, node))
119118
}

‎meta-cli/src/cli/deploy.rs

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
22
// SPDX-License-Identifier: MPL-2.0
33

4-
use std::collections::HashMap;
54
use std::path::{Path, PathBuf};
65
use std::sync::{Arc, Mutex};
76

@@ -16,12 +15,12 @@ use crate::deploy::actors::loader::{
1615
};
1716
use crate::deploy::actors::watcher::WatcherActor;
1817
use crate::deploy::push::pusher::PushResult;
18+
use crate::secrets::{RawSecrets, Secrets};
1919
use actix::prelude::*;
2020
use actix_web::dev::ServerHandle;
2121
use anyhow::{bail, Context, Result};
2222
use async_trait::async_trait;
2323
use clap::Parser;
24-
use common::node::Node;
2524
use log::warn;
2625
use normpath::PathExt;
2726
use tokio::sync::mpsc;
@@ -91,32 +90,16 @@ pub struct DeployOptions {
9190
#[clap(long, default_value_t = false)]
9291
pub watch: bool,
9392

94-
/// secret overrides
93+
/// Overrides secrets in the format `[<typegraph-name>:]<secret-name>=<value>`
9594
#[clap(long = "secret")]
9695
pub secrets: Vec<String>,
9796
}
9897

99-
fn override_secrets(
100-
secrets: HashMap<String, String>,
101-
overrides: Vec<String>,
102-
) -> Result<HashMap<String, String>> {
103-
let mut secrets = secrets;
104-
for override_str in overrides {
105-
let parts: Vec<&str> = override_str.splitn(2, '=').collect();
106-
if parts.len() != 2 {
107-
bail!("Invalid secret override: {}", override_str);
108-
}
109-
secrets.insert(parts[0].to_string(), parts[1].to_string());
110-
}
111-
112-
Ok(secrets)
113-
}
114-
11598
pub struct Deploy {
11699
config: Arc<Config>,
117100
base_dir: Arc<Path>,
118101
options: DeployOptions,
119-
node: Node,
102+
secrets: RawSecrets,
120103
file: Option<Arc<Path>>,
121104
max_parallel_loads: Option<usize>,
122105
}
@@ -131,6 +114,7 @@ impl Deploy {
131114
let options = deploy.options.clone();
132115

133116
let node_config = config.node(&deploy.node, &deploy.target);
117+
let secrets = Secrets::load_from_node_config(&node_config);
134118
let node = node_config
135119
.build(&dir)
136120
.await
@@ -152,7 +136,7 @@ impl Deploy {
152136
config,
153137
base_dir: dir.into(),
154138
options,
155-
node,
139+
secrets,
156140
file: deploy
157141
.file
158142
.as_ref()
@@ -225,13 +209,11 @@ mod default_mode {
225209
impl DefaultMode {
226210
pub async fn init(deploy: Deploy) -> Result<Self> {
227211
let console = ConsoleActor::new(Arc::clone(&deploy.config)).start();
228-
let secrets = lade_sdk::hydrate(
229-
override_secrets(deploy.node.env.clone(), deploy.options.secrets.clone())?,
230-
deploy.base_dir.to_path_buf(),
231-
)
232-
.await?;
233212

234-
ServerStore::set_secrets(secrets);
213+
let mut secrets = deploy.secrets.clone();
214+
secrets.apply_overrides(&deploy.options.secrets)?;
215+
216+
ServerStore::set_secrets(secrets.hydrate(deploy.base_dir.clone()).await?);
235217

236218
let (loader_event_tx, loader_event_rx) = mpsc::unbounded_channel();
237219

@@ -348,13 +330,10 @@ mod watch_mode {
348330
.context("setting Ctrl-C handler")?;
349331

350332
loop {
351-
let secrets = lade_sdk::hydrate(
352-
override_secrets(deploy.node.env.clone(), deploy.options.secrets.clone())?,
353-
deploy.base_dir.to_path_buf(),
354-
)
355-
.await?;
333+
let mut secrets = deploy.secrets.clone();
334+
secrets.apply_overrides(&deploy.options.secrets)?;
356335

357-
ServerStore::set_secrets(secrets.clone());
336+
ServerStore::set_secrets(secrets.hydrate(deploy.base_dir.clone()).await?);
358337

359338
let (loader_event_tx, loader_event_rx) = mpsc::unbounded_channel();
360339

‎meta-cli/src/com/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ async fn config(req: HttpRequest) -> impl Responder {
5757
artefact_base_dir.pop(); // pop file.ext
5858

5959
let endpoint = ServerStore::get_endpoint();
60-
let secrets = ServerStore::get_secrets();
60+
let secrets = ServerStore::get_secrets(&parsed.typegraph);
6161
let migration_action_glob = ServerStore::get_migration_action_glob();
6262
let disable_artifact_resolution = !ServerStore::get_artifact_resolution_flag();
6363
let codegen = ServerStore::get_codegen_flag();

‎meta-cli/src/com/store.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
22
// SPDX-License-Identifier: MPL-2.0
33

4-
use crate::config::Config;
4+
use crate::{config::Config, secrets::Secrets};
55
use anyhow::{bail, Result};
66
use common::node::BasicAuth;
77
use lazy_static::lazy_static;
@@ -65,7 +65,7 @@ pub struct ServerStore {
6565
migration_action_glob: MigrationAction,
6666
/// 1 typegraph => n runtimes
6767
migration_action: HashMap<PathBuf, Arc<Vec<RuntimeMigrationAction>>>,
68-
secrets: HashMap<String, String>,
68+
secrets: Secrets,
6969
endpoint: Endpoint,
7070
prefix: Option<String>,
7171
sdk_responses: HashMap<PathBuf, Arc<HashMap<String, SDKResponse>>>,
@@ -94,12 +94,12 @@ impl ServerStore {
9494
with_store(|s| s.command.clone())
9595
}
9696

97-
pub fn set_secrets(secrets: HashMap<String, String>) {
97+
pub fn set_secrets(secrets: Secrets) {
9898
with_store_mut(|s| s.secrets = secrets)
9999
}
100100

101-
pub fn get_secrets() -> HashMap<String, String> {
102-
with_store(|s| s.secrets.clone())
101+
pub fn get_secrets(tg_name: &str) -> HashMap<String, String> {
102+
with_store(|s| s.secrets.get(tg_name))
103103
}
104104

105105
pub fn set_endpoint(endpoint: Endpoint) {

0 commit comments

Comments
 (0)