diff --git a/.github/actions/backup-restore-test/action.yml b/.github/actions/backup-restore-test/action.yml index 2916bb34d..2b274ca51 100644 --- a/.github/actions/backup-restore-test/action.yml +++ b/.github/actions/backup-restore-test/action.yml @@ -59,7 +59,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-${{ inputs.service }}${CATEGORY_SUFFIX}-backup-${{inputs.kind }}.log - ./corso backup create '${{ inputs.service }}' \ + ./canario backup create '${{ inputs.service }}' \ --no-stats --hide-progress --json \ ${{ inputs.backup-args }} | tee /dev/stderr | # for printing logs @@ -80,7 +80,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-${{ inputs.service }}${CATEGORY_SUFFIX}-restore-${{inputs.kind }}.log - ./corso restore '${{ inputs.service }}' \ + ./canario restore '${{ inputs.service }}' \ --no-stats \ --hide-progress \ --collisions ${{ inputs.on-collision }} \ @@ -128,7 +128,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-${{ inputs.service }}${CATEGORY_SUFFIX}-restore-${{inputs.kind }}.log - ./corso export '${{ inputs.service }}' \ + ./canario export '${{ inputs.service }}' \ /tmp/export-${{ inputs.service }}${CATEGORY_SUFFIX}-${{inputs.kind }} \ --no-stats \ --hide-progress \ @@ -170,7 +170,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-${{ inputs.service }}${CATEGORY_SUFFIX}-restore-${{inputs.kind }}.log - ./corso export '${{ inputs.service }}' \ + ./canario export '${{ inputs.service }}' \ /tmp/export-${{ inputs.service }}${CATEGORY_SUFFIX}-${{inputs.kind }}-archive \ --no-stats \ --hide-progress \ @@ -213,7 +213,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-backup-${{ inputs.service }}${CATEGORY_SUFFIX}-list-${{inputs.kind }}.log - ./corso backup list ${{ inputs.service }} \ + ./canario backup list ${{ inputs.service }} \ --no-stats \ --hide-progress \ 2>&1 | @@ -237,7 +237,7 @@ runs: CATEGORY_SUFFIX="" [[ -n "${{ inputs.category }}" ]] && CATEGORY_SUFFIX="-${{ inputs.category }}" CORSO_LOG_FILE=${{ inputs.log-dir }}/gotest-backup-list-${{ inputs.service }}${CATEGORY_SUFFIX}-single-${{inputs.kind }}.log - ./corso backup list ${{ inputs.service }} \ + ./canario backup list ${{ inputs.service }} \ --no-stats \ --hide-progress \ --backup "${{ steps.backup.outputs.result }}" \ diff --git a/.github/actions/publish-binary/action.yml b/.github/actions/publish-binary/action.yml index 847b2a04b..127a7c034 100644 --- a/.github/actions/publish-binary/action.yml +++ b/.github/actions/publish-binary/action.yml @@ -1,5 +1,14 @@ name: Publish Binary +################################### +# notice: +# This file has undergone major +# renaming for the canario fork. +# In case of re-incorporation back +# to corso, this refactoring will +# need to be undone. +################################### + inputs: version: description: Corso version to use for publishing @@ -40,36 +49,36 @@ runs: workdir: src env: GITHUB_TOKEN: ${{ inputs.github_token }} - RUDDERSTACK_CORSO_WRITE_KEY: ${{ inputs.rudderstack_write_key }} - RUDDERSTACK_CORSO_DATA_PLANE_URL: ${{ inputs.rudderstack_data_plane_url }} - CORSO_VERSION: ${{ inputs.version }} + RUDDERSTACK_CANARIO_WRITE_KEY: ${{ inputs.rudderstack_write_key }} + RUDDERSTACK_CANARIO_DATA_PLANE_URL: ${{ inputs.rudderstack_data_plane_url }} + CANARIO_VERSION: ${{ inputs.version }} - name: Upload darwin arm64 uses: actions/upload-artifact@v3 with: - name: corso_Darwin_arm64 - path: src/dist/corso_darwin_arm64/corso + name: canario_Darwin_arm64 + path: src/dist/canario_darwin_arm64/canario - name: Upload linux arm64 uses: actions/upload-artifact@v3 with: - name: corso_Linux_arm64 - path: src/dist/corso_linux_arm64/corso + name: canario_Linux_arm64 + path: src/dist/canario_linux_arm64/canario - name: Upload darwin amd64 uses: actions/upload-artifact@v3 with: - name: corso_Darwin_amd64 - path: src/dist/corso_darwin_amd64_v1/corso + name: canario_Darwin_amd64 + path: src/dist/canario_darwin_amd64_v1/canario - name: Upload linux amd64 uses: actions/upload-artifact@v3 with: - name: corso_Linux_amd64 - path: src/dist/corso_linux_amd64_v1/corso + name: canario_Linux_amd64 + path: src/dist/canario_linux_amd64_v1/canario - name: Upload windows amd64 uses: actions/upload-artifact@v3 with: - name: corso_Windows_amd64 - path: src/dist/corso_windows_amd64_v1/corso.exe + name: canario_Windows_amd64 + path: src/dist/canario_windows_amd64_v1/canario.exe diff --git a/.github/workflows/binary-publish.yml b/.github/workflows/binary-publish.yml index c6eab38dc..7468fb7ed 100644 --- a/.github/workflows/binary-publish.yml +++ b/.github/workflows/binary-publish.yml @@ -29,6 +29,8 @@ jobs: - uses: actions/checkout@v4 - name: Publish Binary + # canario should never publish + if: false uses: ./.github/actions/publish-binary with: version: ${{ needs.SetEnv.outputs.version }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d21bafd77..d8fbc6c81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: Build/Release Corso env: - IMAGE_NAME: ghcr.io/alcionai/corso + IMAGE_NAME: ghcr.io/alcionai/canario on: workflow_dispatch: @@ -30,7 +30,7 @@ jobs: # --- Prechecks and Checkouts ------------------------------------------------------------------------ # ---------------------------------------------------------------------------------------------------- Precheck: - uses: alcionai/corso/.github/workflows/_filechange_checker.yml@main + uses: alcionai/canario/.github/workflows/_filechange_checker.yml@main Checkout: needs: [Precheck] @@ -52,7 +52,7 @@ jobs: # SetM365App will decide which M365 app to use for this CI run SetM365App: - uses: alcionai/corso/.github/workflows/accSelector.yaml@main + uses: alcionai/canario/.github/workflows/accSelector.yaml@main SetEnv: environment: Testing @@ -571,6 +571,8 @@ jobs: - uses: actions/checkout@v4 - name: Publish Binary + # canario should never publish + if: false uses: ./.github/actions/publish-binary with: version: ${{ needs.SetEnv.outputs.version }} @@ -582,7 +584,9 @@ jobs: needs: [Test-Suite-Trusted, Source-Code-Linting, Website-Linting, SetEnv] environment: ${{ needs.SetEnv.outputs.environment }} runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') defaults: run: working-directory: build @@ -635,7 +639,9 @@ jobs: needs: [Publish-Binary, Publish-Image, SetEnv] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') env: CORSO_VERSION: ${{ needs.SetEnv.outputs.version }} steps: @@ -665,7 +671,9 @@ jobs: needs: [Publish-Binary, Publish-Image, SetEnv] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') env: CORSO_VERSION: ${{ needs.SetEnv.outputs.version }} steps: @@ -687,7 +695,9 @@ jobs: needs: [Publish-Binary, Publish-Image, SetEnv] environment: Testing runs-on: macos-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') env: CORSO_VERSION: ${{ needs.SetEnv.outputs.version }} steps: @@ -709,7 +719,9 @@ jobs: needs: [Publish-Binary, Publish-Image, SetEnv] environment: Testing runs-on: windows-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') env: CORSO_VERSION: ${{ needs.SetEnv.outputs.version }} steps: @@ -730,6 +742,8 @@ jobs: - uses: actions/checkout@v4 # need to checkout to make the action available - name: Publish website + # canario should never publish + if: false uses: ./.github/actions/publish-website with: aws-iam-role: ${{ secrets.AWS_IAM_ROLE }} @@ -740,12 +754,16 @@ jobs: needs: [SetEnv, Validate-Linux-Artifacts, Validate-MacOS-Artifacts, Validate-Docker-Artifacts, Validate-Windows-Artifacts] environment: ${{ needs.SetEnv.outputs.environment }} runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') steps: - uses: actions/checkout@v4 # need to checkout to make the action available - name: Publish website + # canario should never publish + if: false uses: ./.github/actions/publish-website with: aws-iam-role: ${{ secrets.AWS_IAM_ROLE }} @@ -756,7 +774,9 @@ jobs: needs: [Publish-Website-Prod, SetEnv] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') + # canario should never publish + if: false + # if: startsWith(github.ref, 'refs/tags/') env: CORSO_VERSION: ${{ needs.SetEnv.outputs.version }} steps: diff --git a/.github/workflows/longevity_test.yml b/.github/workflows/longevity_test.yml index f6b97a49a..94883dad7 100644 --- a/.github/workflows/longevity_test.yml +++ b/.github/workflows/longevity_test.yml @@ -20,7 +20,7 @@ concurrency: jobs: SetM365App: - uses: alcionai/corso/.github/workflows/accSelector.yaml@main + uses: alcionai/canario/.github/workflows/accSelector.yaml@main Longevity-Tests: needs: [ SetM365App ] @@ -76,7 +76,8 @@ jobs: git checkout ${{ steps.version.outputs.version }} git checkout ${{ github.ref }} -- .github - - run: go build -o corso + - run: + timeout-minutes: 10 - run: mkdir ${CORSO_LOG_DIR} @@ -97,7 +98,7 @@ jobs: - name: Version Test timeout-minutes: 10 run: | - ./corso --version | grep -c 'Corso version:' + ./canario --version | grep -c 'Corso version:' - name: Repo init test id: repo-init @@ -105,7 +106,7 @@ jobs: run: | set -euo pipefail echo -e "\nRepo init test\n" >> ${{ env.CORSO_LOG_FILE }} - ./corso repo init s3 \ + ./canario repo init s3 \ --no-stats \ --hide-progress \ --retention-mode $(echo "${{ env.RETENTION_MODE }}" | tr '[:upper:]' '[:lower:]') \ @@ -127,7 +128,7 @@ jobs: run: | set -euo pipefail echo -e "\nRepo connect test\n" >> ${{ env.CORSO_LOG_FILE }} - ./corso repo connect s3 \ + ./canario repo connect s3 \ --no-stats \ --hide-progress \ --prefix ${{ env.PREFIX }} \ @@ -148,7 +149,7 @@ jobs: timeout-minutes: 30 run: | echo -e "\nBackup Exchange test\n" >> ${CORSO_LOG_FILE} - ./corso backup create exchange \ + ./canario backup create exchange \ --no-stats \ --mailbox "${TEST_USER}" \ --hide-progress \ @@ -174,7 +175,7 @@ jobs: run: | set -euo pipefail echo -e "\nBackup OneDrive test\n" >> ${CORSO_LOG_FILE} - ./corso backup create onedrive \ + ./canario backup create onedrive \ --no-stats \ --hide-progress \ --user "${TEST_USER}" \ @@ -200,7 +201,7 @@ jobs: set -euo pipefail echo -e "\nBackup SharePoint test\n" >> ${CORSO_LOG_FILE} - ./corso backup create sharepoint \ + ./canario backup create sharepoint \ --no-stats \ --hide-progress \ --site "${{ vars.CORSO_M365_TEST_SITE_URL }}" \ @@ -265,9 +266,9 @@ jobs: echo -e "\Export OneDrive test\n" >> ${CORSO_LOG_FILE} echo -e "\Export OneDrive test - first entry\n" >> ${CORSO_LOG_FILE} - ./corso backup list onedrive 2>/dev/null | tail -n+2 | head -n1 | awk '{print $1}' | + ./canario backup list onedrive 2>/dev/null | tail -n+2 | head -n1 | awk '{print $1}' | while read -r line; do - ./corso export onedrive \ + ./canario export onedrive \ "/tmp/corso-export--$line" \ --no-stats \ --backup "$line" \ @@ -275,9 +276,9 @@ jobs: done echo -e "\Export OneDrive test - last entry\n" >> ${CORSO_LOG_FILE} - ./corso backup list onedrive 2>/dev/null | tail -n1 | awk '{print $1}' | + ./canario backup list onedrive 2>/dev/null | tail -n1 | awk '{print $1}' | while read -r line; do - ./corso export onedrive \ + ./canario export onedrive \ "/tmp/corso-export--$line" \ --no-stats \ --backup "$line" \ @@ -293,9 +294,9 @@ jobs: echo -e "\Export SharePoint test\n" >> ${CORSO_LOG_FILE} echo -e "\Export SharePoint test - first entry\n" >> ${CORSO_LOG_FILE} - ./corso backup list sharepoint 2>/dev/null | tail -n+2 | head -n1 | awk '{print $1}' | + ./canario backup list sharepoint 2>/dev/null | tail -n+2 | head -n1 | awk '{print $1}' | while read -r line; do - ./corso export sharepoint \ + ./canario export sharepoint \ "/tmp/corso-export--$line" \ --no-stats \ --backup "$line" \ @@ -303,9 +304,9 @@ jobs: done echo -e "\Export SharePoint test - last entry\n" >> ${CORSO_LOG_FILE} - ./corso backup list sharepoint 2>/dev/null | tail -n1 | awk '{print $1}' | + ./canario backup list sharepoint 2>/dev/null | tail -n1 | awk '{print $1}' | while read -r line; do - ./corso export sharepoint \ + ./canario export sharepoint \ "/tmp/corso-export--$line" \ --no-stats \ --backup "$line" \ @@ -324,7 +325,7 @@ jobs: # Run with the force flag so it doesn't fail if the github runner # hostname isn't what's expected. This is only safe because we can # guarantee only one runner will be executing maintenance at a time. - ./corso repo maintenance --mode metadata \ + ./canario repo maintenance --mode metadata \ --no-stats \ --hide-progress \ --force \ @@ -339,7 +340,7 @@ jobs: set -euo pipefail echo -e "\n Maintenance test Weekly\n" >> ${CORSO_LOG_FILE} - ./corso repo maintenance --mode complete \ + ./canario repo maintenance --mode complete \ --no-stats \ --hide-progress \ --force \ diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 4e65b52a5..e49ce7730 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -41,7 +41,7 @@ jobs: # SetM365App will decide which M365 app to use for this CI run SetM365App: - uses: alcionai/corso/.github/workflows/accSelector.yaml@main + uses: alcionai/canario/.github/workflows/accSelector.yaml@main # ---------------------------------------------------------------------------------------------------- # --- Nightly Testing ------------------------------------------------------------------- diff --git a/.github/workflows/sanity-test.yaml b/.github/workflows/sanity-test.yaml index da18b2228..87bab7be2 100644 --- a/.github/workflows/sanity-test.yaml +++ b/.github/workflows/sanity-test.yaml @@ -20,7 +20,7 @@ concurrency: jobs: SetM365App: - uses: alcionai/corso/.github/workflows/accSelector.yaml@main + uses: alcionai/canario/.github/workflows/accSelector.yaml@main Sanity-Tests: needs: [ SetM365App ] @@ -56,7 +56,7 @@ jobs: with: go-version-file: src/go.mod - - run: go build -o corso + - run: go build -o canario timeout-minutes: 10 - run: go build -o sanity-test ./cmd/sanity_test @@ -114,7 +114,7 @@ jobs: - name: Version Test timeout-minutes: 10 run: | - ./corso --version | grep -c 'Corso version:' + ./canario --version | grep -c 'Corso version:' - name: Repo init test timeout-minutes: 10 @@ -123,7 +123,7 @@ jobs: set -euo pipefail prefix=$(date +"%Y-%m-%d-%T") echo -e "\nRepo init test\n" >> ${{ env.CORSO_LOG_FILE }} - ./corso repo init s3 \ + ./canario repo init s3 \ --no-stats \ --hide-progress \ --prefix $prefix \ @@ -143,7 +143,7 @@ jobs: run: | set -euo pipefail echo -e "\nRepo connect test\n" >> ${{ env.CORSO_LOG_FILE }} - ./corso repo connect s3 \ + ./canario repo connect s3 \ --no-stats \ --hide-progress \ --prefix ${{ steps.repo-init.outputs.result }} \ @@ -163,7 +163,7 @@ jobs: run: | set -euo pipefail echo -e "\nRepo maintenance test\n" >> ${{ env.CORSO_LOG_FILE }} - ./corso repo maintenance \ + ./canario repo maintenance \ --no-stats \ --hide-progress \ --mode complete \ diff --git a/.github/workflows/website-publish.yml b/.github/workflows/website-publish.yml index 4581d9bfe..fa73ab8f6 100644 --- a/.github/workflows/website-publish.yml +++ b/.github/workflows/website-publish.yml @@ -49,6 +49,8 @@ jobs: Publish-Website: needs: [Website-Linting] + # canario should never publish + if: false environment: Production runs-on: ubuntu-latest defaults: @@ -59,6 +61,8 @@ jobs: - uses: actions/checkout@v4 # need to checkout to make the action available - name: Publish website + # canario should never publish + if: false uses: ./.github/actions/publish-website with: aws-iam-role: ${{ secrets.AWS_IAM_ROLE }} diff --git a/.gitignore b/.gitignore index bdda0724b..72fb5bb09 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,8 @@ testlog/ *.swp # Standard configuration file names -.corso_test.toml -.corso.toml +.canario_test.toml +.canario.toml # Logging *.log diff --git a/README.md b/README.md index 413072d50..5583b9c16 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@