merge: #3490

3490: Ensure actions work with secrets and move apply change set logic to dal (ENG-2410) r=nickgerace a=nickgerace

## Description

This PR adds an integration test for ensuring that actions work with secrets. For both testing and for code reuse, the apply logic has been moved to the dal.

<img src="https://media3.giphy.com/media/EDd9ER1ixrCzMprljW/giphy.gif"/>

## Additional Changes

- Move the upsertion of "create" actions to `Component::new`
- Rename `ChangeSetPointerError` to `ChangeSetError` and `ChangeSetPointerResult` to `ChangeSetResult` for two reasons
  - First reason: this is part of the ongoing refactor to replace the new change set concept with the old one
  - Second reason: to avoid confusion with the introduction of the `ChangeSetApplyError` and `ChangeSetApplyResult` types
- Reduce and refactor sdf change set service errors
- Standardize package version string for test exclusive schemas
- Standardize package "created by" string for test exclusive schemas
- Make the secret defining test exclusive schema more generic and rename "fake" to "dummy" (the previous name was confusing given the name of the sockets for the fallout and starfield schemas)
- Return an error when a qualification map attribute value does not have an ordering node

Co-authored-by: Nick Gerace <nick@systeminit.com>

Author: si-bors-ng[bot]

lib/dal-test/src/lib.rs

