diff --git a/bin/reflective_loader/Cargo.toml b/bin/reflective_loader/Cargo.toml index e9911187b..36a261f7e 100644 --- a/bin/reflective_loader/Cargo.toml +++ b/bin/reflective_loader/Cargo.toml @@ -17,7 +17,7 @@ edition = "2021" crate-type = ["cdylib"] [profile.dev] -opt-level = "z" # This reduces the numebr of symbols not found. +opt-level = "z" # This reduces the number of symbols not found. lto = true codegen-units = 1 panic = "abort" diff --git a/bin/reflective_loader/src/loader.rs b/bin/reflective_loader/src/loader.rs index 90c387674..953051905 100644 --- a/bin/reflective_loader/src/loader.rs +++ b/bin/reflective_loader/src/loader.rs @@ -160,7 +160,7 @@ struct PeFileHeaders64 { section_headers: [IMAGE_SECTION_HEADER; MAX_PE_SECTIONS], } -// Pares the PE file from a series of bytes +// Parses the PE file from a series of bytes #[cfg(target_arch = "x86_64")] impl PeFileHeaders64 { fn new(dll_bytes_ptr: *mut c_void) -> Self { @@ -390,7 +390,7 @@ fn process_import_address_tables( function_ordinal_ptr, ) as _; } else { - // Calculate a refernce to the function name by adding the dll_base and name's RVA. + // Calculate a reference to the function name by adding the dll_base and name's RVA. let image_import_ptr: *mut IMAGE_IMPORT_BY_NAME = (new_dll_base as usize + unsafe { library_thunk.u1.AddressOfData } as usize) as *mut IMAGE_IMPORT_BY_NAME; @@ -819,7 +819,7 @@ mod tests { assert_eq!(base_reloc_entry.reloc_type, 0xa); } - // PE Headers change everytime create file dll is built + // PE Headers change every time create file dll is built // #[test] // fn test_reflective_loader_parse_pe_headers() -> () { diff --git a/implants/Cargo.toml b/implants/Cargo.toml index 7d2c67013..7c7de1dd3 100644 --- a/implants/Cargo.toml +++ b/implants/Cargo.toml @@ -119,7 +119,7 @@ rand_chacha = { version = "0.3.1", default-features = false, features = ["std"]} regex = { version = "1.5.5", default-features = false} reqwest = { version = "0.12.15", default-features = false } russh = "0.37.1" -russh-sftp = "=2.0.8" # `thiserror` dependcy in older versions causes downstream issues in other libraries. +russh-sftp = "=2.0.8" # `thiserror` dependency in older versions causes downstream issues in other libraries. russh-keys = "0.37.1" rustls = "0.23" quinn = { version = "0.11", default-features = false, features = ["ring", "runtime-tokio"] } diff --git a/implants/golem/src/main.rs b/implants/golem/src/main.rs index b2f41503f..d7ec07839 100644 --- a/implants/golem/src/main.rs +++ b/implants/golem/src/main.rs @@ -143,7 +143,7 @@ fn main() -> anyhow::Result<()> { }); } } - // If we havent specified tomes in INPUT, we need to look through the asset locker for tomes to run + // If we haven't specified tomes in INPUT, we need to look through the asset locker for tomes to run if parsed_tomes.is_empty() { match locker.list() { Ok(assets) => { diff --git a/implants/golem/tests/cli.rs b/implants/golem/tests/cli.rs index 4d0cb8ac4..6bdcc2af6 100644 --- a/implants/golem/tests/cli.rs +++ b/implants/golem/tests/cli.rs @@ -70,7 +70,7 @@ fn test_golem_main_loaded_files() -> anyhow::Result<()> { // Test running `./golem -a ../../bin/golem_cli_test/ -e` // NOTE: Depending on how this test is run, the commands may not actually be run -// therefor we only test the output of eldritch and not the stdlib +// therefore we only test the output of eldritch and not the stdlib #[test] fn test_golem_main_loaded_and_embdedded_files() -> anyhow::Result<()> { let mut cmd = Command::new(cargo_bin!("golem")); diff --git a/implants/lib/eldritch/eldritch-core/src/interpreter/introspection.rs b/implants/lib/eldritch/eldritch-core/src/interpreter/introspection.rs index 9b4547ea7..8161a7aec 100644 --- a/implants/lib/eldritch/eldritch-core/src/interpreter/introspection.rs +++ b/implants/lib/eldritch/eldritch-core/src/interpreter/introspection.rs @@ -126,7 +126,7 @@ pub fn find_best_match(target: &str, candidates: &[String]) -> Option { // Threshold logic: // Allow a distance of up to 4, or half the string length + 1. // This allows "config" (6) -> "get_config" (10) (dist 4, threshold 4) - // "apend" (5) -> "append" (6) (dist 1, threshold 3) + // "append" (5) -> "append" (6) (dist 1, threshold 3) let threshold = (target.len() / 2 + 1).clamp(1, 4); for candidate in candidates { diff --git a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ncat_impl.rs b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ncat_impl.rs index 2d29ed646..94d45ccfc 100644 --- a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ncat_impl.rs +++ b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ncat_impl.rs @@ -19,7 +19,7 @@ async fn handle_ncat(address: String, port: i32, data: String, protocol: String) // Connect to remote host let mut connection = TcpStream::connect(&address_and_port).await?; - // Write our meessage + // Write our message connection.write_all(data.as_bytes()).await?; // Read server response diff --git a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/port_scan_impl.rs b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/port_scan_impl.rs index 38d9241cc..572a43b57 100644 --- a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/port_scan_impl.rs +++ b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/port_scan_impl.rs @@ -402,7 +402,7 @@ async fn handle_port_scan( let mut result: Vec<(String, i32, String, String)> = vec![]; // Await results of each job. - // We are not acting on scan results indepently so it's okay to loop through each and only return when all have finished. + // We are not acting on scan results independently so it's okay to loop through each and only return when all have finished. for task in all_scan_futures { match task.await? { Ok(res) => { diff --git a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ssh_copy_impl.rs b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ssh_copy_impl.rs index 2d884e69c..834550988 100644 --- a/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ssh_copy_impl.rs +++ b/implants/lib/eldritch/stdlib/eldritch-libpivot/src/std/ssh_copy_impl.rs @@ -244,7 +244,7 @@ mod tests { offset: u64, data: Vec, ) -> Result { - //Warning this will only write one chunk - subsequesnt chunks will overwirte the old ones. + //Warning this will only write one chunk - subsequesnt chunks will overwrite the old ones. // Tests over the size of the chunk will fail let tmp_data = String::from_utf8(data).unwrap(); fs::write(handle, tmp_data.trim_end_matches(char::from(0))).unwrap(); diff --git a/implants/lib/transport/Cargo.toml b/implants/lib/transport/Cargo.toml index 361a8dd0c..d00c02f86 100644 --- a/implants/lib/transport/Cargo.toml +++ b/implants/lib/transport/Cargo.toml @@ -34,7 +34,7 @@ http = { workspace = true } tower = { workspace = true } # Use hyper 1.x for grpc hyper = { workspace = true, features = ["client"] } -# These crates are kinda funky gonna keep them in just transprot for now. +# These crates are kinda funky gonna keep them in just transport for now. hyper_legacy = { package = "hyper", version = "0.14", features = ["client", "http1", "http2", "stream"] } hyper-util = { version = "0.1", features = ["client", "client-legacy", "http1", "http2"] } hyper-rustls = { version = "0.27", default-features = false, features = ["webpki-tokio", "http2"] } diff --git a/tavern/app.go b/tavern/app.go index 7508fac9c..793ceb2dd 100644 --- a/tavern/app.go +++ b/tavern/app.go @@ -45,8 +45,8 @@ import ( tavernmcp "realm.pub/tavern/internal/mcp" "realm.pub/tavern/internal/portals" "realm.pub/tavern/internal/portals/mux" - "realm.pub/tavern/internal/portals/ssh" "realm.pub/tavern/internal/portals/pty" + "realm.pub/tavern/internal/portals/ssh" "realm.pub/tavern/internal/redirectors" "realm.pub/tavern/internal/scheduler" "realm.pub/tavern/internal/secrets" diff --git a/tavern/internal/auth/token_auth.go b/tavern/internal/auth/token_auth.go index fc9734f73..eccd5ea52 100644 --- a/tavern/internal/auth/token_auth.go +++ b/tavern/internal/auth/token_auth.go @@ -19,7 +19,7 @@ const ParamTokenRedirToken = "access_token" // HeaderAPIAccessToken is the name of the header clients should set to authenticate with personal access tokens. const HeaderAPIAccessToken = "X-Tavern-Access-Token" -// NewTokenRedirectHandler returns a new http endpoint that redirects the requestor to http://127.0.0.1 at the port specified +// NewTokenRedirectHandler returns a new http endpoint that redirects the requester to http://127.0.0.1 at the port specified // in the query parameters. This method requires an authenticated session, and will set the user's personal access token in the redirected // URL query parameters intended for use by CLI applications authenticating to Tavern. func NewTokenRedirectHandler() http.HandlerFunc { diff --git a/tavern/internal/c2/api_claim_tasks.go b/tavern/internal/c2/api_claim_tasks.go index 849ea2841..d82014fc0 100644 --- a/tavern/internal/c2/api_claim_tasks.go +++ b/tavern/internal/c2/api_claim_tasks.go @@ -494,4 +494,3 @@ func (srv *Server) ClaimTasks(ctx context.Context, req *c2pb.ClaimTasksRequest) // Return claimed tasks return &resp, nil } - diff --git a/tavern/internal/cdn/download_screenshot_test.go b/tavern/internal/cdn/download_screenshot_test.go index 12256728d..e36202438 100644 --- a/tavern/internal/cdn/download_screenshot_test.go +++ b/tavern/internal/cdn/download_screenshot_test.go @@ -67,8 +67,8 @@ func TestDownloadScreenshot(t *testing.T) { wantBody: []byte(fmt.Sprintf("%s\n", cdn.ErrInvalidFileID.Error())), }, { - name: "Cached", - reqURL: fmt.Sprintf("/download/%d", existingScreenshot.ID), + name: "Cached", + reqURL: fmt.Sprintf("/download/%d", existingScreenshot.ID), wantStatus: cdn.ErrFileNotModified.StatusCode, wantBody: []byte(fmt.Sprintf("%s\n", cdn.ErrFileNotModified.Error())), }, diff --git a/tavern/internal/ent/enttest/testdb.go b/tavern/internal/ent/enttest/testdb.go index c764cb2fe..9410d8c1f 100644 --- a/tavern/internal/ent/enttest/testdb.go +++ b/tavern/internal/ent/enttest/testdb.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "realm.pub/tavern/internal/ent" entsql "entgo.io/ent/dialect/sql" + "realm.pub/tavern/internal/ent" // The mattn driver _ "github.com/mattn/go-sqlite3" diff --git a/tavern/internal/graphql/api_test.go b/tavern/internal/graphql/api_test.go index 544faec12..5b09796a1 100644 --- a/tavern/internal/graphql/api_test.go +++ b/tavern/internal/graphql/api_test.go @@ -27,9 +27,9 @@ import ( type testCase struct { State string `yaml:"state"` - Requestor struct { + Requester struct { SessionToken string `yaml:"session_token"` - } `yaml:"requestor"` + } `yaml:"requester"` Query string `yaml:"query"` Variables map[string]any `yaml:"variables"` Expected map[string]any `yaml:"expected"` @@ -96,11 +96,11 @@ func runTestCase(t *testing.T, path string) { opts = append(opts, client.Var(key, val)) } - // Requestor - if tc.Requestor.SessionToken != "" { + // Requester + if tc.Requester.SessionToken != "" { opts = append(opts, client.AddCookie(&http.Cookie{ Name: auth.SessionCookieName, - Value: tc.Requestor.SessionToken, + Value: tc.Requester.SessionToken, Expires: time.Now().Add(24 * time.Hour), })) } diff --git a/tavern/internal/graphql/testdata/example.yml b/tavern/internal/graphql/testdata/example.yml index a16a46483..f85f06e3b 100644 --- a/tavern/internal/graphql/testdata/example.yml +++ b/tavern/internal/graphql/testdata/example.yml @@ -6,7 +6,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); # Authenticate as that user (via session_token) -requestor: +requester: session_token: secretToken # Query all existing users diff --git a/tavern/internal/graphql/testdata/mutations/createCredential/Host.yml b/tavern/internal/graphql/testdata/mutations/createCredential/Host.yml index 87199911c..b49d8f2ec 100644 --- a/tavern/internal/graphql/testdata/mutations/createCredential/Host.yml +++ b/tavern/internal/graphql/testdata/mutations/createCredential/Host.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `hosts` (id, name, identifier, platform, created_at, last_modified_at) VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateQuestWithNoBeacons($input: CreateHostCredentialInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createCredential/HostAndTask.yml b/tavern/internal/graphql/testdata/mutations/createCredential/HostAndTask.yml index 019271234..15fb6127a 100644 --- a/tavern/internal/graphql/testdata/mutations/createCredential/HostAndTask.yml +++ b/tavern/internal/graphql/testdata/mutations/createCredential/HostAndTask.yml @@ -11,7 +11,7 @@ state: | VALUES(1011, "2023-03-04 14:51:13", "2023-03-04 14:51:13", "Test Quest", 2000); INSERT INTO `tasks` (id, created_at, last_modified_at, output_size, quest_tasks, task_beacon) VALUES(1012, "2023-03-04 14:51:13", "2023-03-04 14:51:13", 100, 1011, 1337); -requestor: +requester: session_token: secretToken query: | mutation CreateQuestWithNoBeacons($input: CreateHostCredentialInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createLink/WithDownloadsRemaining.yml b/tavern/internal/graphql/testdata/mutations/createLink/WithDownloadsRemaining.yml index a1af94f25..9c7d248ba 100644 --- a/tavern/internal/graphql/testdata/mutations/createLink/WithDownloadsRemaining.yml +++ b/tavern/internal/graphql/testdata/mutations/createLink/WithDownloadsRemaining.yml @@ -4,7 +4,7 @@ state: | INSERT INTO `assets` (id, name, content, hash, size, created_at, last_modified_at) VALUES (1001, "TestAsset", "test content", "abcdefg123", 12, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateLink($input: CreateLinkInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createQuest/NoBeacons.yml b/tavern/internal/graphql/testdata/mutations/createQuest/NoBeacons.yml index 3bc6fc876..231bc908a 100644 --- a/tavern/internal/graphql/testdata/mutations/createQuest/NoBeacons.yml +++ b/tavern/internal/graphql/testdata/mutations/createQuest/NoBeacons.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `tomes` (id, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateQuestWithNoBeacons($beaconIDs: [ID!]!, $input: CreateQuestInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml b/tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml index dc11bbaa9..125a02f29 100644 --- a/tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml +++ b/tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml @@ -7,7 +7,7 @@ state: | VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `tomes` (id, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateQuestWithNoFiles($beaconIDs: [ID!]!, $input: CreateQuestInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml b/tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml index 9e1404d8b..297a04152 100644 --- a/tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml +++ b/tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation CreateQuestWithFiles($beaconIDs: [ID!]!, $input: CreateQuestInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURL.yml b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURL.yml index c99f81885..1fd772a48 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURL.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURL.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWIthSSH.yml b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWIthSSH.yml index 0ed7b4693..037c88cd5 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWIthSSH.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWIthSSH.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWithoutUser.yml b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWithoutUser.yml index 54fc6e5cb..4a1c8d856 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWithoutUser.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/SCPURLWithoutUser.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/SSHURLWithUser.yml b/tavern/internal/graphql/testdata/mutations/createRepository/SSHURLWithUser.yml index e237eb02f..6cb923a8d 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/SSHURLWithUser.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/SSHURLWithUser.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTP.yml b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTP.yml index 9d6ec5646..6bb7e0a9c 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTP.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTP.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTPS.yml b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTPS.yml index ea00386c6..1a89d1cf1 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTPS.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithHTTPS.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithoutSchema.yml b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithoutSchema.yml index 01b30008b..0ce78a418 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/URLWithoutSchema.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/URLWithoutSchema.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createRepository/ValidURL.yml b/tavern/internal/graphql/testdata/mutations/createRepository/ValidURL.yml index 58890a3f1..fd48ea63f 100644 --- a/tavern/internal/graphql/testdata/mutations/createRepository/ValidURL.yml +++ b/tavern/internal/graphql/testdata/mutations/createRepository/ValidURL.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateRepository($input: CreateRepositoryInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createTag/Group.yml b/tavern/internal/graphql/testdata/mutations/createTag/Group.yml index 7298ddecc..d71958964 100644 --- a/tavern/internal/graphql/testdata/mutations/createTag/Group.yml +++ b/tavern/internal/graphql/testdata/mutations/createTag/Group.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST","PLATFORM_UNSPECIFIED","2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (1337,"delightful-lich","ABCDEFG-123456", 1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateGroupTag($input: CreateTagInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createTag/MultipleHosts.yml b/tavern/internal/graphql/testdata/mutations/createTag/MultipleHosts.yml index f2eaf0e77..621cd110d 100644 --- a/tavern/internal/graphql/testdata/mutations/createTag/MultipleHosts.yml +++ b/tavern/internal/graphql/testdata/mutations/createTag/MultipleHosts.yml @@ -11,7 +11,7 @@ state: | VALUES (420,"lovely-emu","ZYXWVUT-987654",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (421,"ballin-emu","ZYXWVUT-1234",1011, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateGroupTag($input: CreateTagInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createTag/Service.yml b/tavern/internal/graphql/testdata/mutations/createTag/Service.yml index 13e439b10..65cf9ef9b 100644 --- a/tavern/internal/graphql/testdata/mutations/createTag/Service.yml +++ b/tavern/internal/graphql/testdata/mutations/createTag/Service.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateServiceTag($input: CreateTagInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml b/tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml index ca6e19f98..9659884d0 100644 --- a/tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml +++ b/tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation CreateTomeWithNoFiles($input: CreateTomeInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml b/tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml index a2d31de47..59efc543d 100644 --- a/tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml +++ b/tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml @@ -9,7 +9,7 @@ state: | VALUES (3000,"TestFile1", "hello world", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `assets` (id, name, content, hash, created_at, last_modified_at) VALUES (3001,"TestFile2", "some test", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation CreateTomeWithFiles($input: CreateTomeInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/DeletesAll.yml b/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/DeletesAll.yml index 7373a5c0d..f2a7c7ec0 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/DeletesAll.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/DeletesAll.yml @@ -9,7 +9,7 @@ state: | VALUES (200, "Low", false, false, 5, 100, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `notifications` (id, priority, `read`, archived, notification_user, notification_event, created_at, last_modified_at) VALUES (201, "High", true, false, 5, 101, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DeleteAllNotifications { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/PermissionDenied.yml index 0d84d3ad2..40242dd89 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAllNotifications/PermissionDenied.yml @@ -5,7 +5,7 @@ state: | VALUES (100, 1700000000, "BEACON_LOST", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `notifications` (id, priority, `read`, archived, notification_user, notification_event, created_at, last_modified_at) VALUES (200, "Low", false, false, 5, 100, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DeleteAllNotifications { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAsset/AssociatedWithTome.yml b/tavern/internal/graphql/testdata/mutations/deleteAsset/AssociatedWithTome.yml index d50f5c6d9..3461012a8 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAsset/AssociatedWithTome.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAsset/AssociatedWithTome.yml @@ -7,7 +7,7 @@ state: | VALUES (3000, "TestFile1", "hello world", "a948904f2f0f479b8f8197694b30184b0d2ed1c1cd2a1ec0fb85d299a192a447", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3000); -requestor: +requester: session_token: secretToken query: | mutation DeleteAsset($assetID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAsset/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/deleteAsset/PermissionDenied.yml index 521839c7e..5badc122d 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAsset/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAsset/PermissionDenied.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,false); INSERT INTO `assets` (id, name, content, hash, created_at, last_modified_at) VALUES (3000, "TestFile1", "hello world", "a948904f2f0f479b8f8197694b30184b0d2ed1c1cd2a1ec0fb85d299a192a447", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DeleteAsset($assetID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAsset/Singular.yml b/tavern/internal/graphql/testdata/mutations/deleteAsset/Singular.yml index e12cd21f6..1a4a3bf89 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAsset/Singular.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAsset/Singular.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `assets` (id, name, content, hash, created_at, last_modified_at) VALUES (3000, "TestFile1", "hello world", "a948904f2f0f479b8f8197694b30184b0d2ed1c1cd2a1ec0fb85d299a192a447", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DeleteAsset($assetID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteAsset/WithAssociatedLinks.yml b/tavern/internal/graphql/testdata/mutations/deleteAsset/WithAssociatedLinks.yml index 6ad5d5f76..57f605d7a 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteAsset/WithAssociatedLinks.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteAsset/WithAssociatedLinks.yml @@ -7,7 +7,7 @@ state: | VALUES (4000, "abc123", "2099-01-01 00:00:00", 0, 3000, "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `links` (id, path, expires_at, downloads, link_asset, created_at, last_modified_at) VALUES (4001, "def456", "2099-01-01 00:00:00", 0, 3000, "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DeleteAsset($assetID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteTome/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/deleteTome/PermissionDenied.yml index 38963b939..4648313fb 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteTome/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteTome/PermissionDenied.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation DeleteTome($tomeID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/deleteTome/Singular.yml b/tavern/internal/graphql/testdata/mutations/deleteTome/Singular.yml index 0d4f404ef..6dab057b9 100644 --- a/tavern/internal/graphql/testdata/mutations/deleteTome/Singular.yml +++ b/tavern/internal/graphql/testdata/mutations/deleteTome/Singular.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation DeleteTome($tomeID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/dropAllData/DropsData.yml b/tavern/internal/graphql/testdata/mutations/dropAllData/DropsData.yml index e706b3ee7..ef9861d08 100644 --- a/tavern/internal/graphql/testdata/mutations/dropAllData/DropsData.yml +++ b/tavern/internal/graphql/testdata/mutations/dropAllData/DropsData.yml @@ -29,7 +29,7 @@ state: | VALUES (10000, 9000, 1337, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `portals` (id, portal_beacon, portal_task, portal_owner, created_at, last_modified_at) VALUES (8000, 1337, 10000, 5, "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation DropAllData { diff --git a/tavern/internal/graphql/testdata/mutations/dropAllData/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/dropAllData/PermissionDenied.yml index 8b9dde706..d8793a149 100644 --- a/tavern/internal/graphql/testdata/mutations/dropAllData/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/dropAllData/PermissionDenied.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation DropAllData { diff --git a/tavern/internal/graphql/testdata/mutations/dropAllData/ReproConstraintError.yml b/tavern/internal/graphql/testdata/mutations/dropAllData/ReproConstraintError.yml index b1b40141f..3d01d5ab2 100644 --- a/tavern/internal/graphql/testdata/mutations/dropAllData/ReproConstraintError.yml +++ b/tavern/internal/graphql/testdata/mutations/dropAllData/ReproConstraintError.yml @@ -6,7 +6,7 @@ state: | INSERT INTO quests (id, name, created_at, last_modified_at, quest_tome) VALUES (1, 'Quest 1', datetime('now'), datetime('now'), 1); INSERT INTO tasks (id, created_at, last_modified_at, quest_tasks, task_beacon) VALUES (1, datetime('now'), datetime('now'), 1, 1); INSERT INTO shells (id, created_at, last_modified_at, shell_task, shell_beacon, shell_owner, data) VALUES (1, datetime('now'), datetime('now'), 1, 1, 1, ''); -requestor: +requester: session_token: "test-token" query: | mutation reset { diff --git a/tavern/internal/graphql/testdata/mutations/dropAllData/WithEvents.yml b/tavern/internal/graphql/testdata/mutations/dropAllData/WithEvents.yml index e73edae9b..30fc93ebd 100644 --- a/tavern/internal/graphql/testdata/mutations/dropAllData/WithEvents.yml +++ b/tavern/internal/graphql/testdata/mutations/dropAllData/WithEvents.yml @@ -9,7 +9,7 @@ state: | INSERT INTO notifications (id, priority, read, archived, notification_user, notification_event, created_at, last_modified_at) VALUES (1, 'Low', 0, 0, 1, 1, datetime('now'), datetime('now')); INSERT INTO beacon_histories (id, latency, beacon_history_beacon, created_at, last_modified_at) VALUES (1, 100, 1, datetime('now'), datetime('now')); -requestor: +requester: session_token: "abcdef123456" query: | diff --git a/tavern/internal/graphql/testdata/mutations/dropAllData/foreign_key.yml b/tavern/internal/graphql/testdata/mutations/dropAllData/foreign_key.yml index 633b3d0e6..06311185f 100644 --- a/tavern/internal/graphql/testdata/mutations/dropAllData/foreign_key.yml +++ b/tavern/internal/graphql/testdata/mutations/dropAllData/foreign_key.yml @@ -9,7 +9,7 @@ state: | INSERT INTO host_processes (id, pid, ppid, name, principal, status, task_reported_processes, created_at, last_modified_at, host_process_host) VALUES (1, 1234, 1, 'process', 'root', 'RUNNING', 1, datetime('now'), datetime('now'), 1); INSERT INTO host_credentials (id, principal, secret, kind, task_reported_credentials, created_at, last_modified_at, host_credential_host) VALUES (1, 'user', 'password', 'PLAINTEXT', 1, datetime('now'), datetime('now'), 1); -requestor: +requester: session_token: "abcdef123456" query: | diff --git a/tavern/internal/graphql/testdata/mutations/importRepository/ExistingTomes.yml b/tavern/internal/graphql/testdata/mutations/importRepository/ExistingTomes.yml index 4d7d5eeb7..cadeadd6b 100644 --- a/tavern/internal/graphql/testdata/mutations/importRepository/ExistingTomes.yml +++ b/tavern/internal/graphql/testdata/mutations/importRepository/ExistingTomes.yml @@ -7,7 +7,7 @@ state: | VALUES (2000,11000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `tomes` (id, tome_repository, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2001,11000,"expected_tome","Filtered by a unit test :D", "kcarretto", "print('Goodbye World!')", "gfedcba", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation ImportRepository { diff --git a/tavern/internal/graphql/testdata/mutations/importRepository/NoExistingTomes.yml b/tavern/internal/graphql/testdata/mutations/importRepository/NoExistingTomes.yml index 022913e77..16245ad74 100644 --- a/tavern/internal/graphql/testdata/mutations/importRepository/NoExistingTomes.yml +++ b/tavern/internal/graphql/testdata/mutations/importRepository/NoExistingTomes.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `repositories` (id, repository_owner, url, public_key, private_key, created_at, last_modified_at) VALUES (11000, 5, "ssh://code.google.com/my/repo", "--PUBLIC KEY--", "--PRIVATE KEY--", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation ImportRepository { diff --git a/tavern/internal/graphql/testdata/mutations/subscribeToHost/Subscribe.yml b/tavern/internal/graphql/testdata/mutations/subscribeToHost/Subscribe.yml index 982447179..9fa32c8a7 100644 --- a/tavern/internal/graphql/testdata/mutations/subscribeToHost/Subscribe.yml +++ b/tavern/internal/graphql/testdata/mutations/subscribeToHost/Subscribe.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `hosts` (id, name, identifier, platform, created_at, last_modified_at) VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_WINDOWS", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation SubscribeToHost($hostID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/unsubscribeFromHost/Unsubscribe.yml b/tavern/internal/graphql/testdata/mutations/unsubscribeFromHost/Unsubscribe.yml index c7a8ce438..c780714e8 100644 --- a/tavern/internal/graphql/testdata/mutations/unsubscribeFromHost/Unsubscribe.yml +++ b/tavern/internal/graphql/testdata/mutations/unsubscribeFromHost/Unsubscribe.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_WINDOWS", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `user_subscribedHosts` (user_id, host_id) VALUES (5, 1010); -requestor: +requester: session_token: secretToken query: | mutation UnsubscribeFromHost($hostID: ID!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeNameError.yml b/tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeNameError.yml index 216ca0e04..76e6889c8 100644 --- a/tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeNameError.yml +++ b/tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeNameError.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation ChangeName($beaconID: ID!, $input: UpdateBeaconInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateHost/AddTag.yml b/tavern/internal/graphql/testdata/mutations/updateHost/AddTag.yml index 06b6d8ed0..1e0cd5d87 100644 --- a/tavern/internal/graphql/testdata/mutations/updateHost/AddTag.yml +++ b/tavern/internal/graphql/testdata/mutations/updateHost/AddTag.yml @@ -7,7 +7,7 @@ state: | VALUES (1337,"delightful-lich","ABCDEFG-123456", 1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `tags` (id, name, kind) VALUES (4000,"very-neat-tag","group"); -requestor: +requester: session_token: secretToken query: | mutation AddTag($hostID: ID!, $input: UpdateHostInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateHost/ChangeHostname.yml b/tavern/internal/graphql/testdata/mutations/updateHost/ChangeHostname.yml index 87541efd3..3d3221ce1 100644 --- a/tavern/internal/graphql/testdata/mutations/updateHost/ChangeHostname.yml +++ b/tavern/internal/graphql/testdata/mutations/updateHost/ChangeHostname.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_WINDOWS", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | mutation ChangeHostname($hostID: ID!, $input: UpdateHostInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateHost/RemoveTag.yml b/tavern/internal/graphql/testdata/mutations/updateHost/RemoveTag.yml index c06826127..f4b7d6e4b 100644 --- a/tavern/internal/graphql/testdata/mutations/updateHost/RemoveTag.yml +++ b/tavern/internal/graphql/testdata/mutations/updateHost/RemoveTag.yml @@ -9,7 +9,7 @@ state: | VALUES (4000,"very-neat-tag","group"); INSERT INTO `host_tags` (host_id, tag_id) VALUES (1010,4000); -requestor: +requester: session_token: secretToken query: | mutation RemoveTag($hostID: ID!, $input: UpdateHostInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml b/tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml index e20cf9dd6..4bd6e012b 100644 --- a/tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml +++ b/tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml @@ -7,7 +7,7 @@ state: | VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `tags` (id, name, kind) VALUES (4000,"boring-tag","group"); -requestor: +requester: session_token: secretToken query: | mutation ChangeName($tagID: ID! $input: UpdateTagInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateTome/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/updateTome/PermissionDenied.yml index 7f1e96fa5..33d9f1d05 100644 --- a/tavern/internal/graphql/testdata/mutations/updateTome/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/updateTome/PermissionDenied.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation UpdateTome($tomeID: ID!, $input: UpdateTomeInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateTome/Singular.yml b/tavern/internal/graphql/testdata/mutations/updateTome/Singular.yml index a59e1a3ba..81009f680 100644 --- a/tavern/internal/graphql/testdata/mutations/updateTome/Singular.yml +++ b/tavern/internal/graphql/testdata/mutations/updateTome/Singular.yml @@ -15,7 +15,7 @@ state: | VALUES (2000, 3000); INSERT INTO `tome_assets` (tome_id, asset_id) VALUES (2000, 3001); -requestor: +requester: session_token: secretToken query: | mutation UpdateTome($tomeID: ID!, $input: UpdateTomeInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml b/tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml index 6217f44d9..209e9232a 100644 --- a/tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml +++ b/tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | mutation ChangeUsername($userID: ID!, $input: UpdateUserInput!) { diff --git a/tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml index e9e4504d0..fa5844824 100644 --- a/tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml +++ b/tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","access_token",true,false); -requestor: +requester: session_token: secretToken query: | mutation UpdateUserName($userID: ID!, $input: UpdateUserInput!) { diff --git a/tavern/internal/graphql/testdata/queries/assets/FilterByID.yml b/tavern/internal/graphql/testdata/queries/assets/FilterByID.yml index b2e7ab6b7..573b96a1f 100644 --- a/tavern/internal/graphql/testdata/queries/assets/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/assets/FilterByID.yml @@ -6,7 +6,7 @@ state: | INSERT INTO `assets` (id, name, content, hash, created_at, last_modified_at) VALUES (3001, "TestFile2", "hello world", "zyxwvut", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Files { diff --git a/tavern/internal/graphql/testdata/queries/assets/Singular.yml b/tavern/internal/graphql/testdata/queries/assets/Singular.yml index 49f9701ba..86256d0ae 100644 --- a/tavern/internal/graphql/testdata/queries/assets/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/assets/Singular.yml @@ -4,7 +4,7 @@ state: | INSERT INTO `assets` (id, name, content, hash, created_at, last_modified_at) VALUES (3000, "TestFile1", "hello world", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Files { diff --git a/tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml b/tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml index ffa31886a..eef0c416c 100644 --- a/tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml @@ -7,7 +7,7 @@ state: | VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, transport, created_at, last_modified_at) VALUES (1338,"filtered-lich","123456-ZYX",1010, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Beacons { diff --git a/tavern/internal/graphql/testdata/queries/beacons/Singular.yml b/tavern/internal/graphql/testdata/queries/beacons/Singular.yml index 92211590c..0e05917d9 100644 --- a/tavern/internal/graphql/testdata/queries/beacons/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/beacons/Singular.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `beacons` (id, name, identifier, beacon_host, interval, transport, created_at, last_modified_at) VALUES (1337,"delightful-lich","ABCDEFG-123456",1010, 120, "TRANSPORT_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Beacons { diff --git a/tavern/internal/graphql/testdata/queries/hosts/Multiple.yml b/tavern/internal/graphql/testdata/queries/hosts/Multiple.yml index 68e2dbefb..b1219316e 100644 --- a/tavern/internal/graphql/testdata/queries/hosts/Multiple.yml +++ b/tavern/internal/graphql/testdata/queries/hosts/Multiple.yml @@ -5,7 +5,7 @@ state: | VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); INSERT INTO `hosts` (id, name, identifier, platform, created_at, last_modified_at) VALUES (1011,"db2","EXISTING-HOST2", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Hosts { diff --git a/tavern/internal/graphql/testdata/queries/hosts/Singular.yml b/tavern/internal/graphql/testdata/queries/hosts/Singular.yml index 31736e471..7cc0b02cd 100644 --- a/tavern/internal/graphql/testdata/queries/hosts/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/hosts/Singular.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `hosts` (id, name, identifier, platform, created_at, last_modified_at) VALUES (1010,"db1","EXISTING-HOST", "PLATFORM_UNSPECIFIED", "2024-01-22 14:51:13", "2024-01-22 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Hosts { diff --git a/tavern/internal/graphql/testdata/queries/metrics/beacon_timeline.yml b/tavern/internal/graphql/testdata/queries/metrics/beacon_timeline.yml index 897cf51c7..bf594bc68 100644 --- a/tavern/internal/graphql/testdata/queries/metrics/beacon_timeline.yml +++ b/tavern/internal/graphql/testdata/queries/metrics/beacon_timeline.yml @@ -17,7 +17,7 @@ state: | VALUES (3, 1338, 5, "2024-01-22 14:51:20", "2024-01-22 14:51:20"); INSERT INTO `beacon_histories` (id, beacon_history_beacon, latency, created_at, last_modified_at) VALUES (4, 1338, 8, "2024-01-22 14:55:13", "2024-01-22 14:55:13"); -requestor: +requester: session_token: secretToken query: | query Metrics { diff --git a/tavern/internal/graphql/testdata/queries/metrics/tasks_by_tome.yml b/tavern/internal/graphql/testdata/queries/metrics/tasks_by_tome.yml index 4fc2b82d9..2026297e8 100644 --- a/tavern/internal/graphql/testdata/queries/metrics/tasks_by_tome.yml +++ b/tavern/internal/graphql/testdata/queries/metrics/tasks_by_tome.yml @@ -42,7 +42,7 @@ state: | INSERT INTO `tasks` (id, quest_tasks, task_beacon, created_at, last_modified_at, claimed_at, exec_finished_at, error, output_size) VALUES (6, 11, 1337, "2024-01-22 14:51:13", "2024-01-22 14:51:13", NULL, NULL, "", 0); -requestor: +requester: session_token: secretToken query: | query Metrics { diff --git a/tavern/internal/graphql/testdata/queries/notification.yml b/tavern/internal/graphql/testdata/queries/notification.yml index 06cbccf57..5cfeaad93 100644 --- a/tavern/internal/graphql/testdata/queries/notification.yml +++ b/tavern/internal/graphql/testdata/queries/notification.yml @@ -1,4 +1,4 @@ -requestor: +requester: session_token: "s" query: | mutation { diff --git a/tavern/internal/graphql/testdata/queries/quests/BackwardPaginate.yml b/tavern/internal/graphql/testdata/queries/quests/BackwardPaginate.yml index 6dba7b016..848b9a387 100644 --- a/tavern/internal/graphql/testdata/queries/quests/BackwardPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/quests/BackwardPaginate.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7001,2000,"Test Quest 2","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/FilterByID.yml b/tavern/internal/graphql/testdata/queries/quests/FilterByID.yml index 1869cf465..9141d305a 100644 --- a/tavern/internal/graphql/testdata/queries/quests/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/quests/FilterByID.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7001,2000,"Test Quest 2","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/ForwardPaginate.yml b/tavern/internal/graphql/testdata/queries/quests/ForwardPaginate.yml index eb10ef470..0d5274f38 100644 --- a/tavern/internal/graphql/testdata/queries/quests/ForwardPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/quests/ForwardPaginate.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7001,2000,"Test Quest 2","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/Multiple.yml b/tavern/internal/graphql/testdata/queries/quests/Multiple.yml index be66eb07e..c6c619d6c 100644 --- a/tavern/internal/graphql/testdata/queries/quests/Multiple.yml +++ b/tavern/internal/graphql/testdata/queries/quests/Multiple.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7001,2000,"Test Quest 2","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/OrderByPaginate.yml b/tavern/internal/graphql/testdata/queries/quests/OrderByPaginate.yml index 72809b6a3..089c0cb69 100644 --- a/tavern/internal/graphql/testdata/queries/quests/OrderByPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/quests/OrderByPaginate.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7001,2000,"Test Quest 2","2023-03-04 14:51:13","2023-03-04 14:51:14"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/Singular.yml b/tavern/internal/graphql/testdata/queries/quests/Singular.yml index 6f0889ceb..58a27067e 100644 --- a/tavern/internal/graphql/testdata/queries/quests/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/quests/Singular.yml @@ -9,7 +9,7 @@ state: | VALUES (2000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `quests` (id, quest_tome, name, created_at, last_modified_at) VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/TaskDiffs.yml b/tavern/internal/graphql/testdata/queries/quests/TaskDiffs.yml index 17fdcda1d..9ced5be1b 100644 --- a/tavern/internal/graphql/testdata/queries/quests/TaskDiffs.yml +++ b/tavern/internal/graphql/testdata/queries/quests/TaskDiffs.yml @@ -50,7 +50,7 @@ state: | VALUES (9004,7000,1337,"output_d","","1","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO host_files (id, path, task_reported_files, size, created_at, last_modified_at, host_file_host) VALUES (4, '/tmp/d', 9004, 100, datetime('now'), datetime('now'), 1010); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/quests/TaskDiffsFiltered.yml b/tavern/internal/graphql/testdata/queries/quests/TaskDiffsFiltered.yml index da2754e58..a9dda818d 100644 --- a/tavern/internal/graphql/testdata/queries/quests/TaskDiffsFiltered.yml +++ b/tavern/internal/graphql/testdata/queries/quests/TaskDiffsFiltered.yml @@ -18,7 +18,7 @@ state: | VALUES (8003,7000,1337,NULL,"I failed entirely","1","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, quest_tasks, task_beacon, output, error, output_size, created_at, last_modified_at) VALUES (8006,7000,1337,"B","","1","2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Quests { diff --git a/tavern/internal/graphql/testdata/queries/repositories/WithTomes.yml b/tavern/internal/graphql/testdata/queries/repositories/WithTomes.yml index a0814ab0d..40e41e553 100644 --- a/tavern/internal/graphql/testdata/queries/repositories/WithTomes.yml +++ b/tavern/internal/graphql/testdata/queries/repositories/WithTomes.yml @@ -7,7 +7,7 @@ state: | VALUES (2000,11000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); INSERT INTO `tomes` (id, tome_repository, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2001,11000,"Test Tome 2","Filtered by a unit test :D", "kcarretto", "print('Goodbye World!')", "gfedcba", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Repositories { diff --git a/tavern/internal/graphql/testdata/queries/tags/FilterByID.yml b/tavern/internal/graphql/testdata/queries/tags/FilterByID.yml index a15a14903..3720e66d5 100644 --- a/tavern/internal/graphql/testdata/queries/tags/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/tags/FilterByID.yml @@ -5,7 +5,7 @@ state: | VALUES (4000,"boring-tag","group"); INSERT INTO `tags` (id, name, kind) VALUES (4001,"filtered-tag","group"); -requestor: +requester: session_token: secretToken query: | query Tags { diff --git a/tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml b/tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml index ee1c2f4a3..d087f7b15 100644 --- a/tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml +++ b/tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml @@ -5,7 +5,7 @@ state: | VALUES (4000,"boring-tag","service"); INSERT INTO `tags` (id, name, kind) VALUES (4001,"filtered-tag","group"); -requestor: +requester: session_token: secretToken query: | query Tags($where: TagWhereInput!) { diff --git a/tavern/internal/graphql/testdata/queries/tags/Singular.yml b/tavern/internal/graphql/testdata/queries/tags/Singular.yml index e6a5b2f6e..82b0ccd15 100644 --- a/tavern/internal/graphql/testdata/queries/tags/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/tags/Singular.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `tags` (id, name, kind) VALUES (4000,"boring-tag","group"); -requestor: +requester: session_token: secretToken query: | query Tags { diff --git a/tavern/internal/graphql/testdata/queries/tasks/BackwardPaginate.yml b/tavern/internal/graphql/testdata/queries/tasks/BackwardPaginate.yml index 79dbc3056..bbbf0a0a8 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/BackwardPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/BackwardPaginate.yml @@ -13,7 +13,7 @@ state: | VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8001,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tasks/FilterByID.yml b/tavern/internal/graphql/testdata/queries/tasks/FilterByID.yml index 711c4baf8..17627cde5 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/FilterByID.yml @@ -15,7 +15,7 @@ state: | VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8001,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tasks/ForwardPaginate.yml b/tavern/internal/graphql/testdata/queries/tasks/ForwardPaginate.yml index b39c67c47..109680c06 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/ForwardPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/ForwardPaginate.yml @@ -13,7 +13,7 @@ state: | VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8001,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tasks/Multiple.yml b/tavern/internal/graphql/testdata/queries/tasks/Multiple.yml index 18a01d47a..a1264d52e 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/Multiple.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/Multiple.yml @@ -13,7 +13,7 @@ state: | VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8001,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tasks/OrderByPaginate.yml b/tavern/internal/graphql/testdata/queries/tasks/OrderByPaginate.yml index b64eed7d9..4e4e2c408 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/OrderByPaginate.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/OrderByPaginate.yml @@ -13,7 +13,7 @@ state: | VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8001,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:14"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tasks/Singular.yml b/tavern/internal/graphql/testdata/queries/tasks/Singular.yml index 52796f4a3..3891a302e 100644 --- a/tavern/internal/graphql/testdata/queries/tasks/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/tasks/Singular.yml @@ -11,7 +11,7 @@ state: | VALUES (7000,2000,"Test Quest","2023-03-04 14:51:13","2023-03-04 14:51:13"); INSERT INTO `tasks` (id, task_beacon, quest_tasks, created_at, last_modified_at) VALUES (8000,1337,7000,"2023-03-04 14:51:13","2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tasks { diff --git a/tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml b/tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml index 984bde504..c60b297fb 100644 --- a/tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml @@ -6,7 +6,7 @@ state: | INSERT INTO `tomes` (id, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2001,"Test Tome 2","Filtered by a unit test :D", "kcarretto", "print('Goodbye World!')", "gfedcba", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tomes { diff --git a/tavern/internal/graphql/testdata/queries/tomes/Singular.yml b/tavern/internal/graphql/testdata/queries/tomes/Singular.yml index ac6266855..09d733edf 100644 --- a/tavern/internal/graphql/testdata/queries/tomes/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/tomes/Singular.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `tomes` (id, name, description, author, eldritch, hash, created_at, last_modified_at) VALUES (2000,"Test Tome","Used in a unit test :D", "kcarretto", "print('Hello World!')", "abcdefg", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query Tomes { diff --git a/tavern/internal/graphql/testdata/queries/users/FilterByID.yml b/tavern/internal/graphql/testdata/queries/users/FilterByID.yml index 263d31f95..9385c6e42 100644 --- a/tavern/internal/graphql/testdata/queries/users/FilterByID.yml +++ b/tavern/internal/graphql/testdata/queries/users/FilterByID.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (6,"test_oauth_id_2","https://photos.com","test2","secretToken2","accessToken2",true,true); -requestor: +requester: session_token: secretToken query: | query Users { diff --git a/tavern/internal/graphql/testdata/queries/users/Me.yml b/tavern/internal/graphql/testdata/queries/users/Me.yml index fe0448c9a..0b41c924c 100644 --- a/tavern/internal/graphql/testdata/queries/users/Me.yml +++ b/tavern/internal/graphql/testdata/queries/users/Me.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","access_token",true,false); INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (6,"test_oauth_id2","https://photos.com","admin","otherToken","otherAccessToken",true,true); -requestor: +requester: session_token: secretToken query: | query Me { diff --git a/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml b/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml index 406d0fda7..1552c60f0 100644 --- a/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml +++ b/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml @@ -3,7 +3,7 @@ state: | VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",false,false); INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (6,"test_oauth_id2","https://photos.com","admin","otherToken","otherAccessToken",true,true); -requestor: +requester: session_token: secretToken query: | query MeWithUnactivatedUser { diff --git a/tavern/internal/graphql/testdata/queries/users/Singular.yml b/tavern/internal/graphql/testdata/queries/users/Singular.yml index d81702085..be951f342 100644 --- a/tavern/internal/graphql/testdata/queries/users/Singular.yml +++ b/tavern/internal/graphql/testdata/queries/users/Singular.yml @@ -1,7 +1,7 @@ state: | INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,access_token,is_activated,is_admin) VALUES (5,"test_oauth_id","https://photos.com","test","secretToken","accessToken",true,true); -requestor: +requester: session_token: secretToken query: | query Users { diff --git a/tavern/internal/graphql/testdata/queries/users/UploadedTomes.yml b/tavern/internal/graphql/testdata/queries/users/UploadedTomes.yml index d51c9acb9..0f8224978 100644 --- a/tavern/internal/graphql/testdata/queries/users/UploadedTomes.yml +++ b/tavern/internal/graphql/testdata/queries/users/UploadedTomes.yml @@ -6,7 +6,7 @@ state: | INSERT INTO `tomes` (id, name, description, author, tome_uploader, eldritch, hash, created_at, last_modified_at) VALUES (2001,"Test Tome 2","Filtered by a unit test :D", "kcarretto", 5, "print('Goodbye World!')", "gfedcba", "2023-03-04 14:51:13", "2023-03-04 14:51:13"); -requestor: +requester: session_token: secretToken query: | query MyTomes { diff --git a/tavern/test_data_test.go b/tavern/test_data_test.go index dae4cec2e..f8181dcc0 100644 --- a/tavern/test_data_test.go +++ b/tavern/test_data_test.go @@ -14,7 +14,7 @@ import ( // TestCreateTestData ensures createTestData runs without error and creates at least one beacon. func TestCreateTestData(t *testing.T) { var ( - ctx = context.Background() + ctx = context.Background() ) graph := enttest.OpenTempDB(t) defer graph.Close() diff --git a/tavern/tomes/file_tree/main.eldritch b/tavern/tomes/file_tree/main.eldritch index 3d2f236e5..b7280c420 100644 --- a/tavern/tomes/file_tree/main.eldritch +++ b/tavern/tomes/file_tree/main.eldritch @@ -22,14 +22,14 @@ def can_read(f): # Are we root? root = usernfo["euid"]["uid"] == 0 - # If the user isnt root and the user doesnt own the file, clear the user byte + # If the user isn't root and the user doesn't own the file, clear the user byte if not root and f["owner"] not in (usernfo["euid"]["name"], usernfo["uid"]["name"]): f_user = 0 # TODO: https://github.com/spellshift/realm/issues/570 # Will NOT match any group other than primary until #570 is fixed - # If the user isnt root and the group doesnt own the file, clear the group byte + # If the user isn't root and the group doesn't own the file, clear the group byte if not root and f["group"] not in (str(usernfo["egid"]), str(usernfo["gid"])): f_group = 0 diff --git a/tavern/tomes/git.go b/tavern/tomes/git.go index 852060ff8..5908c3797 100644 --- a/tavern/tomes/git.go +++ b/tavern/tomes/git.go @@ -286,7 +286,7 @@ func findTomePaths(tree *object.Tree) ([]string, error) { return tomePaths, nil } -// parseNamespaceFromGit attempts to return a shortend namespace for the tome based on the git URL. +// parseNamespaceFromGit attempts to return a shortened namespace for the tome based on the git URL. // If it cannot or something goes wrong, this will return the provided git URL as the namespace. func parseNamespaceFromGit(gitURLStr string) string { gitURL, err := url.Parse(gitURLStr) diff --git a/tavern/tomes/netstat/main.eldritch b/tavern/tomes/netstat/main.eldritch index b1a456534..e5d5c65bd 100644 --- a/tavern/tomes/netstat/main.eldritch +++ b/tavern/tomes/netstat/main.eldritch @@ -23,7 +23,7 @@ def netstat(): for p in process.list(): pids[p['pid']] = p['name'] - # Counts for dynamic column formating + # Counts for dynamic column formatting counts = [6, 6, 7, 6, 8] rows = [["PROTO", "LOCAL", "REMOTE", "STATE", "PROCESS"]] # Loop through each net result and format the columns