Merge pull request #69 from Tinder/issue_61

Change in external repo not detected #61

Author: tinder-maxwellelliott

.github/workflows/integration.yaml

@@ -18,13 +18,6 @@ jobs:
         with:
           java-version: 1.8
         id: java
-      - name: Setup Go environment
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.14
-        id: go
-      - name: Setup Bazelisk
-        run: go get github.com/bazelbuild/bazelisk
       - uses: actions/checkout@v2
       - name: Run integration test
         run: ./integration/integration_test.sh -e

.github/workflows/integration_external_target.yml

@@ -0,0 +1,30 @@
+name: Integration External Target
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: "0 */12 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          java-version: 1.8
+        id: java
+      - uses: actions/checkout@v2
+        with:
+          repository: tinder-maxwellelliott/bazel-diff-repro-1
+          ref: wip_fix
+          fetch-depth: 0
+      - name: Run External Target Impact test
+        run: ./bazel-diff.sh $(pwd) bazel $(git rev-parse HEAD~1) $(git rev-parse HEAD)
+      - name: Validate Impacted Targets
+        run: grep -q "//:yo" /tmp/impacted_targets.txt
+

src/main/java/com/bazel_diff/BazelRule.java

@@ -4,6 +4,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import com.google.devtools.build.lib.query2.proto.proto2api.Build;
+import java.util.stream.Collectors;
 
 interface BazelRule {
     byte[] getDigest() throws NoSuchAlgorithmException;
@@ -32,11 +33,26 @@ public byte[] getDigest() throws NoSuchAlgorithmException {
 
     @Override
     public List<String> getRuleInputList() {
-        return rule.getRuleInputList();
+        return rule.getRuleInputList()
+                   .stream()
+                   .map(ruleInput -> transformRuleInput(ruleInput))
+                   .collect(Collectors.toList());
     }
 
     @Override
     public String getName() {
         return rule.getName();
     }
+
+    private String transformRuleInput(String ruleInput) {
+        if (ruleInput.startsWith("@")) {
+            String[] splitRule = ruleInput.split("//");
+            if (splitRule.length == 2) {
+                String externalRule = splitRule[0];
+                externalRule = externalRule.replaceFirst("@", "");
+                return String.format("//external:%s", externalRule);
+            }
+        }
+        return ruleInput;
+    }
 }