@@ -753,7 +753,7 @@ async fn migrate_local_builtins(
     schema::migrate_pkg(&ctx, SI_AWS_EC2_PKG, None).await?;
     schemas::migrate_test_exclusive_schema_starfield(&ctx).await?;
     schemas::migrate_test_exclusive_schema_fallout(&ctx).await?;
-    schemas::migrate_test_exclusive_schema_bethesda_secret(&ctx).await?;
+    schemas::migrate_test_exclusive_schema_dummy_secret(&ctx).await?;
     schemas::migrate_test_exclusive_schema_swifty(&ctx).await?;
     schemas::migrate_test_exclusive_schema_katy_perry(&ctx).await?;
     schemas::migrate_test_exclusive_schema_pirate(&ctx).await?;

lib/dal-test/src/schemas/mod.rs

@@ -1,14 +1,17 @@
-pub use test_exclusive_schema_bethesda_secret::migrate_test_exclusive_schema_bethesda_secret;
 pub use test_exclusive_schema_category_pirate::migrate_test_exclusive_schema_pet_shop;
 pub use test_exclusive_schema_category_pirate::migrate_test_exclusive_schema_pirate;
+pub use test_exclusive_schema_dummy_secret::migrate_test_exclusive_schema_dummy_secret;
 pub use test_exclusive_schema_fallout::migrate_test_exclusive_schema_fallout;
 pub use test_exclusive_schema_katy_perry::migrate_test_exclusive_schema_katy_perry;
 pub use test_exclusive_schema_starfield::migrate_test_exclusive_schema_starfield;
 pub use test_exclusive_schema_swifty::migrate_test_exclusive_schema_swifty;
 
+const PKG_VERSION: &str = "2019-06-03";
+const PKG_CREATED_BY: &str = "System Initiative";
+
 mod schema_helpers;
-mod test_exclusive_schema_bethesda_secret;
 mod test_exclusive_schema_category_pirate;
+mod test_exclusive_schema_dummy_secret;
 mod test_exclusive_schema_fallout;
 mod test_exclusive_schema_katy_perry;
 mod test_exclusive_schema_starfield;

lib/dal-test/src/schemas/schema_helpers.rs

@@ -1,17 +1,15 @@
 use dal::func::argument::FuncArgumentKind;
 use dal::func::intrinsics::IntrinsicFunc;
-use dal::BuiltinsError;
+use dal::{BuiltinsError, BuiltinsResult};
 use si_pkg::{
     FuncArgumentSpec, FuncSpec, FuncSpecBackendKind, FuncSpecBackendResponseType, FuncSpecData,
 };
 
-pub(crate) fn create_identity_func() -> FuncSpec {
-    IntrinsicFunc::Identity
-        .to_spec()
-        .expect("create identity func spec")
+pub(crate) fn create_identity_func() -> BuiltinsResult<FuncSpec> {
+    Ok(IntrinsicFunc::Identity.to_spec()?)
 }
 
-pub(crate) async fn build_resource_payload_to_value_func() -> Result<FuncSpec, BuiltinsError> {
+pub(crate) async fn build_resource_payload_to_value_func() -> BuiltinsResult<FuncSpec> {
     let resource_payload_to_value_func_code = "async function main(arg: Input): Promise<Output> {\
             return arg.payload ?? {};
         }";
@@ -60,10 +58,7 @@ pub(crate) async fn build_action_func(
     Ok(func)
 }
 
-pub(crate) async fn build_codegen_func(
-    code: &str,
-    fn_name: &str,
-) -> Result<FuncSpec, BuiltinsError> {
+pub(crate) async fn build_codegen_func(code: &str, fn_name: &str) -> BuiltinsResult<FuncSpec> {
     let func = FuncSpec::builder()
         .name(fn_name)
         .unique_id(fn_name)
@@ -87,7 +82,7 @@ pub(crate) async fn build_codegen_func(
     Ok(func)
 }
 
-pub(crate) async fn build_asset_func(fn_name: &str) -> Result<FuncSpec, BuiltinsError> {
+pub(crate) async fn build_asset_func(fn_name: &str) -> BuiltinsResult<FuncSpec> {
     let scaffold_func = "function main() {\
                 return new AssetBuilder().build();
             }";

lib/dal-test/src/schemas/test_exclusive_schema_category_pirate.rs

@@ -15,10 +15,10 @@ pub async fn migrate_test_exclusive_schema_pirate(ctx: &DalContext) -> BuiltinsR
 
     builder
         .name("pirate")
-        .version("2024-03-12")
-        .created_by("System Initiative");
+        .version(crate::schemas::PKG_VERSION)
+        .created_by(crate::schemas::PKG_CREATED_BY);
 
-    let identity_func_spec = create_identity_func();
+    let identity_func_spec = create_identity_func()?;
 
     // Create Scaffold Func
     let fn_name = "test:scaffoldPirateAsset";
@@ -137,10 +137,10 @@ pub async fn migrate_test_exclusive_schema_pet_shop(ctx: &DalContext) -> Builtin
 
     builder
         .name(schema_name)
-        .version("2024-03-21")
-        .created_by("System Initiative");
+        .version(crate::schemas::PKG_VERSION)
+        .created_by(crate::schemas::PKG_CREATED_BY);
 
-    let identity_func_spec = create_identity_func();
+    let identity_func_spec = create_identity_func()?;
 
     // Create Scaffold Func
     let fn_name = "test:scaffoldPetShopAsset";

…test_exclusive_schema_bethesda_secret.rs …as/test_exclusive_schema_dummy_secret.rslib/dal-test/src/schemas/test_exclusive_schema_bethesda_secret.rs renamed to lib/dal-test/src/schemas/test_exclusive_schema_dummy_secret.rs lib/dal-test/src/schemas/test_exclusive_schema_bethesda_secret.rs renamed to lib/dal-test/src/schemas/test_exclusive_schema_dummy_secret.rs

@@ -14,22 +14,22 @@ use si_pkg::{
     SchemaSpecData, SocketSpecArity,
 };
 
-pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) -> BuiltinsResult<()> {
-    let name = "bethesda-secret";
+pub async fn migrate_test_exclusive_schema_dummy_secret(ctx: &DalContext) -> BuiltinsResult<()> {
+    let name = "dummy-secret";
 
     let mut builder = PkgSpec::builder();
 
     builder
         .name(name)
-        .version("2024-03-01")
-        .created_by("System Initiative");
+        .version(crate::schemas::PKG_VERSION)
+        .created_by(crate::schemas::PKG_CREATED_BY);
 
     let identity_func_spec = IntrinsicFunc::Identity.to_spec()?;
 
     let scaffold_func = "function createAsset() {\
         return new AssetBuilder().build()
     }";
-    let fn_name = "test:scaffoldBethesdaSecretAsset";
+    let fn_name = "test:scaffoldDummySecretAsset";
     let authoring_schema_func = FuncSpec::builder()
         .name(fn_name)
         .unique_id(fn_name)
@@ -44,8 +44,8 @@ pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) ->
         )
         .build()?;
 
-    let auth_func_code = "async function auth(secret: Input): Promise<Output> { requestStorage.setItem('fakeSecretString', secret.value); }";
-    let fn_name = "test:setFakeSecretString";
+    let auth_func_code = "async function auth(secret: Input): Promise<Output> { requestStorage.setItem('dummySecretString', secret.value); }";
+    let fn_name = "test:setDummySecretString";
     let auth_func = FuncSpec::builder()
         .name(fn_name)
         .unique_id(fn_name)
@@ -66,13 +66,13 @@ pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) ->
         )
         .build()?;
 
-    let (fake_secret_definition_prop, fake_secret_prop, fake_secret_output_socket) =
-        assemble_secret_definition_fake(&identity_func_spec)?;
+    let (dummy_secret_definition_prop, dummy_secret_prop, dummy_secret_output_socket) =
+        assemble_secret_definition_dummy(&identity_func_spec)?;
 
     let (
-        qualification_fake_secret_value_is_todd_func,
-        qualification_fake_secret_value_is_todd_leaf,
-    ) = assemble_qualification_fake_secret_value_is_todd()?;
+        qualification_dummy_secret_value_is_todd_func,
+        qualification_dummy_secret_value_is_todd_leaf,
+    ) = assemble_qualification_dummy_secret_value_is_todd()?;
 
     let schema = SchemaSpec::builder()
         .name(name)
@@ -100,10 +100,10 @@ pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) ->
                         .func_unique_id(&auth_func.unique_id)
                         .build()?,
                 )
