Add test for importing computed repositories

2 files changed, 222 insertions, 1 deletions

diff --git a/test/end-to-end/git-import/TARGETS b/test/end-to-end/git-import/TARGETS
index 19c7794c..070a929e 100644
--- a/test/end-to-end/git-import/TARGETS
+++ b/test/end-to-end/git-import/TARGETS
@@ -42,6 +42,19 @@
     ]
   , "keep": ["repos.json", "deduplicated.json"]
   }
+, "computed":
+  { "type": ["@", "rules", "shell/test", "script"]
+  , "name": ["computed"]
+  , "test": ["computed.sh"]
+  , "deps":
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
+    , ["end-to-end", "deduplicate-tool-under-test"]
+    , ["end-to-end", "git-import-under-test"]
+    ]
+  , "keep":
+    ["repos-full.json", "actions-full.json", "repos.json", "actions.json"]
+  }
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
   , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
@@ -53,7 +66,7 @@
       , { "type": "if"
         , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
         , "then": []
-        , "else": ["chained-import", "annotations"]
+        , "else": ["chained-import", "annotations", "computed"]
         }
       ]
     }
diff --git a/test/end-to-end/git-import/computed.sh b/test/end-to-end/git-import/computed.sh
new file mode 100644
index 00000000..b60ea00b
--- /dev/null
+++ b/test/end-to-end/git-import/computed.sh
@@ -0,0 +1,208 @@
+#!/bin/sh
+# Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -e
+
+readonly DEDUPLICATE="${PWD}/bin/deduplicate-tool-under-test"
+readonly GIT_IMPORT="${PWD}/bin/git-import-under-test"
+readonly JUST="${PWD}/bin/tool-under-test"
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
+readonly LBR="${TEST_TMPDIR}/local-build-root"
+readonly OUT="${TEST_TMPDIR}/build-output"
+readonly REPO_DIRS="${TEST_TMPDIR}/repos"
+readonly WRKDIR="${PWD}"
+
+# Set up repo foo
+mkdir -p "${REPO_DIRS}/foo/src"
+cd "${REPO_DIRS}/foo"
+cat > repos.json <<'EOF'
+{ "repositories":
+  { "":
+    { "repository":
+      { "type": "file"
+      , "path": "src"
+      , "pragma": {"to_git": true}
+      }
+    }
+  }
+}
+EOF
+cat > src/TARGETS <<'EOF'
+{ "": {"type": "export", "target": "gen"}
+, "gen":
+  {"type": "generic", "outs": ["foo.txt"], "cmds": ["echo -n FOO > foo.txt"]}
+}
+EOF
+git init
+git checkout --orphan foomaster
+git config user.name 'N.O.Body'
+git config user.email 'nobody@example.org'
+git add .
+git commit -m 'Add foo.txt' 2>&1
+
+# Set up repo bar
+mkdir -p "${REPO_DIRS}/bar"
+cd "${REPO_DIRS}/bar"
+cat > repos.template.json <<'EOF'
+{ "repositories":
+  { "": {"repository": "inner", "target_root": "computed_src"}
+  , "inner":
+    { "repository": {"type": "file", "path": ".", "pragma": {"to_git": true}}
+    , "bindings": {"DoNotImport": "Missing"}
+    }
+  , "src":
+    { "repository": {"type": "file", "path": "src", "pragma": {"to_git": true}}
+    , "bindings": {"foo": "foo"}
+    }
+  , "computed_src":
+    { "repository":
+      { "type": "computed"
+      , "repo": "src"
+      , "target": ["", ""]
+      , "config": {"COUNT": "10"}
+      }
+    }
+  , "root_inner":
+    { "repository": {"type": "file", "path": ".", "pragma": {"to_git": true}}
+    , "bindings": {"AlsoDoNotImport": "AlsoMissing"}
+    }
+  , "root": {"repository": "root_inner", "bindings": {"foo": "foo"}}
+  , "bar_root":
+    { "repository":
+      { "type": "computed"
+      , "repo": "root"
+      , "target": ["", ""]
+      , "config": {"COUNT": "12"}
+      }
+    }
+  }
+}
+EOF
+
+"${GIT_IMPORT}" -C repos.template.json \
+  --as foo -b foomaster "${REPO_DIRS}/foo" > repos.json
+cat repos.json
+
+cat > generate.py <<'EOF'
+import json
+import sys
+
+COUNT = int(sys.argv[1])
+targets = {}
+for i in range(COUNT):
+  targets["%d" % i] = {"type": "generic", "outs": ["%d.txt" %i],
+                       "cmds": ["seq 0 %d > %d.txt" % (i, i)]}
+targets[""] = {"type": "export", "target": "gen"}
+targets["gen"] = {"type": "generic",
+               "deps": ["%d" % i for i in range(COUNT)],
+               "cmds": [" ".join(["cat"] + ["%d.txt" % i for i in range(COUNT)]
+                                 + ["> out"])],
+               "outs": ["out"]}
+print (json.dumps(targets, indent=2))
+EOF
+cat > TARGETS <<'EOF'
+{ "": {"type": "export", "flexible_config": ["COUNT"], "target": "generate"}
+, "generate":
+  { "type": "generic"
+  , "arguments_config": ["COUNT"]
+  , "outs": ["TARGETS", "bar.txt"]
+  , "deps": ["generate.py", ["@", "foo", "", ""]]
+  , "cmds":
+    [ { "type": "join"
+      , "separator": " "
+      , "$1":
+        [ "python3"
+        , "generate.py"
+        , {"type": "var", "name": "COUNT"}
+        , ">"
+        , "TARGETS"
+        ]
+      }
+    , "cat foo.txt | tr A-Z a-z > bar.txt"
+    ]
+  }
+}
+EOF
+mkdir src
+cp generate.py src/generate.py
+cp TARGETS src/TARGETS
+
+git init
+git checkout --orphan barmaster
+git config user.name 'N.O.Body'
+git config user.email 'nobody@example.org'
+git add .
+git commit -m 'Add foo.txt' 2>&1
+
+# Set up repo to build
+mkdir -p "${WRKDIR}"
+cd "${WRKDIR}"
+touch ROOT
+cat > TARGETS <<'EOF'
+{ "": {"type": "export", "target": "gen"}
+, "gen":
+  { "type": "generic"
+  , "cmds": ["cat bar.txt init.txt > out.txt"]
+  , "outs": ["out.txt"]
+  , "deps": [["@", "bar_root", "", ""], "init"]
+  }
+, "init":
+  { "type": "generic"
+  , "cmds": ["cat foo.txt bar.txt > init.txt"]
+  , "outs": ["init.txt"]
+  , "deps": [["@", "foo", "", ""], ["@", "bar", "", ""]]
+  }
+}
+EOF
+cat > repos.template.json <<'EOF'
+{ "repositories":
+  { "":
+    { "repository": {"type": "file", "path": ".", "pragma": {"to_git": true}}
+    , "bindings": {"foo": "foo", "bar": "bar", "bar_root": "bar_root"}
+    }
+  }
+}
+EOF
+"${GIT_IMPORT}" -C repos.template.json --as foo -b foomaster "${REPO_DIRS}/foo" \
+    | "${GIT_IMPORT}" -C - --as bar -b barmaster "${REPO_DIRS}/bar" \
+    | "${GIT_IMPORT}" -C - -b barmaster "${REPO_DIRS}/bar" bar_root \
+    > repos-full.json
+
+echo
+cat repos-full.json
+grep DoNotImport && exit 1 || :  # we should not bring in unneeded binding
+echo
+"${JUST_MR}" -C repos-full.json --norc --just "${JUST}" \
+             --local-build-root "${LBR}" analyse \
+             -L '["env", "PATH='"${PATH}"'"]' \
+             --dump-plain-graph actions-full.json 2>&1
+
+echo
+cat repos-full.json | "${DEDUPLICATE}" > repos.json
+cat repos.json
+echo
+
+"${JUST_MR}" -C repos.json --norc --just "${JUST}" \
+             --local-build-root "${LBR}" analyse \
+             -L '["env", "PATH='"${PATH}"'"]' \
+             --dump-plain-graph actions.json 2>&1
+
+# Verify that we reduced the number of repositories, but did
+# not change the action graph (except for the origins of the actions).
+[ $(jq -aM '.repositories | length' repos.json) -lt $(jq -aM '.repositories | length' repos-full.json) ]
+cmp actions-full.json actions.json
+
+echo "OK"