chore: change github org from hyperledger to hyperledger-cacti in go …

…modules and urls Signed-off-by: Sandeep Nishad <sandeep.nishad1@ibm.com>
sandeepnRES · Oct 25, 2024 · 253bdaa · 253bdaa
1 parent 11dacbc
commit 253bdaa
Show file tree

Hide file tree

Showing 193 changed files with 478 additions and 728 deletions.
diff --git a/.github/workflows/test_weaver-asset-exchange-corda.yaml b/.github/workflows/test_weaver-asset-exchange-corda.yaml
@@ -64,7 +64,7 @@ jobs:
           echo "Using ${GITHUB_ACTOR} user."
           echo "username=${GITHUB_ACTOR}" >> github.main.properties
           echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties
-          echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties
+          echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties
 
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
 
@@ -265,7 +265,7 @@ jobs:
           echo "Using ${GITHUB_ACTOR} user."
           echo "username=${GITHUB_ACTOR}" >> github.main.properties
           echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties
-          echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties
+          echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties
 
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
 

diff --git a/.github/workflows/test_weaver-asset-transfer.yaml b/.github/workflows/test_weaver-asset-transfer.yaml
@@ -77,7 +77,7 @@ jobs:
           echo "Using ${GITHUB_ACTOR} user."
           echo "username=${GITHUB_ACTOR}" >> github.main.properties
           echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties
-          echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties
+          echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties
 
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
 

diff --git a/.github/workflows/test_weaver-data-sharing.yaml b/.github/workflows/test_weaver-data-sharing.yaml
@@ -77,7 +77,7 @@ jobs:
           echo "Using ${GITHUB_ACTOR} user."
           echo "username=${GITHUB_ACTOR}" >> github.main.properties
           echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties
-          echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties
+          echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties
 
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
 

diff --git a/.github/workflows/test_weaver-docker-build.yaml b/.github/workflows/test_weaver-docker-build.yaml
@@ -173,7 +173,7 @@ jobs:
           echo "Using ${GITHUB_ACTOR} user."
           echo "username=${GITHUB_ACTOR}" >> github.main.properties
           echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties
-          echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties
+          echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties
 
           make build || mv github.main.properties github.properties
           make clean

diff --git a/.github/workflows/weaver_deploy_corda-pkgs.yml b/.github/workflows/weaver_deploy_corda-pkgs.yml
@@ -4,6 +4,9 @@
 
 name: Deploy Corda Packages
 
+env:
+  DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
 on:
   push:
     tags:
@@ -129,7 +132,7 @@ jobs:
         working-directory: weaver/sdks/corda
 
   publish-driver-image:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: always()
     needs: [publish-protos-java-kt, publish-interop-app, publish-sdk]
     runs-on: ubuntu-22.04
     permissions:
@@ -157,15 +160,15 @@ jobs:
         working-directory: weaver/core/drivers/corda-driver
 
       - name: Check if package already exists