-                .secret_prop(fake_secret_prop)
-                .secret_definition_prop(fake_secret_definition_prop)
-                .socket(fake_secret_output_socket)
-                .leaf_function(qualification_fake_secret_value_is_todd_leaf)
+                .secret_prop(dummy_secret_prop)
+                .secret_definition_prop(dummy_secret_definition_prop)
+                .socket(dummy_secret_output_socket)
+                .leaf_function(qualification_dummy_secret_value_is_todd_leaf)
                 .build()?,
         )
         .build()?;
@@ -112,7 +112,7 @@ pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) ->
         .func(identity_func_spec)
         .func(authoring_schema_func)
         .func(auth_func)
-        .func(qualification_fake_secret_value_is_todd_func)
+        .func(qualification_dummy_secret_value_is_todd_func)
         .schema(schema)
         .build()?;
 
@@ -131,10 +131,10 @@ pub async fn migrate_test_exclusive_schema_bethesda_secret(ctx: &DalContext) ->
 }
 
 // Mimics the "defineSecret" function in "asset_builder.ts".
-fn assemble_secret_definition_fake(
+fn assemble_secret_definition_dummy(
     identity_func_spec: &FuncSpec,
 ) -> BuiltinsResult<(PropSpec, PropSpec, SocketSpec)> {
-    let secret_definition_name = "fake";
+    let secret_definition_name = "dummy";
 
     // First, create the child of "/root/secret_definition" that defines our secret.
     let new_secret_definition_prop = PropSpec::builder()
@@ -188,30 +188,30 @@ fn assemble_secret_definition_fake(
     ))
 }
 
-fn assemble_qualification_fake_secret_value_is_todd() -> BuiltinsResult<(FuncSpec, LeafFunctionSpec)>
-{
+fn assemble_qualification_dummy_secret_value_is_todd(
+) -> BuiltinsResult<(FuncSpec, LeafFunctionSpec)> {
     let fn_code = "async function qualification(_component: Input): Promise<Output> {\
-        const authCheck = requestStorage.getItem('fakeSecretString');
+        const authCheck = requestStorage.getItem('dummySecretString');
         if (authCheck) {
             if (authCheck === 'todd') {
                 return {
                     result: 'success',
-                    message: 'fake secret string matches expected value'
+                    message: 'dummy secret string matches expected value'
                 };
             }
             return {
                 result: 'failure',
-                message: 'fake secret string does not match expected value'
+                message: 'dummy secret string does not match expected value'
             };
         } else {
             return {
                 result: 'failure',
-                message: 'fake secret string is empty'
+                message: 'dummy secret string is empty'
             };
         }
     }";
-    let fn_name = "test:qualificationFakeSecretStringIsTodd";
-    let qualification_fake_secret_value_is_todd_func = FuncSpec::builder()
+    let fn_name = "test:qualificationDummySecretStringIsTodd";
+    let qualification_dummy_secret_value_is_todd_func = FuncSpec::builder()
         .name(fn_name)
         .unique_id(fn_name)
         .data(
@@ -225,14 +225,14 @@ fn assemble_qualification_fake_secret_value_is_todd() -> BuiltinsResult<(FuncSpe
         )
         .build()?;
 
-    let qualification_fake_secret_value_is_todd_leaf = LeafFunctionSpec::builder()
-        .func_unique_id(&qualification_fake_secret_value_is_todd_func.unique_id)
+    let qualification_dummy_secret_value_is_todd_leaf = LeafFunctionSpec::builder()
+        .func_unique_id(&qualification_dummy_secret_value_is_todd_func.unique_id)
         .leaf_kind(LeafKind::Qualification)
         .inputs(vec![LeafInputLocation::Secrets])
         .build()?;
 
     Ok((
-        qualification_fake_secret_value_is_todd_func,
-        qualification_fake_secret_value_is_todd_leaf,
+        qualification_dummy_secret_value_is_todd_func,
+        qualification_dummy_secret_value_is_todd_leaf,
     ))
 }