fix: fix links as part of transition to oracle/macaron (#307)

behnazh-w · web-flow · commit 9ee555931706 · 2023-06-14T08:21:11.000+10:00
Signed-off-by: behnazh-w &lt;behnaz.hassanshahi@oracle.com&gt;
diff --git a/.github/workflows/_build_docker.yaml b/.github/workflows/_build_docker.yaml
@@ -50,7 +50,7 @@ jobs:
     # Build the Docker image without pushing it.
     - name: Build the Docker image
       env:
-        IMAGE_NAME: ghcr.io/oracle-samples/macaron
+        IMAGE_NAME: ghcr.io/oracle/macaron
       run: make build-docker
 
     # Run the integration tests against the built Docker image.
diff --git a/.github/workflows/build_base_image.yaml b/.github/workflows/build_base_image.yaml
@@ -28,8 +28,8 @@ jobs:
       run: docker login ghcr.io --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }}
 
     # Build and push the base image using docker/Dockerfile.base. Note that this build
-    # only requires docker/Dockerfile.base. The base image will be tagged with ghcr.io/oracle-samples/macaron-base:latest.
+    # only requires docker/Dockerfile.base. The base image will be tagged with ghcr.io/oracle/macaron-base:latest.
     - name: Build and push the base image
       run: |
-        docker build -t ghcr.io/oracle-samples/macaron-base:latest -f docker/Dockerfile.base docker/
-        docker push ghcr.io/oracle-samples/macaron-base:latest
+        docker build -t ghcr.io/oracle/macaron-base:latest -f docker/Dockerfile.base docker/
+        docker push ghcr.io/oracle/macaron-base:latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ env:
   # commit. In an organisation that should be a dedicated devops account.
   USER_NAME: behnazh-w
   USER_EMAIL: behnazh-w@users.noreply.github.com
-  IMAGE_NAME: ghcr.io/oracle-samples/macaron
+  IMAGE_NAME: ghcr.io/oracle/macaron
 
 jobs:
   check:
@@ -204,7 +204,7 @@ jobs:
           tar -zxvf "$ASSET_NAME" -C "$SYFT_BIN" syft
           "$SYFT_BIN"/syft --version
           "$SYFT_BIN"/syft \
