From 112e708fc549bdd88544f8500c7a40e0d4add9e4 Mon Sep 17 00:00:00 2001 From: Jamie Hale Date: Fri, 27 Sep 2024 19:44:48 +0000 Subject: [PATCH] Update aries-cloudagent references Signed-off-by: Jamie Hale --- .devcontainer/post-install.sh | 4 ++-- .github/actions/is-release/action.yml | 4 ++-- .github/workflows/publish.yml | 6 +++--- .github/workflows/snyk-lts.yml | 6 +++--- .github/workflows/snyk.yml | 4 ++-- .github/workflows/sonar-merge-main.yml | 2 +- .github/workflows/sonar-pr.yml | 2 +- acapy_agent/version.py | 2 +- sonar-project.properties | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh index b6da886f24..690e73106e 100644 --- a/.devcontainer/post-install.sh +++ b/.devcontainer/post-install.sh @@ -8,8 +8,8 @@ WORKSPACE_DIR=$(pwd) python -m pip install --upgrade pip pip3 install -r demo/requirements.txt -r demo/requirements.behave.txt -# install a version of aries-cloudagent so the pytests can pick up a version -pip3 install aries-cloudagent +# install a version of acapy-agent so the pytests can pick up a version +pip3 install acapy-agent # hack/workaround to allow `pytest .` and `poetry run pytest` work. # need to not run ruff... diff --git a/.github/actions/is-release/action.yml b/.github/actions/is-release/action.yml index 3516219b32..42e03b801b 100644 --- a/.github/actions/is-release/action.yml +++ b/.github/actions/is-release/action.yml @@ -29,11 +29,11 @@ runs: changes=$(git diff "${{ github.sha }}" "$last_merge" pyproject.toml) - # Extract the version of aries-cloudagent from the diff of pyproject.toml + # Extract the version of acapy-agent from the diff of pyproject.toml version=$(echo "$changes" | grep -A1 'name = "acapy_agent"' | head -n 2 | tail -n 1 | awk '{print $3}' | tr -d '"') echo "$version" if [ "$version" ]; then - echo "This is a release because the aries-cloudagent version in pyproject.toml has changes" + echo "This is a release because the acapy-agent version in pyproject.toml has changes" echo is_release=true >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7266db2689..2367b945c8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -83,7 +83,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python + ghcr.io/${{ steps.info.outputs.repo-owner }}/acapy-agent tags: | type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }} @@ -108,7 +108,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-bbs + ghcr.io/${{ steps.info.outputs.repo-owner }}/acapy-agent-bbs tags: | type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }} @@ -123,7 +123,7 @@ jobs: target: main build-args: | python_version=${{ matrix.python-version }} - acapy_name=aries-cloudagent-bbs + acapy_name=acapy-agent-bbs acapy_version=${{ inputs.tag || github.event.release.tag_name }} acapy_reqs=[askar,bbs,didcommv2] cache-from: type=local,src=/tmp/.buildx-cache diff --git a/.github/workflows/snyk-lts.yml b/.github/workflows/snyk-lts.yml index 56f9c45cae..0853e1a61b 100644 --- a/.github/workflows/snyk-lts.yml +++ b/.github/workflows/snyk-lts.yml @@ -13,12 +13,12 @@ on: jobs: snyk: runs-on: ubuntu-latest - if: ${{ github.repository_owner == 'hyperledger' }} + if: ${{ github.repository_owner == 'openwallet-foundation' }} steps: - uses: actions/checkout@v4 - name: Build a Docker image - run: docker build -t aries-cloudagent -f docker/Dockerfile . + run: docker build -t acapy-agent -f docker/Dockerfile . - name: Run Snyk to check Docker image for vulnerabilities # Snyk can be used to break the build when it detects vulnerabilities. @@ -31,7 +31,7 @@ jobs: # or you can signup for free at https://snyk.io/login SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: - image: aries-cloudagent + image: acapy-agent args: --file=docker/Dockerfile # Adding a snyk monitor command which continuously monitors the image for vulnerabilities # See https://support.snyk.io/hc/en-us/articles/360000920818-What-are-the-differences-among-snyk-test-monitor-and-protect for more details diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml index b9857ddc83..563ae919dd 100644 --- a/.github/workflows/snyk.yml +++ b/.github/workflows/snyk.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build a Docker image - run: docker build -t aries-cloudagent -f docker/Dockerfile . + run: docker build -t acapy-agent -f docker/Dockerfile . - name: Run Snyk to check Docker image for vulnerabilities # Snyk can be used to break the build when it detects vulnerabilities. @@ -28,7 +28,7 @@ jobs: # or you can signup for free at https://snyk.io/login SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: - image: aries-cloudagent + image: acapy-agent args: --file=docker/Dockerfile # Replace any "null" security severity values with 0. The null value is used in the case diff --git a/.github/workflows/sonar-merge-main.yml b/.github/workflows/sonar-merge-main.yml index 4765655d5b..35aaa8525b 100644 --- a/.github/workflows/sonar-merge-main.yml +++ b/.github/workflows/sonar-merge-main.yml @@ -22,7 +22,7 @@ jobs: - name: Adjust Test Coverage Source run: | # Need to change source in coverage report because it was generated from another context - sed -i 's/\/home\/runner\/work\/aries-cloudagent-python\/aries-cloudagent-python\//\/github\/workspace\//g' test-reports/coverage.xml + sed -i 's/\/home\/runner\/work\/acapy-agent\/acapy-agent\//\/github\/workspace\//g' test-reports/coverage.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: diff --git a/.github/workflows/sonar-pr.yml b/.github/workflows/sonar-pr.yml index 12f0f6c761..a8d8d7bf7d 100644 --- a/.github/workflows/sonar-pr.yml +++ b/.github/workflows/sonar-pr.yml @@ -56,7 +56,7 @@ jobs: mkdir test-reports mv coverage.xml test-reports # Need to change source in coverage report because it was generated from another context - sed -i 's/\/home\/runner\/work\/aries-cloudagent-python\/aries-cloudagent-python\//\/github\/workspace\//g' test-reports/coverage.xml + sed -i 's/\/home\/runner\/work\/acapy-agent\/acapy-agent\//\/github\/workspace\//g' test-reports/coverage.xml - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: diff --git a/acapy_agent/version.py b/acapy_agent/version.py index c6432013b7..f0b415185b 100644 --- a/acapy_agent/version.py +++ b/acapy_agent/version.py @@ -2,5 +2,5 @@ from importlib import metadata -__version__ = metadata.version("aries-cloudagent") +__version__ = metadata.version("acapy-agent") RECORD_TYPE_ACAPY_VERSION = "acapy_version" diff --git a/sonar-project.properties b/sonar-project.properties index 6c87546ee1..92843219a7 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ -sonar.projectKey=hyperledger_aries-cloudagent-python -sonar.organization=hyperledger -sonar.projectName=aries-cloudagent-python +sonar.projectKey=openwallet-foundation_acapy +sonar.organization=openwallet-foundation +sonar.projectName=acapy sonar.python.version=3.12 \ No newline at end of file