-        run: (make check-if-tag-exists && echo "CORDA_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "CORDA_DRIVER_PUSH=false" >> $GITHUB_ENV
+        run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "CORDA_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "CORDA_DRIVER_PUSH=false" >> $GITHUB_ENV
         working-directory: weaver/core/drivers/corda-driver
 
       - name: Build and Push
         if: ${{ env.CORDA_DRIVER_PUSH == 'true' }}
-        run: make push-image
+        run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/drivers/corda-driver
 
       - name: Push latest tag
         if: ${{ env.CORDA_DRIVER_PUSH == 'true' }}
-        run: make push-image-latest
+        run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/drivers/corda-driver
diff --git a/.github/workflows/weaver_deploy_go-pkgs.yml b/.github/workflows/weaver_deploy_go-pkgs.yml
@@ -4,6 +4,9 @@
 
 name: Deploy Go Modules
 
+env:
+  DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
 on:
   push:
     tags:
@@ -14,7 +17,7 @@ on:
 
 jobs:
   publish-protos-go:
-    if: github.repository_owner == 'hyperledger'
+    if: github.repository_owner == 'hyperledger-cacti'
     runs-on: ubuntu-22.04
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -70,7 +73,7 @@ jobs:
         run: sleep 300
 
   publish-lib-utils:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: publish-protos-go
     runs-on: ubuntu-22.04
     steps:
@@ -136,7 +139,7 @@ jobs:
         run: sleep 300
 
   publish-lib-asset-exchange:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: publish-protos-go
     runs-on: ubuntu-22.04
     steps:
@@ -202,7 +205,7 @@ jobs:
         run: sleep 300
 
   publish-interface-asset-mgmt:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: [publish-protos-go]
     runs-on: ubuntu-22.04
     steps:
@@ -268,7 +271,7 @@ jobs:
         run: sleep 300
 
   publish-interop-cc:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: [publish-protos-go, publish-lib-utils, publish-lib-asset-exchange]
     runs-on: ubuntu-22.04
     steps:
@@ -334,7 +337,7 @@ jobs:
         run: sleep 300
 
   publish-go-sdk:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: [publish-protos-go]
     runs-on: ubuntu-22.04
     steps:
@@ -400,7 +403,7 @@ jobs:
         run: sleep 300
 
   publish-weaver-fabric-cc-image:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: always()
     needs: [publish-protos-go, publish-lib-utils, publish-lib-asset-exchange]
     runs-on: ubuntu-22.04
     steps:
@@ -415,15 +418,15 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check if package already exists
-        run: (make check-if-tag-exists && echo "WEAVER_FABRIC_CC_PUSH=true" >> $GITHUB_ENV) || echo "WEAVER_FABRIC_CC_PUSH=false" >> $GITHUB_ENV
+        run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "WEAVER_FABRIC_CC_PUSH=true" >> $GITHUB_ENV) || echo "WEAVER_FABRIC_CC_PUSH=false" >> $GITHUB_ENV
         working-directory: weaver/core/network/fabric-interop-cc
 
       - name: Build and Push
         if: ${{ env.WEAVER_FABRIC_CC_PUSH == 'true' }}
-        run: make push-image
+        run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/network/fabric-interop-cc
 
       - name: Push latest tag
         if: ${{ env.WEAVER_FABRIC_CC_PUSH == 'true' }}
-        run: make push-image-latest
+        run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/network/fabric-interop-cc
diff --git a/.github/workflows/weaver_deploy_node-pkgs.yml b/.github/workflows/weaver_deploy_node-pkgs.yml
@@ -6,6 +6,7 @@ name: Deploy Node JS Packages
 
 env:
   NODEJS_VERSION: v18.18.2
+  DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
 on:
   push:
@@ -17,7 +18,7 @@ on:
 
 jobs:
   publish-protos-js:
-    if: github.repository_owner == 'hyperledger'
+    if: github.repository_owner == 'hyperledger-cacti'
     runs-on: ubuntu-22.04
     permissions:
       packages: write
@@ -70,7 +71,7 @@ jobs:
         working-directory: weaver/common/protos-js
 
   publish-fabric-sdk:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: [publish-protos-js]
     runs-on: ubuntu-22.04
     permissions:
@@ -115,7 +116,7 @@ jobs:
         working-directory: weaver/sdks/fabric/interoperation-node-sdk
 
   publish-besu-sdk:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }}
     needs: [publish-protos-js]
     runs-on: ubuntu-22.04
     permissions:
@@ -160,7 +161,7 @@ jobs:
         working-directory: weaver/sdks/besu/node
 
   publish-driver-image:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: always()
     needs: [publish-protos-js, publish-fabric-sdk]
     runs-on: ubuntu-22.04
     permissions:
@@ -186,21 +187,21 @@ jobs:
         working-directory: weaver/core/drivers/fabric-driver
 
       - name: Check if package already exists