-            ghcr.io/oracle-samples/macaron:"$RELEASE_TAG" \
+            ghcr.io/oracle/macaron:"$RELEASE_TAG" \
             -o cyclonedx-json=dist/macaron-"$RELEASE_VERSION"-sbom-docker.json
         else
           echo "Checksum for '$ASSET_NAME' did not verify: expected $EXPECTED but got $SYFT_DIGEST"
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-yellow?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) [![conventional-commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow)](https://www.conventionalcommits.org/en/v1.0.0/) [![black](https://img.shields.io/badge/code%20style-black-000000)](https://github.com/psf/black) [![mypy](https://img.shields.io/badge/mypy-checked-brightgreen)](http://mypy-lang.org/) [![pylint](https://img.shields.io/badge/pylint-required%2010.0-brightgreen)](http://pylint.org/) [![pytest](https://img.shields.io/badge/pytest-enabled-brightgreen)](https://github.com/pytest-dev/pytest) [![hypothesis](https://img.shields.io/badge/hypothesis-tested-brightgreen.svg)](https://hypothesis.readthedocs.io/) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/oracle-samples/macaron/badge)](https://github.com/ossf/scorecard)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-yellow?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) [![conventional-commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow)](https://www.conventionalcommits.org/en/v1.0.0/) [![black](https://img.shields.io/badge/code%20style-black-000000)](https://github.com/psf/black) [![mypy](https://img.shields.io/badge/mypy-checked-brightgreen)](http://mypy-lang.org/) [![pylint](https://img.shields.io/badge/pylint-required%2010.0-brightgreen)](http://pylint.org/) [![pytest](https://img.shields.io/badge/pytest-enabled-brightgreen)](https://github.com/pytest-dev/pytest) [![hypothesis](https://img.shields.io/badge/hypothesis-tested-brightgreen.svg)](https://hypothesis.readthedocs.io/) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/oracle/macaron/badge)](https://github.com/ossf/scorecard)
 
 # Macaron
 
@@ -18,7 +18,7 @@ Macaron uses [SLSA requirements specifications v0.1](https://slsa.dev/spec/v0.1/
 
 ## Getting started
 
-To learn how to download and run Macaron, see our documentation [here](https://oracle-samples.github.io/macaron/).
+To learn how to download and run Macaron, see our documentation [here](https://oracle.github.io/macaron/).
 
 ## Contributing
 
diff --git a/docker/Dockerfile.final b/docker/Dockerfile.final
@@ -1,16 +1,16 @@
 # Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
 
-# This Dockerfile is for building the final production image. It's based on ghcr.io/oracle-samples/macaron-base.
+# This Dockerfile is for building the final production image. It's based on ghcr.io/oracle/macaron-base.
 # For the build, two files will be copied into the image:
 #   - Macaron wheel file (its path must be provided to the build argument WHEEL_PATH)
 #   - user.sh for the entrypoint of the final image.
 # For example, using Docker, we could build the image using:
-#   docker build --build-arg WHEEL_PATH=<path_to_wheel> -t ghcr.io/oracle-samples/macaron -f docker/Dockerfile.final ./
-# Note that the local machine must login to ghcr.io so that Docker could pull the ghcr.io/oracle-samples/macaron-base
+#   docker build --build-arg WHEEL_PATH=<path_to_wheel> -t ghcr.io/oracle/macaron -f docker/Dockerfile.final ./
+# Note that the local machine must login to ghcr.io so that Docker could pull the ghcr.io/oracle/macaron-base
 # image for this build.
 
-FROM ghcr.io/oracle-samples/macaron-base:latest@sha256:5f2ed797b2b1e7e80d151fabc85e220a6bd57a9808c73aaa3cf466a038061a1d
+FROM ghcr.io/oracle/macaron-base:latest@sha256:5f2ed797b2b1e7e80d151fabc85e220a6bd57a9808c73aaa3cf466a038061a1d
 
 ENV HOME="/home/macaron"
 
diff --git a/docs/README.md b/docs/README.md
@@ -1,5 +1,5 @@
 # Macaron documentation
-This directory contains the source for the documentation of Macaron hosted [here](https://oracle-samples.github.io/macaron/).
+This directory contains the source for the documentation of Macaron hosted [here](https://oracle.github.io/macaron/).
 
 ## Build the documentation
 
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/junit5.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/junit5.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -978,7 +978,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/micronaut-core.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/micronaut-core.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -5515,7 +5515,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/micronaut-validation.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/micronaut-validation.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -1819,7 +1819,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/reactive-streams.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/reactive-streams.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -978,7 +978,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/reactor-core.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_repo_path/reactor-core.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -978,7 +978,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_sbom/micronaut-core.html b/docs/source/_static/examples/micronaut-projects/micronaut-core/analyze_with_sbom/micronaut-core.html
@@ -369,7 +369,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -5148,7 +5148,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
         <p>Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.</p>
     </footer>
diff --git a/docs/source/pages/installation.rst b/docs/source/pages/installation.rst
@@ -27,7 +27,7 @@ Download the ``run_macaron.sh`` script and make it executable by running the com
 
 .. code-block:: shell
 
-  curl -O https://raw.githubusercontent.com/oracle-samples/macaron/<tag>/scripts/release_scripts/run_macaron.sh
+  curl -O https://raw.githubusercontent.com/oracle/macaron/<tag>/scripts/release_scripts/run_macaron.sh
   chmod +x run_macaron.sh
 
 ----------------------------------------
@@ -41,7 +41,7 @@ To verify your setup, go to the directory containing the downloaded ``run_macaro
   ./run_macaron.sh --help
 
 
-.. note:: In the first execution, this script will download the Macaron Docker image from ``ghcr.io/oracle-samples/macaron`` which can take some time. However, the next time you run it, the docker image available on your local host will be used.
+.. note:: In the first execution, this script will download the Macaron Docker image from ``ghcr.io/oracle/macaron`` which can take some time. However, the next time you run it, the docker image available on your local host will be used.
 
 .. note:: By default, ``latest`` is used as the tag for the downloaded image. You can choose a specific tag by assigning the environment variable ``MACARON_IMAGE_TAG``. For example to run Macaron v0.1.0 run: ``MACARON_IMAGE_TAG=v0.1.0 && ./run_macaron.sh --help``
 
diff --git a/docs/source/pages/using.rst b/docs/source/pages/using.rst
@@ -97,7 +97,7 @@ For example, with `micronaut-core <https://github.com/micronaut-projects/microna
 To run the analysis against that SBOM, run this command:
 
 ..
-  TODO: Remove the -rp path after https://github.com/oracle-samples/macaron/issues/108 is merged.
+  TODO: Remove the -rp path after https://github.com/oracle/macaron/issues/108 is merged.
 
 .. code-block:: shell
 
diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 // Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
 
-module github.com/oracle-samples/macaron
+module github.com/oracle/macaron
 
 go 1.18
 
diff --git a/golang/cmd/actionparser/actionparser.go b/golang/cmd/actionparser/actionparser.go
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved. */
 /* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/. */
 
 package main
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/oracle-samples/macaron/golang/internal/actionparser"
-	"github.com/oracle-samples/macaron/golang/internal/filewriter"
+	"github.com/oracle/macaron/golang/internal/actionparser"
+	"github.com/oracle/macaron/golang/internal/filewriter"
 )
 
 // Parse the content of a GitHub Action yaml file and
diff --git a/golang/cmd/bashparser/bashparser.go b/golang/cmd/bashparser/bashparser.go
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved. */
 /* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/. */
 
 package main
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/oracle-samples/macaron/golang/internal/bashparser"
-	"github.com/oracle-samples/macaron/golang/internal/filewriter"
+	"github.com/oracle/macaron/golang/internal/bashparser"
+	"github.com/oracle/macaron/golang/internal/filewriter"
 )
 
 // Parse the bash script and provide parsed objects in JSON format to stdout or a file.
diff --git a/scripts/dev_scripts/integration_tests.sh b/scripts/dev_scripts/integration_tests.sh
@@ -111,7 +111,7 @@ python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 DEP_EXPECTED=$WORKSPACE/tests/dependency_analyzer/expected_results/cyclonedx_micronaut-projects_micronaut-core.json
 $RUN_MACARON analyze -c $WORKSPACE/tests/dependency_analyzer/configurations/micronaut_core_config.yaml || log_fail
 
-# TODO: uncomment the test below after resolving https://github.com/oracle-samples/macaron/issues/60.
+# TODO: uncomment the test below after resolving https://github.com/oracle/macaron/issues/60.
 # python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
 echo -e "\n----------------------------------------------------------------------------------"
@@ -294,7 +294,7 @@ $RUN_MACARON -lr $WORKSPACE/output/git_repos/local_repos/ analyze -rp test_repo
 
 # We don't compare the report content because the remote_path fields in the reports are undeterministic when running
 # this test locally and running it in the GitHub Actions runner. We only check if the reports are generated as
-# expected without the issue described in https://github.com/oracle-samples/macaron/issues/116.
+# expected without the issue described in https://github.com/oracle/macaron/issues/116.
 ls $JSON_EXPECTED || log_fail
 ls $HTML_EXPECTED || log_fail
 
diff --git a/scripts/release_scripts/run_macaron.sh b/scripts/release_scripts/run_macaron.sh
@@ -9,7 +9,7 @@ if [[ -z ${MACARON_IMAGE_TAG} ]]; then
     MACARON_IMAGE_TAG="latest"
 fi
 
-IMAGE="ghcr.io/oracle-samples/macaron"
+IMAGE="ghcr.io/oracle/macaron"
 
 # Workspace directory inside of the container.
 MACARON_WORKSPACE="/home/macaron"
diff --git a/src/macaron/code_analyzer/call_graph.py b/src/macaron/code_analyzer/call_graph.py
@@ -10,7 +10,7 @@
 Node = TypeVar("Node", bound="BaseNode")
 # The documentation below for `TypeVar` is commented out due to a breaking
 # change in Sphinx version (^=6.1.0).
-# Reported at: https://github.com/oracle-samples/macaron/issues/58.
+# Reported at: https://github.com/oracle/macaron/issues/58.
 # """This binds type ``Node`` to ``BaseNode`` and any of its subclasses.
 
 # Therefore, any node of type ``Node`` that is stored in the call graph
diff --git a/src/macaron/output_reporter/results.py b/src/macaron/output_reporter/results.py
@@ -51,7 +51,7 @@ class DepSummary(TypedDict):
 RecordNode = TypeVar("RecordNode", bound="Record")
 # The documentation below for `TypeVar` is commented out due to a breaking
 # change in Sphinx version (^=6.1.0).
-# Reported at: https://github.com/oracle-samples/macaron/issues/58.
+# Reported at: https://github.com/oracle/macaron/issues/58.
 # """This binds type ``RecordNode`` to ``Record`` and any of its subclasses."""
 
 
diff --git a/src/macaron/output_reporter/templates/base_template.html b/src/macaron/output_reporter/templates/base_template.html
@@ -368,7 +368,7 @@
                     gradientUnits="userSpaceOnUse" gradientTransform="translate(-46.49643,34.270365)" x1="54.163754"
                     y1="22.947735" x2="54.651581" y2="23.437124" />
             </defs>
-            <a href="https://github.com/oracle-samples/macaron" target="_blank">
+            <a href="https://github.com/oracle/macaron" target="_blank">
                 <g id="layer1" style="display:inline">
                     <path id="ellipse1174-3-8-6-0-1"
                         style="fill:#000000;fill-opacity:0.32787;fill-rule:evenodd;stroke-width:2.18443"
@@ -642,7 +642,7 @@
         <div class="space_divider"></div>
         <p>This report was generated by Macaron, a product of Oracle Labs.
         </p>
-        <p>Please visit our <a href='https://github.com/oracle-samples/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
+        <p>Please visit our <a href='https://github.com/oracle/macaron' target='_blank'>repository</a> to know more about Macaron.</p>
         <div class="space_divider"></div>
     </footer>
     <button id='scroll_to_top' onclick='scroll_to_top()'>⬆</button>
diff --git a/src/macaron/slsa_analyzer/analyzer.py b/src/macaron/slsa_analyzer/analyzer.py
