feat: Use v0.90.x tanzu cli core and plugin runtime with new core structure (#534)

* chore: Upgrade tanzu version to v0.90.0-alpha.2

Signed-off-by: Wendy Arango <[email protected]>

* build: Change makefile and ci to be consistent with new tanzu version

Signed-off-by: Wendy Arango <[email protected]>

* build: Change makefile and ci to be consistent with new tanzu version

Signed-off-by: Wendy Arango <[email protected]>

---------

Signed-off-by: Wendy Arango <[email protected]>
Signed-off-by: Diego Alfonso <[email protected]>
Co-authored-by: Diego Alfonso <[email protected]>

Author: warango4

.github/workflows/ci.yaml

@@ -1,7 +1,7 @@
 name: CI
 
 on:
-  push: 
+  push:
     branches:
     - '**'
     - '!dependabot/**'
@@ -33,51 +33,43 @@ jobs:
       run: |
         TANZU_VERSION=$(cat TANZU_VERSION)
         mkdir -p ${TANZU_HOME}
-        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-linux-amd64.tar.gz
+        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-cli/releases/download/${TANZU_VERSION}/tanzu-cli-linux-amd64.tar.gz
         tar -xzf tanzu-framework.tar.gz -C ${TANZU_HOME}
-        sudo mv ${TANZU_HOME}/cli/core/${TANZU_VERSION}/tanzu-core-linux_amd64 /usr/local/bin/tanzu
+        sudo mv ${TANZU_HOME}/${TANZU_VERSION}/tanzu-cli-linux_amd64 /usr/local/bin/tanzu
         chmod +x /usr/local/bin/tanzu
+        tanzu ceip-participation set false
+        tanzu config eula accept
         tanzu init
-        tanzu plugin repo add -b tanzu-cli-admin-plugins -n admin -p artifacts-admin
-        curl -Lo admin-plugins.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-plugins-admin-linux-amd64.tar.gz
-        tar -xzf admin-plugins.tar.gz -C ${TANZU_HOME}
-        tanzu plugin install builder --local ${TANZU_HOME}/admin-plugins
-        tanzu plugin install test --local ${TANZU_HOME}/admin-plugins
+        tanzu version
+        tanzu plugin install builder
         tanzu plugin list
     - name: Scan Inclusive Terminology
       uses: get-woke/woke-action@v0
-      with: 
+      with:
         fail-on-error: true
         woke-args: -c https://via.vmw.com/its-woke-rules
     - name: Test
       run: make test
     - name: Codecov
       uses: codecov/[email protected]
     - name: Build Version
-      run: echo "BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      run: echo "PLUGIN_BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       if: startsWith(github.ref, 'refs/tags/')
     - name: Build
-      run: make build
-    - uses: actions/upload-artifact@v3
-      with:
-        name: tanzu-apps-plugin-build.tar.gz
-        path: tanzu-apps-plugin-build.tar.gz
-        retention-days: 1
-    - name: Publish
-      run: make publish
+      run: make plugin-build
     - uses: actions/upload-artifact@v3
       with:
         name: tanzu-apps-plugin.tar.gz
-        path: tanzu-apps-plugin*.tar.gz
+        path: ./artifacts/tanzu-apps-plugin*.tar.gz
         retention-days: 1
     - name: Install
       run: |
-        if [[ -z ${BUILD_VERSION} ]]; then
-          BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
-          BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$BUILD_SHA_SHORT
+        if [[ -z ${PLUGIN_BUILD_VERSION} ]]; then
+          PLUGIN_BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
+          PLUGIN_BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$PLUGIN_BUILD_SHA_SHORT
         fi
-        echo $BUILD_VERSION
-        tanzu plugin install apps --version $BUILD_VERSION --local ./artifacts/published/linux-amd64
+        echo $PLUGIN_BUILD_VERSION
+        tanzu plugin install apps --version $PLUGIN_BUILD_VERSION --local ./artifacts/plugins/linux/amd64
     - name: Verify docs
       run: |
         rm -rf docs/command-reference
@@ -98,42 +90,33 @@ jobs:
     - name: Install tanzu cli
       run: |
         $TANZU_VERSION = type .\TANZU_VERSION
-        mkdir "C:\Program Files\tanzu"       
+        mkdir "C:\Program Files\tanzu"
         $Env:PATH += ";C:\Program Files\tanzu"
         $TANZU_HOME = "C:\Program Files\tanzu"
         $Env:TANZU_CLI_NO_INIT = "true"
-        curl -Lo tanzu-framework-windows-amd64.zip https://github.com/vmware-tanzu/tanzu-framework/releases/download/$TANZU_VERSION/tanzu-framework-windows-amd64.zip
+        curl -Lo tanzu-framework-windows-amd64.zip https://github.com/vmware-tanzu/tanzu-cli/releases/download/$TANZU_VERSION/tanzu-cli-windows-amd64.zip
         tar -xf tanzu-framework-windows-amd64.zip
-        cp "cli\core\$TANZU_VERSION\tanzu-core-windows_amd64.exe" "C:\Program Files\tanzu\tanzu.exe"
+        cp "$TANZU_VERSION\tanzu-cli-windows_amd64.exe" "C:\Program Files\tanzu\tanzu.exe"
+        tanzu ceip-participation set false
+        tanzu config eula accept
         tanzu init
-        tanzu plugin list
-        
-        tanzu version
-        tanzu plugin repo add -b tanzu-cli-admin-plugins -n admin -p artifacts-admin
-        curl -Lo admin-plugins.zip https://github.com/vmware-tanzu/tanzu-framework/releases/download/$TANZU_VERSION/tanzu-framework-plugins-admin-windows-amd64.zip
-        tar -xf admin-plugins.zip -C $TANZU_HOME
-        tanzu plugin install builder --local $TANZU_HOME/admin-plugins
-        tanzu plugin install test --local $TANZU_HOME/admin-plugins
+        tanzu plugin install builder
         tanzu plugin list
     - name: Test
       run: |
-        $Env:PATH += ";C:\Program Files\tanzu"      
+        $Env:PATH += ";C:\Program Files\tanzu"
         make test
     - name: Build
       run: |
         $Env:PATH += ";C:\Program Files\tanzu"
-        make build
-    - name: Publish
-      run: |
-        $Env:PATH += ";C:\Program Files\tanzu"
-        make publish
+        make plugin-build
     - name: Install
       run: |
         $Env:PATH += ";C:\Program Files\tanzu"
-        $BUILD_SHA_SHORT=git rev-parse --short HEAD
+        $PLUGIN_BUILD_SHA_SHORT=git rev-parse --short HEAD
         $APP_PLUGIN_VERSION=type .\APPS_PLUGIN_VERSION
-        $BUILD_VERSION=$APP_PLUGIN_VERSION+'-dev-'+$BUILD_SHA_SHORT
-        tanzu plugin install apps --version $BUILD_VERSION --local ./artifacts/published/windows-amd64
+        $PLUGIN_BUILD_VERSION=$APP_PLUGIN_VERSION+'-dev-'+$PLUGIN_BUILD_SHA_SHORT
+        tanzu plugin install apps --version $PLUGIN_BUILD_VERSION --local ./artifacts/plugins/windows/amd64
 
   unit-macos:
     env:
@@ -150,35 +133,30 @@ jobs:
         TANZU_VERSION=$(cat TANZU_VERSION)
         TANZU_HOME=$HOME/tanzu
         mkdir -p $HOME/tanzu
-        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-darwin-amd64.tar.gz
+        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-cli/releases/download/${TANZU_VERSION}/tanzu-cli-darwin-amd64.tar.gz
         tar -xzf tanzu-framework.tar.gz -C ${TANZU_HOME}
-        sudo mv ${TANZU_HOME}/cli/core/${TANZU_VERSION}/tanzu-core-darwin_amd64 /usr/local/bin/tanzu
+        sudo mv ${TANZU_HOME}/${TANZU_VERSION}/tanzu-cli-darwin_amd64 /usr/local/bin/tanzu
         chmod +x /usr/local/bin/tanzu
+        tanzu ceip-participation set false
+        tanzu config eula accept
         tanzu init
-        tanzu plugin repo add -b tanzu-cli-admin-plugins -n admin -p artifacts-admin
-        curl -Lo admin-plugins.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-plugins-admin-darwin-amd64.tar.gz
-        tar -xzf admin-plugins.tar.gz -C ${TANZU_HOME}
-        tanzu plugin install builder --local ${TANZU_HOME}/admin-plugins
-        tanzu builder version
-        tanzu plugin install test --local ${TANZU_HOME}/admin-plugins
+        tanzu plugin install builder
         tanzu plugin list
     - name: Test
       run: make test
     - name: Build Version
-      run: echo "BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      run: echo "PLUGIN_BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       if: startsWith(github.ref, 'refs/tags/')
     - name: Build
-      run: make build
-    - name: Publish
-      run: make publish
+      run: make plugin-build
     - name: Install
       run: |
-        if [[ -z ${BUILD_VERSION} ]]; then
-          BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
-          BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$BUILD_SHA_SHORT
+        if [[ -z ${PLUGIN_BUILD_VERSION} ]]; then
+          PLUGIN_BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
+          PLUGIN_BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$PLUGIN_BUILD_SHA_SHORT
         fi
-        echo $BUILD_VERSION
-        tanzu plugin install apps --version $BUILD_VERSION --local ./artifacts/published/darwin-amd64
+        echo $PLUGIN_BUILD_VERSION
+        tanzu plugin install apps --version $PLUGIN_BUILD_VERSION --local ./artifacts/plugins/darwin/amd64
 
   acceptance:
     needs: [unit-ubuntu, unit-windows, unit-macos]
@@ -215,20 +193,21 @@ jobs:
       run: |
         TANZU_VERSION=$(cat TANZU_VERSION)
         mkdir -p ${TANZU_HOME}
-        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-linux-amd64.tar.gz
-          tar -xzf tanzu-framework.tar.gz -C ${TANZU_HOME}
-          sudo mv ${TANZU_HOME}/cli/core/${TANZU_VERSION}/tanzu-core-linux_amd64 /usr/local/bin/tanzu
-          chmod +x /usr/local/bin/tanzu
-        env
+        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-cli/releases/download/${TANZU_VERSION}/tanzu-cli-linux-amd64.tar.gz
+        tar -xzf tanzu-framework.tar.gz -C ${TANZU_HOME}
+        sudo mv ${TANZU_HOME}/${TANZU_VERSION}/tanzu-cli-linux_amd64 /usr/local/bin/tanzu
+        chmod +x /usr/local/bin/tanzu
+        tanzu ceip-participation set false
+        tanzu config eula accept
         tanzu init
     - name: Build dev version
       run: |
-        BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
-        echo "BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$BUILD_SHA_SHORT" >> $GITHUB_ENV
-        echo $BUILD_VERSION
+        PLUGIN_BUILD_SHA_SHORT=$(git rev-parse --short HEAD)
+        echo "PLUGIN_BUILD_VERSION=$(cat APPS_PLUGIN_VERSION)-dev-$PLUGIN_BUILD_SHA_SHORT" >> $GITHUB_ENV
+        echo $PLUGIN_BUILD_VERSION
       if: startsWith(github.ref, 'refs/tags/') != true
     - name: Build tag version
-      run: echo "BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      run: echo "PLUGIN_BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
       if: startsWith(github.ref, 'refs/tags/')
     - name: Install apps plugin
       run: |
@@ -238,7 +217,7 @@ jobs:
         set -u
 
         tar -xvf tanzu-apps-plugin.tar.gz
-        tanzu plugin install apps --local ./${OS_ARCH} --version ${BUILD_VERSION:-v0.0.0-dev}
+        tanzu plugin install apps --local ./linux/amd64 --version ${PLUGIN_BUILD_VERSION:-v0.0.0-dev}
     - name: Generate certs
       run: |
         set -o errexit
@@ -281,7 +260,7 @@ jobs:
         docker run \
         --entrypoint htpasswd \
         httpd:2 -Bbn ${REGISTRY_USERNAME} ${REGISTRY_PASSWORD} > ${REGISTRY_HTPWD}/htpasswd
-        
+
         # Run a registry.
         docker run -d \
           --restart=always \
@@ -401,7 +380,7 @@ jobs:
       with:
         tag_name: ${{ github.ref }}
         release_name: Release ${{ steps.get_version.outputs.VERSION }}
-        draft: true 
+        draft: true
     - name: Create release info files
       run: |
         echo "${{ steps.get_version.outputs.VERSION }}" > RELEASE_INFO_VERSION
@@ -439,64 +418,3 @@ jobs:
         asset_path: tanzu-apps-plugin${{ matrix.os-arch }}.tar.gz
         asset_name: tanzu-apps-plugin${{ matrix.os-arch }}-${{ env.RELEASE_VERSION }}.tar.gz
         asset_content_type: application/gzip
-
-  publish-oci-artifact:
-    env:
-      TANZU_CLI_NO_INIT: true
-      TANZU_HOME: $HOME/tanzu
-      ARTIFACTS_DIR: ./artifacts
-    needs:
-    - release
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: vmware-tanzu/carvel-setup-action@v1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Install tanzu cli
-      run: |
-        TANZU_VERSION=$(cat TANZU_VERSION)
-        mkdir -p ${TANZU_HOME}
-        curl -Lo tanzu-framework.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-linux-amd64.tar.gz
-        tar -xzf tanzu-framework.tar.gz -C ${TANZU_HOME}
-        sudo mv ${TANZU_HOME}/cli/core/${TANZU_VERSION}/tanzu-core-linux_amd64 /usr/local/bin/tanzu
-        chmod +x /usr/local/bin/tanzu
-        tanzu init
-        tanzu plugin repo add -b tanzu-cli-admin-plugins -n admin -p artifacts-admin
-        curl -Lo admin-plugins.tar.gz https://github.com/vmware-tanzu/tanzu-framework/releases/download/${TANZU_VERSION}/tanzu-framework-plugins-admin-linux-amd64.tar.gz
-        tar -xzf admin-plugins.tar.gz -C ${TANZU_HOME}
-        tanzu plugin install builder --local ${TANZU_HOME}/admin-plugins
-        tanzu plugin list
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Set repos
-      run: |
-        echo "DISTRIBUTION_REPO=ghcr.io/${{ github.repository }}/distribution" >> $GITHUB_ENV
-        echo "DISCOVERY_REPO=ghcr.io/${{ github.repository }}/discovery" >> $GITHUB_ENV
-        echo $DISTRIBUTION_REPO
-        echo $DISCOVERY_REPO
-    - name: Build Version
-      run: |
-        echo "BUILD_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-    - name: Download build artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: tanzu-apps-plugin-build.tar.gz
-    - name: Get build artifact
-      run: |
-        set -o errexit
-        set -o nounset
-        set -o pipefail
-
-        if [ ! -d ${ARTIFACTS_DIR} ]; then
-          mkdir -p ${ARTIFACTS_DIR}
-        fi
-
-        tar -xvf tanzu-apps-plugin-build.tar.gz -C ${ARTIFACTS_DIR}
-    - name: Publish OCI
-      run: make publish-oci

.github/workflows/rebase.yaml

@@ -6,7 +6,7 @@ jobs:
   rebase:
     name: Rebase
     if: >-
-      github.event.issue.pull_request != '' && 
+      github.event.issue.pull_request != '' &&
       (
         contains(github.event.comment.body, '/rebase')
       )