-        run: (make check-if-tag-exists && echo "FABRIC_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "FABRIC_DRIVER_PUSH=false" >> $GITHUB_ENV
+        run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "FABRIC_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "FABRIC_DRIVER_PUSH=false" >> $GITHUB_ENV
         working-directory: weaver/core/drivers/fabric-driver
 
       - name: Build and Push
         if: ${{ env.FABRIC_DRIVER_PUSH == 'true' }}
-        run: make push-image
+        run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/drivers/fabric-driver
 
       - name: Push latest tag
         if: ${{ env.FABRIC_DRIVER_PUSH == 'true' }}
-        run: make push-image-latest
+        run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/drivers/fabric-driver
 
   publish-iin-agent-image:
-    if: ${{ always() && github.repository_owner == 'hyperledger' }}
+    if: always()
     needs: [publish-protos-js, publish-fabric-sdk]
     runs-on: ubuntu-22.04
     permissions:
@@ -226,15 +227,15 @@ jobs:
         working-directory: weaver/core/identity-management/iin-agent
 
       - name: Check if package already exists
-        run: (make check-if-tag-exists && echo "IINAGENT_PUSH=true" >> $GITHUB_ENV) || echo "IINAGENT_PUSH=false" >> $GITHUB_ENV
+        run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "IINAGENT_PUSH=true" >> $GITHUB_ENV) || echo "IINAGENT_PUSH=false" >> $GITHUB_ENV
         working-directory: weaver/core/identity-management/iin-agent
 
       - name: Build and Push
         if: ${{ env.IINAGENT_PUSH == 'true' }}
-        run: make push-image
+        run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/identity-management/iin-agent
 
       - name: Push latest tag
         if: ${{ env.IINAGENT_PUSH == 'true' }}
-        run: make push-image-latest
+        run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/identity-management/iin-agent
diff --git a/.github/workflows/weaver_deploy_relay-server.yml b/.github/workflows/weaver_deploy_relay-server.yml
@@ -4,6 +4,9 @@
 
 name: Deploy Relay Docker Image
 
+env:
+  DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
 on:
   push:
     tags:
@@ -14,7 +17,7 @@ on:
 
 jobs:
   publish-protos-rs:
-      if: github.repository_owner == 'hyperledger'
+      if: github.repository_owner == 'hyperledger-cacti'
       runs-on: ubuntu-22.04
       permissions:
         packages: write
@@ -38,7 +41,6 @@ jobs:
           working-directory: weaver/common/protos-rs/pkg
 
   publish-relay-image:
-    if: github.repository_owner == 'hyperledger'
     needs: publish-protos-rs
     runs-on: ubuntu-22.04
     permissions:
@@ -69,15 +71,15 @@ jobs:
         working-directory: weaver/core/relay
 
       - name: Check if package already exists
-        run: (make check-if-tag-exists && echo "RELAY_PUSH=true" >> $GITHUB_ENV) || echo "RELAY_PUSH=false" >> $GITHUB_ENV
+        run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "RELAY_PUSH=true" >> $GITHUB_ENV) || echo "RELAY_PUSH=false" >> $GITHUB_ENV
         working-directory: weaver/core/relay
 
       - name: Build and Push
         if: ${{ env.RELAY_PUSH == 'true' }}
-        run: make push-server
+        run: make push-server DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/relay
 
       - name: Push latest tag
         if: ${{ env.RELAY_PUSH == 'true' }}
-        run: (cat out | grep "exists") || make push-server-latest
+        run: (cat out | grep "exists") || make push-server-latest DOCKER_REGISTRY=${DOCKER_REGISTRY}
         working-directory: weaver/core/relay
diff --git a/weaver/common/policy-dsl/package.json b/weaver/common/policy-dsl/package.json
@@ -20,7 +20,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/hyperledger/cacti.git"
+        "url": "https://github.com/hyperledger-cacti/cacti.git"
     },
     "author": "",
     "license": "Apache-2.0",

diff --git a/weaver/common/protos-go/README.md b/weaver/common/protos-go/README.md
@@ -40,7 +40,7 @@ make clean-build
 ```
 
 ## Steps to Use
-* Just add `github.com/hyperledger/cacti/weaver/common/protos-go` to your imports, to use it.
+* Just add `github.com/hyperledger-cacti/cacti/weaver/common/protos-go` to your imports, to use it.
 * Run `go mod tidy` to populate your `go.mod` with the latest version.
 
 ## Publish

diff --git a/weaver/common/protos-go/common/access_control.pb.go b/weaver/common/protos-go/common/access_control.pb.go
diff --git a/weaver/common/protos-go/common/ack.pb.go b/weaver/common/protos-go/common/ack.pb.go
diff --git a/weaver/common/protos-go/common/asset_locks.pb.go b/weaver/common/protos-go/common/asset_locks.pb.go