Replace references to cachito-testing with hermetoproject

Replace references to the old organization hosting our integration tests with the new organization name 'hermetoproject'. THIS PATCH WILL BE SQUASHED TO THE PREVIOUS ONE BEFORE MERGING. Signed-off-by: Erik Skultety <[email protected]>
hermetoproject · Feb 6, 2025 · ee0ccfd · ee0ccfd
1 parent 660fb8e
commit ee0ccfd
Show file tree

Hide file tree

Showing 40 changed files with 174 additions and 174 deletions.
diff --git a/docs/adr/0002-yarn-v4.md b/docs/adr/0002-yarn-v4.md
@@ -128,7 +128,7 @@ The metadata, in itself, is a collection of json files with a few kilobytes each
 
 #### Changes to yarn.lock
 
-When updating v3 projects to v4, some differences in the lockfile appear. These are some picks from updating the [disallowed-protocols](https://github.com/cachito-testing/cachi2-yarn-berry/tree/disallowed-protocols) branch on the cachi2-yarn-berry test project:
+When updating v3 projects to v4, some differences in the lockfile appear. These are some picks from updating the [disallowed-protocols](https://github.com/hermetoproject/integration-tests/tree/yarn/disallowed-protocols) branch on the in our integration test suite:
 
 **`npm:` locator added to npm dependencies:**
 ```

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -19,7 +19,7 @@
 
 @pytest.fixture(scope="session")
 def test_repo_dir(tmp_path_factory: pytest.FixtureRequest) -> Path:
-    test_repo_url = "https://github.com/cachito-testing/integration-tests.git"
+    test_repo_url = "https://github.com/hermetoproject/integration-tests.git"
     # https://pytest.org/en/latest/reference/reference.html#tmp-path-factory-factory-api
     repo_dir = tmp_path_factory.mktemp("integration-tests", False)  # type: ignore
     Repo.clone_from(url=test_repo_url, to_path=repo_dir, depth=1, no_single_branch=True)

diff --git a/tests/integration/test_data/bundler_everything_present/bom.json b/tests/integration/test_data/bundler_everything_present/bom.json
@@ -421,7 +421,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:gem/[email protected]?vcs_url=git%2Bhttps://github.com/cachito-testing/integration-tests.git%40f2d2d64600559d801b44170113a93d754052e9f7#quux",
+      "purl": "pkg:gem/[email protected]?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%40f2d2d64600559d801b44170113a93d754052e9f7#quux",
       "type": "library",
       "version": "0.0.1"
     },
@@ -577,7 +577,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:gem/[email protected]?vcs_url=git%2Bhttps://github.com/cachito-testing/integration-tests.git%40f2d2d64600559d801b44170113a93d754052e9f7",
+      "purl": "pkg:gem/[email protected]?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%40f2d2d64600559d801b44170113a93d754052e9f7",
       "type": "library",
       "version": "0.1.2"
     },

diff --git a/tests/integration/test_data/bundler_everything_present_except_gemspec/bom.json b/tests/integration/test_data/bundler_everything_present_except_gemspec/bom.json
@@ -237,7 +237,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:gem/integration-tests?vcs_url=git%2Bhttps://github.com/cachito-testing/integration-tests.git%404930d38034ef437d6c6e54c344210aa14e5c40dd",
+      "purl": "pkg:gem/integration-tests?vcs_url=git%2Bhttps://github.com/hermetoproject/integration-tests.git%404930d38034ef437d6c6e54c344210aa14e5c40dd",
       "type": "library"
     },
     {

diff --git a/tests/integration/test_data/gomod_1.18_e2e_test/bom.json b/tests/integration/test_data/gomod_1.18_e2e_test/bom.json
@@ -572,7 +572,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/retrodep/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/retrodep/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20230109085255-c3496edd5d45"
     },
@@ -584,7 +584,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20230109085255-c3496edd5d45"
     },
@@ -596,7 +596,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=module",
       "type": "library",
       "version": "v2.0.0-20230109085255-c3496edd5d45"
     },
@@ -608,7 +608,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20230109085255-c3496edd5d45"
     },

diff --git a/tests/integration/test_data/gomod_1.20_e2e_dirty_go.mod/bom.json b/tests/integration/test_data/gomod_1.20_e2e_dirty_go.mod/bom.json
@@ -55,7 +55,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=module",
       "type": "library",
       "version": "v0.0.0-20240321211820-3353e4526728"
     },
@@ -67,7 +67,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20240321211820-3353e4526728"
     },

diff --git a/tests/integration/test_data/gomod_1.21_e2e_test/bom.json b/tests/integration/test_data/gomod_1.21_e2e_test/bom.json
@@ -572,7 +572,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/retrodep/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/retrodep/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20240308152237-d0c316edef82"
     },
@@ -584,7 +584,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20240308152237-d0c316edef82"
     },
@@ -596,7 +596,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=module",
       "type": "library",
       "version": "v2.0.0-20240308152237-d0c316edef82"
     },
@@ -608,7 +608,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=package",
       "type": "library",
       "version": "v2.0.0-20240308152237-d0c316edef82"
     },

diff --git a/tests/integration/test_data/gomod_1.22_e2e_workspace_vendoring/bom.json b/tests/integration/test_data/gomod_1.22_e2e_workspace_vendoring/bom.json
@@ -541,124 +541,124 @@
       "type": "library"
     },
     {
-      "name": "github.com/labstack/echo/v4/middleware",
+      "name": "github.com/davecgh/go-spew",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii/echo/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/davecgh/[email protected]?type=module",
       "type": "library",
-      "version": "v4.0.0-20240626062917-5aabb6779a32"
+      "version": "v1.1.1"
     },
     {
-      "name": "github.com/labstack/echo/v4",
+      "name": "github.com/golang-jwt/jwt",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/golang-jwt/[email protected]%2Bincompatible?type=module",
       "type": "library",
-      "version": "v4.0.0-20240626062917-5aabb6779a32"
+      "version": "v3.2.2+incompatible"
     },
     {
-      "name": "github.com/labstack/echo/v4",
+      "name": "github.com/golang-jwt/jwt",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/golang-jwt/[email protected]%2Bincompatible?type=package",
       "type": "library",
-      "version": "v4.0.0-20240626062917-5aabb6779a32"
+      "version": "v3.2.2+incompatible"
     },
     {
-      "name": "example.com/hello",
+      "name": "github.com/labstack/echo/v4/middleware",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii/hello@v0.0.0-20240626062917-5aabb6779a32?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/hiii/echo/middleware@v4.0.0-20240626062917-5aabb6779a32?type=package",
       "type": "library",
-      "version": "v0.0.0-20240626062917-5aabb6779a32"
+      "version": "v4.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "example.com/hello",
+      "name": "github.com/labstack/echo/v4",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii/hello@v0.0.0-20240626062917-5aabb6779a32?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/hiii/echo@v4.0.0-20240626062917-5aabb6779a32?type=module",
       "type": "library",
-      "version": "v0.0.0-20240626062917-5aabb6779a32"
+      "version": "v4.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "example.com/hiii",
+      "name": "github.com/labstack/echo/v4",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/hiii@v0.0.0-20240626062917-5aabb6779a32?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/hiii/echo@v4.0.0-20240626062917-5aabb6779a32?type=package",
       "type": "library",
-      "version": "v0.0.0-20240626062917-5aabb6779a32"
+      "version": "v4.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "example.com/hiii",
+      "name": "example.com/hello",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/hi/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/hiii/hello@v0.0.0-20240626062917-5aabb6779a32?type=module",
       "type": "library",
       "version": "v0.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "github.com/davecgh/go-spew",
+      "name": "example.com/hello",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/davecgh/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/hiii/[email protected]?type=package",
       "type": "library",
-      "version": "v1.1.1"
+      "version": "v0.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "github.com/golang-jwt/jwt",
+      "name": "example.com/hiii",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/golang-jwt/[email protected]%2Bincompatible?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/[email protected]?type=module",
       "type": "library",
-      "version": "v3.2.2+incompatible"
+      "version": "v0.0.0-20240626062917-5aabb6779a32"
     },
     {
-      "name": "github.com/golang-jwt/jwt",
+      "name": "example.com/hiii",
       "properties": [
         {
           "name": "cachi2:found_by",
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/golang-jwt/[email protected]%2Bincompatible?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/hi/[email protected]?type=package",
       "type": "library",
-      "version": "v3.2.2+incompatible"
+      "version": "v0.0.0-20240626062917-5aabb6779a32"
     },
     {
       "name": "github.com/labstack/gommon/bytes",

diff --git a/tests/integration/test_data/gomod_e2e_multiple_modules/bom.json b/tests/integration/test_data/gomod_e2e_multiple_modules/bom.json
@@ -42,7 +42,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=module",
       "type": "library",
       "version": "v0.0.0-20230130152700-d909c337ffc8"
     },
@@ -54,7 +54,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20230130152700-d909c337ffc8"
     },
@@ -66,7 +66,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=module",
       "type": "library",
       "version": "v0.0.0-20230130152700-d909c337ffc8"
     },
@@ -78,7 +78,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20230130152700-d909c337ffc8"
     },
@@ -90,7 +90,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=module",
       "type": "library",
       "version": "v0.0.0-20230130152700-d909c337ffc8"
     },

diff --git a/tests/integration/test_data/gomod_go_generate_imported/bom.json b/tests/integration/test_data/gomod_go_generate_imported/bom.json
@@ -86,7 +86,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20211026214220-a5af4262860e"
     },
@@ -98,7 +98,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/integration-tests/internal/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/integration-tests/internal/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20211026214220-a5af4262860e"
     },
@@ -110,7 +110,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=module",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=module",
       "type": "library",
       "version": "v0.0.0-20211026214220-a5af4262860e"
     },
@@ -122,7 +122,7 @@
           "value": "cachi2"
         }
       ],
-      "purl": "pkg:golang/github.com/cachito-testing/[email protected]?type=package",
+      "purl": "pkg:golang/github.com/hermetoproject/[email protected]?type=package",
       "type": "library",
       "version": "v0.0.0-20211026214220-a5af4262860e"
     },