diff --git a/README.md b/README.md index 1e120cd3b3..e5de5abbcf 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + + + # spfs Filesystem isolation, capture, and distribution. diff --git a/src/bootstrap.rs b/src/bootstrap.rs index 611224a170..99017c7017 100644 --- a/src/bootstrap.rs +++ b/src/bootstrap.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::resolve::{which, which_spfs}; use super::status::active_runtime; use crate::{runtime, Result}; diff --git a/src/bootstrap_test.rs b/src/bootstrap_test.rs index f1dabf0402..8322a56e55 100644 --- a/src/bootstrap_test.rs +++ b/src/bootstrap_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::build_shell_initialized_command; diff --git a/src/clean.rs b/src/clean.rs index c67117c2d2..82f9162a71 100644 --- a/src/clean.rs +++ b/src/clean.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::HashSet; use indicatif::ParallelProgressIterator; diff --git a/src/clean_test.rs b/src/clean_test.rs index 75fb3eee42..9fac5cd858 100644 --- a/src/clean_test.rs +++ b/src/clean_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{ diff --git a/src/cli/args.rs b/src/cli/args.rs index 9a37804c33..82cc04ed02 100644 --- a/src/cli/args.rs +++ b/src/cli/args.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use sentry::IntoDsn; use spfs; diff --git a/src/cli/bin.rs b/src/cli/bin.rs index 8a6862bfec..1809606425 100644 --- a/src/cli/bin.rs +++ b/src/cli/bin.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; #[macro_use] diff --git a/src/cli/cmd_check.rs b/src/cli/cmd_check.rs index 8e89a3cfb4..a67b336dec 100644 --- a/src/cli/cmd_check.rs +++ b/src/cli/cmd_check.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_clean.rs b/src/cli/cmd_clean.rs index 9ece5d5a22..32e1c16d51 100644 --- a/src/cli/cmd_clean.rs +++ b/src/cli/cmd_clean.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use chrono::prelude::*; use colored::*; use structopt::StructOpt; diff --git a/src/cli/cmd_commit.rs b/src/cli/cmd_commit.rs index 1c86f92043..5a986f700f 100644 --- a/src/cli/cmd_commit.rs +++ b/src/cli/cmd_commit.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs::{encoding::Encodable, storage::TagStorage}; diff --git a/src/cli/cmd_diff.rs b/src/cli/cmd_diff.rs index 0bd62bf310..981f192e1c 100644 --- a/src/cli/cmd_diff.rs +++ b/src/cli/cmd_diff.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_edit.rs b/src/cli/cmd_edit.rs index 8634c363f5..0029bdbf9c 100644 --- a/src/cli/cmd_edit.rs +++ b/src/cli/cmd_edit.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_enter.rs b/src/cli/cmd_enter.rs index 140378de95..5012cc97ee 100644 --- a/src/cli/cmd_enter.rs +++ b/src/cli/cmd_enter.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::ffi::OsString; use structopt::StructOpt; diff --git a/src/cli/cmd_info.rs b/src/cli/cmd_info.rs index c6fd2e6848..1b6dec8bde 100644 --- a/src/cli/cmd_info.rs +++ b/src/cli/cmd_info.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use colored::*; use structopt::StructOpt; diff --git a/src/cli/cmd_init.rs b/src/cli/cmd_init.rs index 17c24a6bd1..4021de3f0a 100644 --- a/src/cli/cmd_init.rs +++ b/src/cli/cmd_init.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use spfs::Result; use std::ffi::OsString; use structopt::StructOpt; diff --git a/src/cli/cmd_join.rs b/src/cli/cmd_join.rs index c64e1bb12c..369c0f3d0c 100644 --- a/src/cli/cmd_join.rs +++ b/src/cli/cmd_join.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use spfs::Result; use std::ffi::OsString; use structopt::StructOpt; diff --git a/src/cli/cmd_layers.rs b/src/cli/cmd_layers.rs index 9142a4d22d..6c24b21618 100644 --- a/src/cli/cmd_layers.rs +++ b/src/cli/cmd_layers.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_log.rs b/src/cli/cmd_log.rs index 582595aa9e..1218b029ca 100644 --- a/src/cli/cmd_log.rs +++ b/src/cli/cmd_log.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use colored::*; use structopt::StructOpt; diff --git a/src/cli/cmd_ls.rs b/src/cli/cmd_ls.rs index 2b3a311095..38c9f9c4f0 100644 --- a/src/cli/cmd_ls.rs +++ b/src/cli/cmd_ls.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs::{self, prelude::*}; diff --git a/src/cli/cmd_ls_tags.rs b/src/cli/cmd_ls_tags.rs index e51d309d9d..8f2e1fbea6 100644 --- a/src/cli/cmd_ls_tags.rs +++ b/src/cli/cmd_ls_tags.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs::{self, prelude::*}; diff --git a/src/cli/cmd_migrate.rs b/src/cli/cmd_migrate.rs index aa2a04bfbd..422681d16e 100644 --- a/src/cli/cmd_migrate.rs +++ b/src/cli/cmd_migrate.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_platforms.rs b/src/cli/cmd_platforms.rs index d435e13c35..bf12ff2c8d 100644 --- a/src/cli/cmd_platforms.rs +++ b/src/cli/cmd_platforms.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_pull.rs b/src/cli/cmd_pull.rs index 5e400ebaab..7214c715fd 100644 --- a/src/cli/cmd_pull.rs +++ b/src/cli/cmd_pull.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_push.rs b/src/cli/cmd_push.rs index 33a3b4a79c..48957f80d2 100644 --- a/src/cli/cmd_push.rs +++ b/src/cli/cmd_push.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_read.rs b/src/cli/cmd_read.rs index 29bcc523ee..b54275b514 100644 --- a/src/cli/cmd_read.rs +++ b/src/cli/cmd_read.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs::{self, prelude::*}; diff --git a/src/cli/cmd_render.rs b/src/cli/cmd_render.rs index aa469b9ddf..0d7e18017b 100644 --- a/src/cli/cmd_render.rs +++ b/src/cli/cmd_render.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_reset.rs b/src/cli/cmd_reset.rs index 37da1ee292..746f907a7c 100644 --- a/src/cli/cmd_reset.rs +++ b/src/cli/cmd_reset.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use spfs::prelude::*; use structopt::StructOpt; diff --git a/src/cli/cmd_run.rs b/src/cli/cmd_run.rs index 3c61c10182..45dbc967d2 100644 --- a/src/cli/cmd_run.rs +++ b/src/cli/cmd_run.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::ffi::OsString; use structopt::StructOpt; diff --git a/src/cli/cmd_run_main.rs b/src/cli/cmd_run_main.rs index 5e11973cf4..756ae7bb91 100644 --- a/src/cli/cmd_run_main.rs +++ b/src/cli/cmd_run_main.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + #[macro_use] mod args; mod cmd_run; diff --git a/src/cli/cmd_runtimes.rs b/src/cli/cmd_runtimes.rs index 25ab6b652a..333854557f 100644 --- a/src/cli/cmd_runtimes.rs +++ b/src/cli/cmd_runtimes.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_search.rs b/src/cli/cmd_search.rs index d8baa40da3..6f2e3077b4 100644 --- a/src/cli/cmd_search.rs +++ b/src/cli/cmd_search.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_shell.rs b/src/cli/cmd_shell.rs index d4fec713b2..f0c40549b3 100644 --- a/src/cli/cmd_shell.rs +++ b/src/cli/cmd_shell.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_tag.rs b/src/cli/cmd_tag.rs index 5fd75239b4..0e4ae481d9 100644 --- a/src/cli/cmd_tag.rs +++ b/src/cli/cmd_tag.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs::{self, prelude::*}; diff --git a/src/cli/cmd_tags.rs b/src/cli/cmd_tags.rs index e066acc927..1bc73ec8f5 100644 --- a/src/cli/cmd_tags.rs +++ b/src/cli/cmd_tags.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/cli/cmd_version.rs b/src/cli/cmd_version.rs index f1afd95d91..4103492567 100644 --- a/src/cli/cmd_version.rs +++ b/src/cli/cmd_version.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use structopt::StructOpt; use spfs; diff --git a/src/commit.rs b/src/commit.rs index 51f84ad542..4828ba4aa5 100644 --- a/src/commit.rs +++ b/src/commit.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::config::load_config; use super::status::remount_runtime; use crate::prelude::*; diff --git a/src/commit_test.rs b/src/commit_test.rs index a059f2d6cf..2ea9985048 100644 --- a/src/commit_test.rs +++ b/src/commit_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{commit_layer, commit_platform}; diff --git a/src/config.rs b/src/config.rs index c8fc1f2bf5..36e9148a8a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use config::{Config as ConfigBase, Environment, File}; use crate::{runtime, storage, Result}; diff --git a/src/config_test.rs b/src/config_test.rs index e62e8b7056..0f84a62d79 100644 --- a/src/config_test.rs +++ b/src/config_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::Config; diff --git a/src/diff.rs b/src/diff.rs index 186f1dc0d0..0552a02004 100644 --- a/src/diff.rs +++ b/src/diff.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::resolve::compute_manifest; use super::status::{active_runtime, compute_runtime_manifest}; use crate::{tracking, Result}; diff --git a/src/encoding/binary.rs b/src/encoding/binary.rs index 7ee1d5a21a..f70a9a52b9 100644 --- a/src/encoding/binary.rs +++ b/src/encoding/binary.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::io::{Read, Write}; use unicode_reader::CodePoints; diff --git a/src/encoding/binary_test.rs b/src/encoding/binary_test.rs index e1e9f87024..06d541661c 100644 --- a/src/encoding/binary_test.rs +++ b/src/encoding/binary_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rand::Rng; use std::io::{Cursor, Read, Seek, SeekFrom, Write}; diff --git a/src/encoding/hash.rs b/src/encoding/hash.rs index 4ea7c24f72..6444f41477 100644 --- a/src/encoding/hash.rs +++ b/src/encoding/hash.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::convert::{TryFrom, TryInto}; use std::fmt::Display; use std::io::{Read, Write}; diff --git a/src/encoding/mod.rs b/src/encoding/mod.rs index 9befebd3d4..a6369b72d6 100644 --- a/src/encoding/mod.rs +++ b/src/encoding/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + mod binary; pub use binary::{ consume_header, read_digest, read_int, read_string, read_uint, write_digest, write_header, diff --git a/src/encoding/prelude.rs b/src/encoding/prelude.rs index 9a47d55aa3..b36938820b 100644 --- a/src/encoding/prelude.rs +++ b/src/encoding/prelude.rs @@ -1 +1,5 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub use super::{Decodable, Encodable}; diff --git a/src/env.rs b/src/env.rs index 5ebec4f420..b616068093 100644 --- a/src/env.rs +++ b/src/env.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + //! Functions related to the setup and management of the spfs runtime environment //! and related system namespacing use std::os::unix::io::AsRawFd; diff --git a/src/error.rs b/src/error.rs index 20a459d2be..c82e092a8b 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::io; use super::commit::NothingToCommitError; diff --git a/src/fixtures.rs b/src/fixtures.rs index 04daf6216a..e405ce796c 100644 --- a/src/fixtures.rs +++ b/src/fixtures.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + macro_rules! fixtures { () => { use rstest::fixture; diff --git a/src/graph/blob.rs b/src/graph/blob.rs index b33636367e..e1693c100c 100644 --- a/src/graph/blob.rs +++ b/src/graph/blob.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use crate::Result; diff --git a/src/graph/database.rs b/src/graph/database.rs index 289a2ff6ee..8dd0ae13e7 100644 --- a/src/graph/database.rs +++ b/src/graph/database.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::VecDeque; use super::{ diff --git a/src/graph/entry.rs b/src/graph/entry.rs index 7b232009af..d91ac47a30 100644 --- a/src/graph/entry.rs +++ b/src/graph/entry.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use crate::tracking; use crate::Result; diff --git a/src/graph/entry_test.rs b/src/graph/entry_test.rs index 9320fc0da2..b196deb9e7 100644 --- a/src/graph/entry_test.rs +++ b/src/graph/entry_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::Entry; diff --git a/src/graph/error.rs b/src/graph/error.rs index af1fba50c6..9ab007b488 100644 --- a/src/graph/error.rs +++ b/src/graph/error.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, Error}; /// Denotes a missing object or one that is not present in the database. diff --git a/src/graph/layer.rs b/src/graph/layer.rs index c4d73164bd..4bcfbe83b9 100644 --- a/src/graph/layer.rs +++ b/src/graph/layer.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use crate::Result; diff --git a/src/graph/layer_test.rs b/src/graph/layer_test.rs index 01a0c8b9f3..ee53801549 100644 --- a/src/graph/layer_test.rs +++ b/src/graph/layer_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::Layer; diff --git a/src/graph/manifest.rs b/src/graph/manifest.rs index f85bc09405..46c6a6fd07 100644 --- a/src/graph/manifest.rs +++ b/src/graph/manifest.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::{BTreeMap, BTreeSet}; use super::{Entry, Tree}; diff --git a/src/graph/manifest_test.rs b/src/graph/manifest_test.rs index 1c95708a9d..b5af5cda1a 100644 --- a/src/graph/manifest_test.rs +++ b/src/graph/manifest_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::Entry; diff --git a/src/graph/mod.rs b/src/graph/mod.rs index 7341892c55..ec9384c81b 100644 --- a/src/graph/mod.rs +++ b/src/graph/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + ///! Low-level digraph representation and manipulation for data storage. mod blob; mod database; diff --git a/src/graph/object.rs b/src/graph/object.rs index c0ef5f0053..a342b34911 100644 --- a/src/graph/object.rs +++ b/src/graph/object.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::Blob; use super::Layer; use super::Manifest; diff --git a/src/graph/operations.rs b/src/graph/operations.rs index 2a12abefbf..0303c08d4f 100644 --- a/src/graph/operations.rs +++ b/src/graph/operations.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::HashSet; use super::database::DatabaseView; diff --git a/src/graph/platform.rs b/src/graph/platform.rs index cf4ad509ac..216dd07203 100644 --- a/src/graph/platform.rs +++ b/src/graph/platform.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use crate::encoding::Encodable; use crate::Result; diff --git a/src/graph/platform_test.rs b/src/graph/platform_test.rs index b27b9935e8..d6b82b0ef2 100644 --- a/src/graph/platform_test.rs +++ b/src/graph/platform_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::Platform; diff --git a/src/graph/tree.rs b/src/graph/tree.rs index d3c71ec2af..16202688e8 100644 --- a/src/graph/tree.rs +++ b/src/graph/tree.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::BTreeSet; use super::Entry; diff --git a/src/graph/tree_test.rs b/src/graph/tree_test.rs index 0968a43e68..0601829975 100644 --- a/src/graph/tree_test.rs +++ b/src/graph/tree_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{Entry, Tree}; diff --git a/src/io.rs b/src/io.rs index 56f5ab0f7e..62b47056d4 100644 --- a/src/io.rs +++ b/src/io.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use colored::*; use crate::{encoding, storage, tracking, Error, Result}; diff --git a/src/lib.rs b/src/lib.rs index 7e23b903bf..a6b6e20cea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + //! Filesystem isolation, capture and distribution. #[macro_use] diff --git a/src/ls_tags.rs b/src/ls_tags.rs index 15d5846fed..98e589b4af 100644 --- a/src/ls_tags.rs +++ b/src/ls_tags.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::config::load_config; use super::storage::prelude::*; use crate::Result; diff --git a/src/prelude.rs b/src/prelude.rs index 93c9853281..a3de157f45 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,2 +1,6 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub use crate::encoding::prelude::*; pub use crate::storage::prelude::*; diff --git a/src/prune.rs b/src/prune.rs index c4e2c687bc..3ffdd7c799 100644 --- a/src/prune.rs +++ b/src/prune.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use chrono::prelude::*; use crate::{storage, tracking, Result}; diff --git a/src/prune_test.rs b/src/prune_test.rs index d2f55f13c8..78af309428 100644 --- a/src/prune_test.rs +++ b/src/prune_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use chrono::{TimeZone, Utc}; use rstest::rstest; diff --git a/src/resolve.rs b/src/resolve.rs index eb8a7ea503..b47d1fdbef 100644 --- a/src/resolve.rs +++ b/src/resolve.rs @@ -1,3 +1,6 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk use std::{collections::HashSet, iter::FromIterator, path::Path}; use indicatif::ParallelProgressIterator; diff --git a/src/runtime/csh_exp.rs b/src/runtime/csh_exp.rs index e08bac6d14..904fa3770d 100644 --- a/src/runtime/csh_exp.rs +++ b/src/runtime/csh_exp.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub static SOURCE: &str = r#" set shell [lindex $argv 0] set startup_script [lindex $argv 1] diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs index ca011a88d6..04a1fa1976 100644 --- a/src/runtime/mod.rs +++ b/src/runtime/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + //! Handles the setup and initialization of runtime environments mod csh_exp; diff --git a/src/runtime/overlayfs.rs b/src/runtime/overlayfs.rs index 4570fa7f1d..883960bd4a 100644 --- a/src/runtime/overlayfs.rs +++ b/src/runtime/overlayfs.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::os::unix::fs::MetadataExt; pub fn is_removed_entry(meta: &std::fs::Metadata) -> bool { diff --git a/src/runtime/startup_csh.rs b/src/runtime/startup_csh.rs index 8f46f989c6..0bddf72187 100644 --- a/src/runtime/startup_csh.rs +++ b/src/runtime/startup_csh.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub static SOURCE: &str = r#"#!/usr/bin/env csh if ( -f ~/.tcshrc ) then source ~/.tcshrc || true diff --git a/src/runtime/startup_sh.rs b/src/runtime/startup_sh.rs index e064f12e76..5f8a056a23 100644 --- a/src/runtime/startup_sh.rs +++ b/src/runtime/startup_sh.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub static SOURCE: &str = r#"#!/usr/bin/env sh if [[ -f ~/.bashrc ]]; then source ~/.bashrc || true diff --git a/src/runtime/storage.rs b/src/runtime/storage.rs index 281122acaf..a314ac42be 100644 --- a/src/runtime/storage.rs +++ b/src/runtime/storage.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + ///! Local file system storage of runtimes. use std::ffi::OsStr; use std::os::unix::fs::{MetadataExt, PermissionsExt}; diff --git a/src/runtime/storage_test.rs b/src/runtime/storage_test.rs index d7c6ab4bfb..ddbdb6b682 100644 --- a/src/runtime/storage_test.rs +++ b/src/runtime/storage_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::ffi::OsStr; use std::os::unix::fs::PermissionsExt; diff --git a/src/status.rs b/src/status.rs index 8908c98030..48ab7824db 100644 --- a/src/status.rs +++ b/src/status.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::config::{load_config, Config}; use super::resolve::{resolve_overlay_dirs, resolve_stack_to_layers}; use crate::{bootstrap, env, prelude::*, runtime, tracking, Error, Result}; diff --git a/src/storage/blob.rs b/src/storage/blob.rs index 8ef1193484..0c38cca36c 100644 --- a/src/storage/blob.rs +++ b/src/storage/blob.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, graph, Result}; pub trait BlobStorage: graph::Database { diff --git a/src/storage/fs/database.rs b/src/storage/fs/database.rs index 7f1b744a28..2713a02119 100644 --- a/src/storage/fs/database.rs +++ b/src/storage/fs/database.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::os::unix::fs::PermissionsExt; use crate::graph::Object; diff --git a/src/storage/fs/database_test.rs b/src/storage/fs/database_test.rs index 1ae49783fc..744aa8425c 100644 --- a/src/storage/fs/database_test.rs +++ b/src/storage/fs/database_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + from typing import Any, BinaryIO, Tuple, Optional import time import multiprocessing diff --git a/src/storage/fs/hash_store.rs b/src/storage/fs/hash_store.rs index 93599ea8a5..0731628356 100644 --- a/src/storage/fs/hash_store.rs +++ b/src/storage/fs/hash_store.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::ffi::OsStr; use std::io::ErrorKind; use std::os::unix::fs::PermissionsExt; diff --git a/src/storage/fs/layer_test.rs b/src/storage/fs/layer_test.rs index bcae63f73f..37556bd73e 100644 --- a/src/storage/fs/layer_test.rs +++ b/src/storage/fs/layer_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + import os import py.path diff --git a/src/storage/fs/migrations/mod.rs b/src/storage/fs/migrations/mod.rs index f766196481..5de3170473 100644 --- a/src/storage/fs/migrations/mod.rs +++ b/src/storage/fs/migrations/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::path::{Path, PathBuf}; use super::read_last_migration_version; diff --git a/src/storage/fs/mod.rs b/src/storage/fs/mod.rs index 88682fa648..861293d46b 100644 --- a/src/storage/fs/mod.rs +++ b/src/storage/fs/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + //! Uses a local directory on disk to store the spfs repository. mod database; diff --git a/src/storage/fs/payloads.rs b/src/storage/fs/payloads.rs index 583a7d62f9..dddaa89ff5 100644 --- a/src/storage/fs/payloads.rs +++ b/src/storage/fs/payloads.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::io::ErrorKind; use super::FSRepository; diff --git a/src/storage/fs/payloads_test.rs b/src/storage/fs/payloads_test.rs index c1ecc597b7..fddc084d79 100644 --- a/src/storage/fs/payloads_test.rs +++ b/src/storage/fs/payloads_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + import py.path from ._payloads import makedirs_with_perms diff --git a/src/storage/fs/renderer.rs b/src/storage/fs/renderer.rs index 3493ae9cd3..5bcf7eeb3f 100644 --- a/src/storage/fs/renderer.rs +++ b/src/storage/fs/renderer.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::os::unix::fs::PermissionsExt; use std::path::{Path, PathBuf}; diff --git a/src/storage/fs/renderer_test.rs b/src/storage/fs/renderer_test.rs index 7457aa00d9..7385bf68ae 100644 --- a/src/storage/fs/renderer_test.rs +++ b/src/storage/fs/renderer_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::was_render_completed; diff --git a/src/storage/fs/repository.rs b/src/storage/fs/repository.rs index 585eda12b6..d77e3cefe5 100644 --- a/src/storage/fs/repository.rs +++ b/src/storage/fs/repository.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::path::{Path, PathBuf}; use super::FSHashStore; diff --git a/src/storage/fs/tag.rs b/src/storage/fs/tag.rs index 1836694d05..80b5768b7b 100644 --- a/src/storage/fs/tag.rs +++ b/src/storage/fs/tag.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::{ ffi::OsStr, os::unix::fs::PermissionsExt, diff --git a/src/storage/fs/tag_test.rs b/src/storage/fs/tag_test.rs index 0cb614fbbd..65d3a5a329 100644 --- a/src/storage/fs/tag_test.rs +++ b/src/storage/fs/tag_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::os::unix::fs::MetadataExt; use rstest::rstest; diff --git a/src/storage/layer.rs b/src/storage/layer.rs index 610382892d..e652f27912 100644 --- a/src/storage/layer.rs +++ b/src/storage/layer.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, graph, Result}; use encoding::Encodable; diff --git a/src/storage/layer_test.rs b/src/storage/layer_test.rs index 6f2413ef12..391e3cd4ac 100644 --- a/src/storage/layer_test.rs +++ b/src/storage/layer_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + import io from .. import encoding diff --git a/src/storage/manifest.rs b/src/storage/manifest.rs index 2019af12b4..43777211e9 100644 --- a/src/storage/manifest.rs +++ b/src/storage/manifest.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, graph, Result}; #[cfg(test)] diff --git a/src/storage/manifest_entry_test.rs b/src/storage/manifest_entry_test.rs index 5cb50d7d7a..dbb13d89a1 100644 --- a/src/storage/manifest_entry_test.rs +++ b/src/storage/manifest_entry_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + from .. import encoding, tracking from ._manifest import Entry diff --git a/src/storage/manifest_test.rs b/src/storage/manifest_test.rs index 0cd84f8ba4..968bedc156 100644 --- a/src/storage/manifest_test.rs +++ b/src/storage/manifest_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use crate::graph::{Database, DatabaseView, Manifest}; diff --git a/src/storage/mod.rs b/src/storage/mod.rs index b4f5446813..4297ff9d49 100644 --- a/src/storage/mod.rs +++ b/src/storage/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + mod blob; mod layer; mod manifest; diff --git a/src/storage/payload.rs b/src/storage/payload.rs index a77da0acd0..7ee3d1543c 100644 --- a/src/storage/payload.rs +++ b/src/storage/payload.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use crate::Result; diff --git a/src/storage/platform.rs b/src/storage/platform.rs index 263a361dab..f84b1c0445 100644 --- a/src/storage/platform.rs +++ b/src/storage/platform.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, graph, Result}; pub trait PlatformStorage: graph::Database { diff --git a/src/storage/platform_test.rs b/src/storage/platform_test.rs index 57410ed9e6..30d5146c50 100644 --- a/src/storage/platform_test.rs +++ b/src/storage/platform_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + import io from .. import graph, encoding diff --git a/src/storage/prelude.rs b/src/storage/prelude.rs index 196c5f2cfb..edc563a115 100644 --- a/src/storage/prelude.rs +++ b/src/storage/prelude.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub use super::{ BlobStorage, LayerStorage, ManifestStorage, ManifestViewer, PayloadStorage, PlatformStorage, Repository, RepositoryHandle, TagStorage, diff --git a/src/storage/registry.rs b/src/storage/registry.rs index df1772f1d6..885555afbb 100644 --- a/src/storage/registry.rs +++ b/src/storage/registry.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + from typing import Dict, Callable import urllib.parse diff --git a/src/storage/repository.rs b/src/storage/repository.rs index 7ffe86f995..f32a74c177 100644 --- a/src/storage/repository.rs +++ b/src/storage/repository.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::HashSet; use super::ManifestViewer; diff --git a/src/storage/repository_test.rs b/src/storage/repository_test.rs index 1ba98c2f99..3bd5088d05 100644 --- a/src/storage/repository_test.rs +++ b/src/storage/repository_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::HashSet; use std::iter::FromIterator; use std::os::unix::fs::MetadataExt; diff --git a/src/storage/tag.rs b/src/storage/tag.rs index 302362a07c..85eb3c6735 100644 --- a/src/storage/tag.rs +++ b/src/storage/tag.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::{encoding, tracking, Result}; use encoding::Encodable; use relative_path::RelativePath; diff --git a/src/storage/tar/mod.rs b/src/storage/tar/mod.rs index 5ce84191f6..9e6d5586f4 100644 --- a/src/storage/tar/mod.rs +++ b/src/storage/tar/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + //! An spfs storage implementation where all data is unpacked and repacked //! into a tar archive on disk diff --git a/src/storage/tar/repository.rs b/src/storage/tar/repository.rs index d6becaf374..fb00de13a7 100644 --- a/src/storage/tar/repository.rs +++ b/src/storage/tar/repository.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::path::Path; use tar::{Archive, Builder}; diff --git a/src/sync.rs b/src/sync.rs index 80c90f46d3..6f0750a2d0 100644 --- a/src/sync.rs +++ b/src/sync.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use indicatif::ParallelProgressIterator; use rayon::prelude::*; diff --git a/src/sync_test.rs b/src/sync_test.rs index 986d0e811f..c286d3930f 100644 --- a/src/sync_test.rs +++ b/src/sync_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{push_ref, sync_ref}; diff --git a/src/tracking/diff.rs b/src/tracking/diff.rs index 5c8f60f7e4..9935024e7b 100644 --- a/src/tracking/diff.rs +++ b/src/tracking/diff.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::collections::HashSet; use relative_path::RelativePathBuf; diff --git a/src/tracking/diff_test.rs b/src/tracking/diff_test.rs index a2b66e96aa..15e8b99b50 100644 --- a/src/tracking/diff_test.rs +++ b/src/tracking/diff_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{compute_diff, Diff, DiffMode}; diff --git a/src/tracking/entry.rs b/src/tracking/entry.rs index d507e554ae..2a2b961bc2 100644 --- a/src/tracking/entry.rs +++ b/src/tracking/entry.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::str::FromStr; use std::string::ToString; diff --git a/src/tracking/env.rs b/src/tracking/env.rs index febeab521b..c7e3b08dfb 100644 --- a/src/tracking/env.rs +++ b/src/tracking/env.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use super::tag::TagSpec; use crate::encoding; use crate::{Error, Result}; diff --git a/src/tracking/env_test.rs b/src/tracking/env_test.rs index aa9a84e351..7b833f0d20 100644 --- a/src/tracking/env_test.rs +++ b/src/tracking/env_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::EnvSpec; diff --git a/src/tracking/manifest.rs b/src/tracking/manifest.rs index 8452079c34..9eea079bc6 100644 --- a/src/tracking/manifest.rs +++ b/src/tracking/manifest.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use std::os::unix::ffi::OsStrExt; use std::os::unix::fs::MetadataExt; diff --git a/src/tracking/manifest_test.rs b/src/tracking/manifest_test.rs index 0544a1358f..904fd52346 100644 --- a/src/tracking/manifest_test.rs +++ b/src/tracking/manifest_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{compute_manifest, EntryKind, Manifest}; diff --git a/src/tracking/mod.rs b/src/tracking/mod.rs index 1d529b6c98..a23869bdcd 100644 --- a/src/tracking/mod.rs +++ b/src/tracking/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + ///! Object tracking and definitions mod diff; pub use diff::{compute_diff, Diff, DiffMode}; diff --git a/src/tracking/object.rs b/src/tracking/object.rs index b7d894f575..8ae0f9ee75 100644 --- a/src/tracking/object.rs +++ b/src/tracking/object.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use crate::encoding; use super::entry::Entry; diff --git a/src/tracking/tag.rs b/src/tracking/tag.rs index cc288606fe..767181a622 100644 --- a/src/tracking/tag.rs +++ b/src/tracking/tag.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use chrono::prelude::*; use crate::encoding; diff --git a/src/tracking/tag_test.rs b/src/tracking/tag_test.rs index ccf5477413..e27f64cdde 100644 --- a/src/tracking/tag_test.rs +++ b/src/tracking/tag_test.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use rstest::rstest; use super::{split_tag_spec, Tag, TagSpec}; diff --git a/tests/integration/run_tests.sh b/tests/integration/run_tests.sh index eca2078ded..d55b11d1cd 100755 --- a/tests/integration/run_tests.sh +++ b/tests/integration/run_tests.sh @@ -1,4 +1,9 @@ #!/bin/bash + +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + ## Run all integration tests in this folder # these are expected to be run off of the installed spfs binaries # with the proper capabilities diff --git a/tests/integration/test_remount_save_changes.sh b/tests/integration/test_remount_save_changes.sh index 2860677622..11f1671100 100644 --- a/tests/integration/test_remount_save_changes.sh +++ b/tests/integration/test_remount_save_changes.sh @@ -1,4 +1,9 @@ #!/bin/bash + +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + # test that a removed directory does not show up when running the env later filepath="/spfs/file1"; diff --git a/tests/integration/test_runtime_dir_removal.sh b/tests/integration/test_runtime_dir_removal.sh index 6d452f7a7d..847177d4e6 100644 --- a/tests/integration/test_runtime_dir_removal.sh +++ b/tests/integration/test_runtime_dir_removal.sh @@ -1,4 +1,9 @@ #!/bin/bash + +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + # test that a removed directory does not show up when running the env later dirpath="/spfs/dir1/dir2/dir3"; diff --git a/tests/integration/test_runtime_file_removal.sh b/tests/integration/test_runtime_file_removal.sh index 1ec159ff15..8747dcd1a4 100644 --- a/tests/integration/test_runtime_file_removal.sh +++ b/tests/integration/test_runtime_file_removal.sh @@ -1,5 +1,9 @@ - #!/bin/bash + +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + # test that a removed file is masked in future environments filename="/spfs/message.txt"; diff --git a/tests/integration/test_runtime_recursion.sh b/tests/integration/test_runtime_recursion.sh index 46fe4b22a6..1a871a7bf5 100644 --- a/tests/integration/test_runtime_recursion.sh +++ b/tests/integration/test_runtime_recursion.sh @@ -1,4 +1,9 @@ #!/bin/bash + +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + # test that spfs can be run from within spfs out=$(spfs run '' -- sh -c 'spfs edit --off && spfs run - -- echo hello')