From 0b9dc41d58d1ed0a33b060437acecce05c371fa9 Mon Sep 17 00:00:00 2001 From: tdstein Date: Wed, 13 Sep 2023 11:20:40 -0400 Subject: [PATCH 1/4] Changes names to publishing-client --- .github/workflows/main.yaml | 22 ++++++++--------- .github/workflows/pull-request.yaml | 22 ++++++++--------- .vscode/launch.json | 4 ++-- README.md | 14 +++++------ .../commands/accounts.go | 8 +++---- .../commands/publish.go | 24 +++++++++---------- .../commands/version.go | 2 +- .../main.go | 14 +++++------ .../main_test.go | 4 ++-- go.mod | 2 +- internal/accounts/account_auth_type_test.go | 2 +- internal/accounts/account_list.go | 2 +- internal/accounts/account_list_test.go | 4 ++-- internal/accounts/account_source_test.go | 2 +- internal/accounts/account_test.go | 2 +- internal/accounts/provider_env_var.go | 2 +- internal/accounts/provider_env_var_test.go | 4 ++-- internal/accounts/provider_rsconnect.go | 6 ++--- .../accounts/provider_rsconnect_python.go | 2 +- .../provider_rsconnect_python_test.go | 4 ++-- internal/accounts/provider_rsconnect_test.go | 8 +++---- internal/accounts/server_type_test.go | 2 +- internal/api_client/auth/auth.go | 2 +- internal/api_client/auth/token.go | 2 +- internal/api_client/clients/client.go | 6 ++--- internal/api_client/clients/client_auth.go | 2 +- internal/api_client/clients/client_connect.go | 14 +++++------ .../api_client/clients/clienttest/client.go | 8 +++---- internal/api_client/clients/http_client.go | 12 +++++----- internal/apptypes/apptypes_test.go | 2 +- internal/bundles/bundle.go | 6 ++--- internal/bundles/bundle_test.go | 10 ++++---- internal/bundles/bundlestest/walkertest.go | 2 +- internal/bundles/gitignore/gitignore.go | 2 +- internal/bundles/gitignore/gitignore_test.go | 4 ++-- internal/bundles/gitignore/interface.go | 2 +- internal/bundles/gitignore/walker.go | 2 +- internal/bundles/gitignore/walker_test.go | 4 ++-- internal/bundles/manifest.go | 4 ++-- internal/bundles/manifest_test.go | 4 ++-- internal/cli_types/base.go | 10 ++++---- internal/cli_types/base_test.go | 8 +++---- internal/connect_client.go | 2 +- internal/environment/python.go | 4 ++-- internal/environment/python_test.go | 6 ++--- internal/events/error_codes.go | 2 +- internal/events/errors.go | 2 +- internal/events/errors_test.go | 4 ++-- internal/events/events.go | 4 ++-- internal/events/events_test.go | 6 ++--- internal/events/sse_handler.go | 4 ++-- internal/events/sse_handler_test.go | 6 ++--- internal/events/sse_logger.go | 2 +- internal/events/sse_logger_test.go | 4 ++-- internal/inspect/all.go | 2 +- internal/inspect/all_test.go | 6 ++--- internal/inspect/entrypoint.go | 2 +- internal/inspect/entrypoint_test.go | 4 ++-- internal/inspect/html.go | 4 ++-- internal/inspect/html_test.go | 6 ++--- internal/inspect/infer.go | 4 ++-- internal/inspect/infer_test.go | 4 ++-- internal/inspect/notebook.go | 4 ++-- internal/inspect/notebook_test.go | 6 ++--- internal/inspect/python.go | 4 ++-- internal/inspect/python_test.go | 6 ++--- internal/logging/logger.go | 2 +- internal/logging/logger_test.go | 6 ++--- internal/logging/multi_handler_test.go | 4 ++-- internal/project/project.go | 4 ++-- internal/publish/publish.go | 18 +++++++------- internal/publish/publish_test.go | 18 +++++++------- internal/services/api/api.go | 2 +- internal/services/api/deployments/services.go | 4 ++-- .../services/api/deployments/services_test.go | 6 ++--- .../services/api/files/file_types_test.go | 2 +- internal/services/api/files/files.go | 4 ++-- internal/services/api/files/files_test.go | 6 ++--- internal/services/api/files/services.go | 6 ++--- internal/services/api/files/services_test.go | 6 ++--- internal/services/api/get_accounts.go | 4 ++-- internal/services/api/get_deployment.go | 2 +- internal/services/api/get_deployment_test.go | 4 ++-- internal/services/api/get_file.go | 8 +++---- internal/services/api/get_file_test.go | 8 +++---- internal/services/api/http_service.go | 10 ++++---- internal/services/api/paths/services.go | 4 ++-- internal/services/api/paths/services_test.go | 6 ++--- internal/services/api/publish.go | 8 +++---- internal/services/api/put_deployment_files.go | 4 ++-- .../services/api/put_deployment_files_test.go | 6 ++--- internal/services/api/test.go | 10 ++++---- internal/services/local_token.go | 2 +- internal/services/middleware/auth_required.go | 2 +- internal/services/middleware/cookie_auth.go | 4 ++-- .../services/middleware/insert_prefix_test.go | 2 +- .../services/middleware/local_token_auth.go | 4 ++-- internal/services/middleware/log_request.go | 2 +- .../services/middleware/panic_recovery.go | 2 +- internal/services/proxy/http_proxy.go | 2 +- internal/services/ui/ui_service.go | 20 ++++++++-------- internal/state/connect.go | 2 +- internal/state/connect_test.go | 4 ++-- internal/state/deployment.go | 10 ++++---- internal/state/deployment_test.go | 12 +++++----- internal/state/environment.go | 2 +- internal/state/environment_test.go | 4 ++-- internal/state/json_serializer.go | 4 ++-- internal/state/json_serializer_test.go | 6 ++--- internal/types/error_test.go | 2 +- internal/types/optional_test.go | 2 +- internal/util/dcf/dcf.go | 2 +- internal/util/dcf/dcf_test.go | 4 ++-- internal/util/dcf/dcftest.go | 2 +- internal/util/files_test.go | 2 +- internal/util/http_test.go | 2 +- internal/util/random_test.go | 2 +- internal/util/slice_test.go | 2 +- internal/util/symlink_walker.go | 2 +- internal/util/symlink_walker_test.go | 4 ++-- justfile | 16 ++++++------- scripts/build.bash | 4 ++-- test/README.md | 10 ++++---- test/bats/server-tests/server-tests.bats | 4 ++-- test/justfile | 12 +++++----- web/README.md | 2 +- 126 files changed, 339 insertions(+), 341 deletions(-) rename cmd/{connect-client => publishing-client}/commands/accounts.go (91%) rename cmd/{connect-client => publishing-client}/commands/publish.go (90%) rename cmd/{connect-client => publishing-client}/commands/version.go (81%) rename cmd/{connect-client => publishing-client}/main.go (85%) rename cmd/{connect-client => publishing-client}/main_test.go (77%) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 503b1d65c..849ad7736 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -57,7 +57,7 @@ jobs: build-args: BUILDKIT_INLINE_CACHE=1 pull: True file: build/package/Dockerfile - tags: rstudio/connect-client:latest + tags: rstudio/publishing-client:latest outputs: type=docker,dest=/tmp/build-image.tar - if: ${{ steps.cache-docker-image-restore.outputs.cache-hit != 'true' }} @@ -309,7 +309,7 @@ jobs: - name: Make agents executable run: | - sudo chmod -R +x ./bin/**/connect-client + sudo chmod -R +x ./bin/**/publishing-client - name: Agent build artifacts uses: actions/upload-artifact@v3 @@ -353,7 +353,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Restore Cache UX node_modules id: node_modules @@ -389,7 +389,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Run Windows CLI Tests env: @@ -401,7 +401,7 @@ jobs: run: | just test/bats-install $env:Path += ";$env:GITHUB_WORKSPACE\test\libs\bats-core\bin" - $env:BINARY_PATH = "$env:GITHUB_WORKSPACE\bin\windows-amd64\connect-client" + $env:BINARY_PATH = "$env:GITHUB_WORKSPACE\bin\windows-amd64\publishing-client" cd $env:GITHUB_WORKSPACE\test just run-client $env:os - @@ -434,14 +434,14 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Run MacOs CLI Tests env: os: macos-latest BATS_SUPPORT_LIB: ${{ github.workspace }}/test/libs/bats-support/load BATS_ASSERT_LIB: ${{ github.workspace }}/test/libs/bats-assert/load - BINARY_PATH: ${{ github.workspace }}/bin/darwin-amd64/connect-client + BINARY_PATH: ${{ github.workspace }}/bin/darwin-amd64/publishing-client # WARNING Docker run will only fail step if last command fails... run: | just test/bats-install @@ -502,7 +502,7 @@ jobs: pull: True file: test/docker/Dockerfile platforms: linux/amd64 - tags: rstudio/connect-client-linux-amd64:latest + tags: rstudio/publishing-client-linux-amd64:latest outputs: type=docker,dest=/tmp/linux-amd64-image.tar - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -539,7 +539,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Cache docker image (restore) id: cache-linux-amd64-image @@ -613,7 +613,7 @@ jobs: pull: True file: test/docker/Dockerfile platforms: linux/arm64 - tags: rstudio/connect-client-linux-arm64:latest + tags: rstudio/publishing-client-linux-arm64:latest outputs: type=docker,dest=/tmp/linux-arm64-image.tar - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -650,7 +650,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client # these are required to run docker on amd64 and arm64 platforms - diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 770a1666c..3d1f4e534 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -54,7 +54,7 @@ jobs: build-args: BUILDKIT_INLINE_CACHE=1 pull: True file: build/package/Dockerfile - tags: rstudio/connect-client:latest + tags: rstudio/publishing-client:latest outputs: type=docker,dest=/tmp/build-image.tar - if: ${{ steps.cache-docker-image-restore.outputs.cache-hit != 'true' }} @@ -306,7 +306,7 @@ jobs: - name: Make agents executable run: | - sudo chmod -R +x ./bin/**/connect-client + sudo chmod -R +x ./bin/**/publishing-client - name: Agent build artifacts uses: actions/upload-artifact@v3 @@ -350,7 +350,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Restore Cache UX node_modules id: node_modules @@ -386,7 +386,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Run Windows CLI Tests env: @@ -398,7 +398,7 @@ jobs: run: | just test/bats-install $env:Path += ";$env:GITHUB_WORKSPACE\test\libs\bats-core\bin" - $env:BINARY_PATH = "$env:GITHUB_WORKSPACE\bin\windows-amd64\connect-client" + $env:BINARY_PATH = "$env:GITHUB_WORKSPACE\bin\windows-amd64\publishing-client" cd $env:GITHUB_WORKSPACE\test just run-client $env:os - @@ -431,14 +431,14 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Run MacOs CLI Tests env: os: macos-latest BATS_SUPPORT_LIB: ${{ github.workspace }}/test/libs/bats-support/load BATS_ASSERT_LIB: ${{ github.workspace }}/test/libs/bats-assert/load - BINARY_PATH: ${{ github.workspace }}/bin/darwin-amd64/connect-client + BINARY_PATH: ${{ github.workspace }}/bin/darwin-amd64/publishing-client # WARNING Docker run will only fail step if last command fails... run: | just test/bats-install @@ -499,7 +499,7 @@ jobs: pull: True file: test/docker/Dockerfile platforms: linux/amd64 - tags: rstudio/connect-client-linux-amd64:latest + tags: rstudio/publishing-client-linux-amd64:latest outputs: type=docker,dest=/tmp/linux-amd64-image.tar - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -536,7 +536,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client - name: Cache docker image (restore) id: cache-linux-amd64-image @@ -610,7 +610,7 @@ jobs: pull: True file: test/docker/Dockerfile platforms: linux/arm64 - tags: rstudio/connect-client-linux-arm64:latest + tags: rstudio/publishing-client-linux-arm64:latest outputs: type=docker,dest=/tmp/linux-arm64-image.tar - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -647,7 +647,7 @@ jobs: - name: Make agents executable run: | - chmod -R +x ./bin/**/connect-client + chmod -R +x ./bin/**/publishing-client # these are required to run docker on amd64 and arm64 platforms - diff --git a/.vscode/launch.json b/.vscode/launch.json index d1af61246..1892e4647 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "go", "request": "launch", "mode": "auto", - "program": "cmd/connect-client/main.go", + "program": "cmd/publishing-client/main.go", "args": [ "publish-ui", "-n", @@ -22,7 +22,7 @@ "type": "go", "request": "launch", "mode": "auto", - "program": "cmd/connect-client/main.go", + "program": "cmd/publishing-client/main.go", "args": [ "publish", "-n", diff --git a/README.md b/README.md index bebd822e8..ae30e2267 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ your local machine for development and testing purposes. ### Prerequisites NOTE: This project has been configured to use docker by default, which minimizes -the prerequisites which need to be installed. Use of docker can be controlled +the prerequisites which need to be installed. Use of docker can be controlled via the DOCKER environment variable: if (DOCKER is undefined || DOCKER === 'true') { Tasks will be executed in a docker container using the image `build/package/Dockerfile` @@ -25,7 +25,7 @@ If using Docker, you must have Docker installed: [Docker](https://www.docker.com Just (justfile runner) is used to run commands: [Just](https://just.systems) -See the additional pre-requisites required for development tasks without Docker at: +See the additional pre-requisites required for development tasks without Docker at: - CLI: TBD - UX: [`web/README.md`](./web/README.md) @@ -49,16 +49,16 @@ Simplest approach to perform all of the applicable steps: Building the DOCKER image: - If using docker (by either not setting the DOCKER environment variable or setting it to "true"), you'll need - to build the DOCKER image. This is done as one of the steps within the `default` recipe, but you can also + to build the DOCKER image. This is done as one of the steps within the `default` recipe, but you can also perform it with the command `just image`. - If you are not using docker, you can skip this step, although performing the recipe is a NO-OP. #### Justfiles All tasks are done through the justfile recipes, present within the top level `justfile` file. Recipes present include macro-operations -for the multiple projects (Go and Web SPA) included in this repo. +for the multiple projects (Go and Web SPA) included in this repo. -Specialized recipes for the Go project are located within the `cmd/connect-client/justfile` and +Specialized recipes for the Go project are located within the `cmd/publishing-client/justfile` and specialized recipes for the Web project are located within the `web/justfile`. The top level `justfile` recipes can be displayed from within the top level repo subdirectory by issuing the command: `just --list` @@ -72,8 +72,8 @@ If you want to build the development version the easiest (after switching branch 1. Build and start the vite web server, to support error reporting and hot-reloading: `just web/dev` in one terminal. Keep the terminal window open. - This will launch the `vite` web server on `http://127.0.0.1:9000` 2. Within a new terminal window, build the development version of the CLI: `just build-dev`. Keep this terminal open, so that you can rebuild as needed. -3. Within a new terminal window, launch the development version of the CLI for the current platform (with these parameters): `./connect-client publish-ui --listen=127.0.0.1:9001 --open-browser-at="http://127.0.0.1:9000" --skip-browser-session-auth` - - *Where** `` above is replaced with a location of a sample project. For example, with a python project at `~/dev/connect-content/bundles/python-flaskapi`, your complete command line would become: `./connect-client publish-ui ~/dev/connect-content/bundles/python-flaskapi --listen=127.0.0.1:9001 --open-browser-at="http://127.0.0.1:9000" --skip-browser-session-auth`. +3. Within a new terminal window, launch the development version of the CLI for the current platform (with these parameters): `./publishing-client publish-ui --listen=127.0.0.1:9001 --open-browser-at="http://127.0.0.1:9000" --skip-browser-session-auth` + - *Where** `` above is replaced with a location of a sample project. For example, with a python project at `~/dev/connect-content/bundles/python-flaskapi`, your complete command line would become: `./publishing-client publish-ui ~/dev/connect-content/bundles/python-flaskapi --listen=127.0.0.1:9001 --open-browser-at="http://127.0.0.1:9000" --skip-browser-session-auth`. - This launches the CLI and configures it to listen on port `9001`, while launching a browser to the address which is being served by the `vite` web server. You now should have a Web UX loaded within the browser, which is loading from the `vite` dev server, but has its APIs serviced from the CLI backend. diff --git a/cmd/connect-client/commands/accounts.go b/cmd/publishing-client/commands/accounts.go similarity index 91% rename from cmd/connect-client/commands/accounts.go rename to cmd/publishing-client/commands/accounts.go index 0b362295e..ce7b2261c 100644 --- a/cmd/connect-client/commands/accounts.go +++ b/cmd/publishing-client/commands/accounts.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/api_client/clients" - "github.com/rstudio/connect-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/api_client/clients" + "github.com/rstudio/publishing-client/internal/cli_types" ) type addAccountCmd struct { @@ -80,7 +80,7 @@ func (cmd *listAccountsCmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLICo return err } if len(accounts) == 0 { - fmt.Println("No accounts are saved. To add an account, see `connect-client add-server --help`.") + fmt.Println("No accounts are saved. To add an account, see `publishing-client add-server --help`.") } else { fmt.Println() for _, account := range accounts { diff --git a/cmd/connect-client/commands/publish.go b/cmd/publishing-client/commands/publish.go similarity index 90% rename from cmd/connect-client/commands/publish.go rename to cmd/publishing-client/commands/publish.go index bc9bfdde2..42f4bc38b 100644 --- a/cmd/connect-client/commands/publish.go +++ b/cmd/publishing-client/commands/publish.go @@ -7,18 +7,18 @@ import ( "io/fs" "os" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/bundles/gitignore" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/environment" - "github.com/rstudio/connect-client/internal/events" - "github.com/rstudio/connect-client/internal/inspect" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/publish" - "github.com/rstudio/connect-client/internal/services/ui" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/bundles/gitignore" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/environment" + "github.com/rstudio/publishing-client/internal/events" + "github.com/rstudio/publishing-client/internal/inspect" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/publish" + "github.com/rstudio/publishing-client/internal/services/ui" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util" ) type StatefulCommand interface { diff --git a/cmd/connect-client/commands/version.go b/cmd/publishing-client/commands/version.go similarity index 81% rename from cmd/connect-client/commands/version.go rename to cmd/publishing-client/commands/version.go index fbe6b079b..7b68b3c06 100644 --- a/cmd/connect-client/commands/version.go +++ b/cmd/publishing-client/commands/version.go @@ -5,7 +5,7 @@ package commands import ( "fmt" - "github.com/rstudio/connect-client/internal/project" + "github.com/rstudio/publishing-client/internal/project" "github.com/alecthomas/kong" ) diff --git a/cmd/connect-client/main.go b/cmd/publishing-client/main.go similarity index 85% rename from cmd/connect-client/main.go rename to cmd/publishing-client/main.go index 0bc1cf435..6180021d5 100644 --- a/cmd/connect-client/main.go +++ b/cmd/publishing-client/main.go @@ -6,13 +6,13 @@ import ( "os" "github.com/alecthomas/kong" - "github.com/rstudio/connect-client/cmd/connect-client/commands" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/events" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/project" - "github.com/rstudio/connect-client/internal/services" + "github.com/rstudio/publishing-client/cmd/publishing-client/commands" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/events" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/project" + "github.com/rstudio/publishing-client/internal/services" "github.com/spf13/afero" ) diff --git a/cmd/connect-client/main_test.go b/cmd/publishing-client/main_test.go similarity index 77% rename from cmd/connect-client/main_test.go rename to cmd/publishing-client/main_test.go index 783857a07..6d2ce63d4 100644 --- a/cmd/connect-client/main_test.go +++ b/cmd/publishing-client/main_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" ) type MainSuite struct { diff --git a/go.mod b/go.mod index afd0f5c5f..d521b06a7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rstudio/connect-client +module github.com/rstudio/publishing-client go 1.21 diff --git a/internal/accounts/account_auth_type_test.go b/internal/accounts/account_auth_type_test.go index 515be9c07..d70c1625a 100644 --- a/internal/accounts/account_auth_type_test.go +++ b/internal/accounts/account_auth_type_test.go @@ -5,7 +5,7 @@ package accounts import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/accounts/account_list.go b/internal/accounts/account_list.go index fe69afbe3..0393cf716 100644 --- a/internal/accounts/account_list.go +++ b/internal/accounts/account_list.go @@ -5,7 +5,7 @@ package accounts import ( "fmt" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" "github.com/spf13/afero" ) diff --git a/internal/accounts/account_list_test.go b/internal/accounts/account_list_test.go index 1a7710a24..d5c551092 100644 --- a/internal/accounts/account_list_test.go +++ b/internal/accounts/account_list_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/accounts/account_source_test.go b/internal/accounts/account_source_test.go index e4a3087d6..9888302fd 100644 --- a/internal/accounts/account_source_test.go +++ b/internal/accounts/account_source_test.go @@ -5,7 +5,7 @@ package accounts import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/accounts/account_test.go b/internal/accounts/account_test.go index dffe6a058..04b5d5c4d 100644 --- a/internal/accounts/account_test.go +++ b/internal/accounts/account_test.go @@ -5,7 +5,7 @@ package accounts import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/accounts/provider_env_var.go b/internal/accounts/provider_env_var.go index ce86a6b64..b331418c5 100644 --- a/internal/accounts/provider_env_var.go +++ b/internal/accounts/provider_env_var.go @@ -5,7 +5,7 @@ package accounts import ( "os" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) type envVarProvider struct { diff --git a/internal/accounts/provider_env_var_test.go b/internal/accounts/provider_env_var_test.go index 67827b398..b89c1b956 100644 --- a/internal/accounts/provider_env_var_test.go +++ b/internal/accounts/provider_env_var_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/accounts/provider_rsconnect.go b/internal/accounts/provider_rsconnect.go index e5451f605..27b7b7366 100644 --- a/internal/accounts/provider_rsconnect.go +++ b/internal/accounts/provider_rsconnect.go @@ -8,9 +8,9 @@ import ( "sort" "strings" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/dcf" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/dcf" "github.com/spf13/afero" ) diff --git a/internal/accounts/provider_rsconnect_python.go b/internal/accounts/provider_rsconnect_python.go index f5db2cc55..6a7aa42e3 100644 --- a/internal/accounts/provider_rsconnect_python.go +++ b/internal/accounts/provider_rsconnect_python.go @@ -11,7 +11,7 @@ import ( "runtime" "sort" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" "github.com/spf13/afero" ) diff --git a/internal/accounts/provider_rsconnect_python_test.go b/internal/accounts/provider_rsconnect_python_test.go index 8fcde9129..51ad7b507 100644 --- a/internal/accounts/provider_rsconnect_python_test.go +++ b/internal/accounts/provider_rsconnect_python_test.go @@ -8,8 +8,8 @@ import ( "runtime" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/accounts/provider_rsconnect_test.go b/internal/accounts/provider_rsconnect_test.go index e0a52887d..5805be688 100644 --- a/internal/accounts/provider_rsconnect_test.go +++ b/internal/accounts/provider_rsconnect_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/dcf" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/dcf" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/accounts/server_type_test.go b/internal/accounts/server_type_test.go index 1b9a5ce14..020dff418 100644 --- a/internal/accounts/server_type_test.go +++ b/internal/accounts/server_type_test.go @@ -5,7 +5,7 @@ package accounts import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/api_client/auth/auth.go b/internal/api_client/auth/auth.go index 122fa1d66..d78dffdea 100644 --- a/internal/api_client/auth/auth.go +++ b/internal/api_client/auth/auth.go @@ -5,7 +5,7 @@ package auth import ( "net/http" - "github.com/rstudio/connect-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/accounts" ) type AuthMethod interface { diff --git a/internal/api_client/auth/token.go b/internal/api_client/auth/token.go index f1e244f20..bb3997074 100644 --- a/internal/api_client/auth/token.go +++ b/internal/api_client/auth/token.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) type tokenAuthenticator struct { diff --git a/internal/api_client/clients/client.go b/internal/api_client/clients/client.go index 1a0082c9d..b19a3aa51 100644 --- a/internal/api_client/clients/client.go +++ b/internal/api_client/clients/client.go @@ -3,9 +3,9 @@ package clients import ( "io" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/types" ) // Copyright (C) 2023 by Posit Software, PBC. diff --git a/internal/api_client/clients/client_auth.go b/internal/api_client/clients/client_auth.go index 5a5d05144..95835c8da 100644 --- a/internal/api_client/clients/client_auth.go +++ b/internal/api_client/clients/client_auth.go @@ -5,7 +5,7 @@ package clients import ( "net/http" - "github.com/rstudio/connect-client/internal/api_client/auth" + "github.com/rstudio/publishing-client/internal/api_client/auth" ) type AuthenticatedTransport struct { diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go index b447c2ef6..4191e4449 100644 --- a/internal/api_client/clients/client_connect.go +++ b/internal/api_client/clients/client_connect.go @@ -11,13 +11,13 @@ import ( "regexp" "time" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/events" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/events" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" ) type ConnectClient struct { diff --git a/internal/api_client/clients/clienttest/client.go b/internal/api_client/clients/clienttest/client.go index 2abb8e469..c2d68292c 100644 --- a/internal/api_client/clients/clienttest/client.go +++ b/internal/api_client/clients/clienttest/client.go @@ -5,10 +5,10 @@ package clienttest import ( "io" - "github.com/rstudio/connect-client/internal/api_client/clients" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/api_client/clients" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/types" "github.com/stretchr/testify/mock" ) diff --git a/internal/api_client/clients/http_client.go b/internal/api_client/clients/http_client.go index 1c7f562ec..c79ed06b7 100644 --- a/internal/api_client/clients/http_client.go +++ b/internal/api_client/clients/http_client.go @@ -17,12 +17,12 @@ import ( "os" "time" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/api_client/auth" - "github.com/rstudio/connect-client/internal/events" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/api_client/auth" + "github.com/rstudio/publishing-client/internal/events" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" "golang.org/x/net/publicsuffix" ) diff --git a/internal/apptypes/apptypes_test.go b/internal/apptypes/apptypes_test.go index 504305868..fb5f0f4d8 100644 --- a/internal/apptypes/apptypes_test.go +++ b/internal/apptypes/apptypes_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/bundles/bundle.go b/internal/bundles/bundle.go index d10e7e38f..fdeabbfc2 100644 --- a/internal/bundles/bundle.go +++ b/internal/bundles/bundle.go @@ -11,9 +11,9 @@ import ( "io" "io/fs" - "github.com/rstudio/connect-client/internal/bundles/gitignore" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/bundles/gitignore" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" ) type Bundler interface { diff --git a/internal/bundles/bundle_test.go b/internal/bundles/bundle_test.go index f758239ce..633ee7636 100644 --- a/internal/bundles/bundle_test.go +++ b/internal/bundles/bundle_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/bundles/bundlestest" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/bundles/bundlestest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/bundles/bundlestest/walkertest.go b/internal/bundles/bundlestest/walkertest.go index 2bce0091d..d0eeb0061 100644 --- a/internal/bundles/bundlestest/walkertest.go +++ b/internal/bundles/bundlestest/walkertest.go @@ -3,7 +3,7 @@ package bundlestest // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" "github.com/stretchr/testify/mock" ) diff --git a/internal/bundles/gitignore/gitignore.go b/internal/bundles/gitignore/gitignore.go index f76b3c7f4..ac204cda5 100644 --- a/internal/bundles/gitignore/gitignore.go +++ b/internal/bundles/gitignore/gitignore.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/gobwas/glob" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" "github.com/spf13/afero" ) diff --git a/internal/bundles/gitignore/gitignore_test.go b/internal/bundles/gitignore/gitignore_test.go index d0b247d15..622c11646 100644 --- a/internal/bundles/gitignore/gitignore_test.go +++ b/internal/bundles/gitignore/gitignore_test.go @@ -5,8 +5,8 @@ package gitignore import ( "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/bundles/gitignore/interface.go b/internal/bundles/gitignore/interface.go index 0ab74568d..97bde1f95 100644 --- a/internal/bundles/gitignore/interface.go +++ b/internal/bundles/gitignore/interface.go @@ -4,7 +4,7 @@ package gitignore import ( "github.com/iriri/minimal/gitignore" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" "github.com/stretchr/testify/mock" ) diff --git a/internal/bundles/gitignore/walker.go b/internal/bundles/gitignore/walker.go index 0638a84ec..a64c20d40 100644 --- a/internal/bundles/gitignore/walker.go +++ b/internal/bundles/gitignore/walker.go @@ -8,7 +8,7 @@ import ( "io/fs" "path/filepath" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) var standardIgnores = []string{ diff --git a/internal/bundles/gitignore/walker_test.go b/internal/bundles/gitignore/walker_test.go index 849f962cf..f464c5e72 100644 --- a/internal/bundles/gitignore/walker_test.go +++ b/internal/bundles/gitignore/walker_test.go @@ -7,8 +7,8 @@ import ( "io/fs" "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/bundles/manifest.go b/internal/bundles/manifest.go index 854b4fd3f..a65f45494 100644 --- a/internal/bundles/manifest.go +++ b/internal/bundles/manifest.go @@ -11,8 +11,8 @@ import ( "reflect" "sort" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" ) // ManifestFilename is the well-known manifest.json filename contained within diff --git a/internal/bundles/manifest_test.go b/internal/bundles/manifest_test.go index 146e212c6..500bdc63b 100644 --- a/internal/bundles/manifest_test.go +++ b/internal/bundles/manifest_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/cli_types/base.go b/internal/cli_types/base.go index b06d813e6..d73aef828 100644 --- a/internal/cli_types/base.go +++ b/internal/cli_types/base.go @@ -3,11 +3,11 @@ package cli_types // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util" "github.com/spf13/afero" ) diff --git a/internal/cli_types/base_test.go b/internal/cli_types/base_test.go index 6ca57f61e..aacac9d0d 100644 --- a/internal/cli_types/base_test.go +++ b/internal/cli_types/base_test.go @@ -5,10 +5,10 @@ package cli_types import ( "testing" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/connect_client.go b/internal/connect_client.go index f5adf4ade..a4e1900f6 100644 --- a/internal/connect_client.go +++ b/internal/connect_client.go @@ -1,3 +1,3 @@ -package connect_client +package publishing_client // Copyright (C) 2023 by Posit Software, PBC. diff --git a/internal/environment/python.go b/internal/environment/python.go index 97964f7f2..99543e854 100644 --- a/internal/environment/python.go +++ b/internal/environment/python.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" ) // Copyright (C) 2023 by Posit Software, PBC. diff --git a/internal/environment/python_test.go b/internal/environment/python_test.go index 6d0c5660c..b1728b767 100644 --- a/internal/environment/python_test.go +++ b/internal/environment/python_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/events/error_codes.go b/internal/events/error_codes.go index 4c698915d..776866116 100644 --- a/internal/events/error_codes.go +++ b/internal/events/error_codes.go @@ -2,7 +2,7 @@ package events // Copyright (C) 2023 by Posit Software, PBC. -import "github.com/rstudio/connect-client/internal/types" +import "github.com/rstudio/publishing-client/internal/types" type ErrorCode = types.ErrorCode diff --git a/internal/events/errors.go b/internal/events/errors.go index f7a70e026..03a57967a 100644 --- a/internal/events/errors.go +++ b/internal/events/errors.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/types" ) func NewAgentEvent(e types.EventableError) AgentEvent { diff --git a/internal/events/errors_test.go b/internal/events/errors_test.go index 82ac9077e..93f936b7c 100644 --- a/internal/events/errors_test.go +++ b/internal/events/errors_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/events/events.go b/internal/events/events.go index 7ea0540f9..4a089908b 100644 --- a/internal/events/events.go +++ b/internal/events/events.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" ) type EventType = string diff --git a/internal/events/events_test.go b/internal/events/events_test.go index a3fae114b..9932fdeb5 100644 --- a/internal/events/events_test.go +++ b/internal/events/events_test.go @@ -5,9 +5,9 @@ package events import ( "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/events/sse_handler.go b/internal/events/sse_handler.go index 560e54f10..2d93580dc 100644 --- a/internal/events/sse_handler.go +++ b/internal/events/sse_handler.go @@ -10,8 +10,8 @@ import ( "slices" "github.com/r3labs/sse/v2" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" ) type SSEServer interface { diff --git a/internal/events/sse_handler_test.go b/internal/events/sse_handler_test.go index c4280131c..ae9a6d7f1 100644 --- a/internal/events/sse_handler_test.go +++ b/internal/events/sse_handler_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/r3labs/sse/v2" - "github.com/rstudio/connect-client/internal/events/eventstest" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/events/eventstest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/events/sse_logger.go b/internal/events/sse_logger.go index d33e0c792..4b419ef1c 100644 --- a/internal/events/sse_logger.go +++ b/internal/events/sse_logger.go @@ -7,7 +7,7 @@ import ( "os" "github.com/r3labs/sse/v2" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) func logLevel(debug bool) slog.Level { diff --git a/internal/events/sse_logger_test.go b/internal/events/sse_logger_test.go index 204ffb265..264b1f3d7 100644 --- a/internal/events/sse_logger_test.go +++ b/internal/events/sse_logger_test.go @@ -7,8 +7,8 @@ import ( "log/slog" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/inspect/all.go b/internal/inspect/all.go index ef642491e..a9555eaab 100644 --- a/internal/inspect/all.go +++ b/internal/inspect/all.go @@ -5,7 +5,7 @@ package inspect import ( "errors" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) type ContentTypeDetector struct { diff --git a/internal/inspect/all_test.go b/internal/inspect/all_test.go index 6e2f7ca75..5d7f0d1eb 100644 --- a/internal/inspect/all_test.go +++ b/internal/inspect/all_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/inspect/entrypoint.go b/internal/inspect/entrypoint.go index 68f1e9e07..b1afa7ecf 100644 --- a/internal/inspect/entrypoint.go +++ b/internal/inspect/entrypoint.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) type defaultInferenceHelper struct{} diff --git a/internal/inspect/entrypoint_test.go b/internal/inspect/entrypoint_test.go index 088ceaea6..846d4efad 100644 --- a/internal/inspect/entrypoint_test.go +++ b/internal/inspect/entrypoint_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/inspect/html.go b/internal/inspect/html.go index 7f36e0ad3..fc79860a3 100644 --- a/internal/inspect/html.go +++ b/internal/inspect/html.go @@ -3,8 +3,8 @@ package inspect // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" ) type StaticHTMLDetector struct { diff --git a/internal/inspect/html_test.go b/internal/inspect/html_test.go index ce57b1e1c..e736215d8 100644 --- a/internal/inspect/html_test.go +++ b/internal/inspect/html_test.go @@ -6,9 +6,9 @@ import ( "errors" "testing" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/inspect/infer.go b/internal/inspect/infer.go index ffbc30b98..4666d4e97 100644 --- a/internal/inspect/infer.go +++ b/internal/inspect/infer.go @@ -5,8 +5,8 @@ package inspect import ( "io" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" ) type ContentType struct { diff --git a/internal/inspect/infer_test.go b/internal/inspect/infer_test.go index b884013e7..962a88068 100644 --- a/internal/inspect/infer_test.go +++ b/internal/inspect/infer_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/inspect/notebook.go b/internal/inspect/notebook.go index 524c7608f..0a5b1a806 100644 --- a/internal/inspect/notebook.go +++ b/internal/inspect/notebook.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" ) type NotebookDetector struct { diff --git a/internal/inspect/notebook_test.go b/internal/inspect/notebook_test.go index 7f2cb5deb..970518e4c 100644 --- a/internal/inspect/notebook_test.go +++ b/internal/inspect/notebook_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/inspect/python.go b/internal/inspect/python.go index 586253ddb..1ff30dfd0 100644 --- a/internal/inspect/python.go +++ b/internal/inspect/python.go @@ -3,8 +3,8 @@ package inspect // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" ) type PythonAppDetector struct { diff --git a/internal/inspect/python_test.go b/internal/inspect/python_test.go index bff3443d6..ca76bc448 100644 --- a/internal/inspect/python_test.go +++ b/internal/inspect/python_test.go @@ -6,9 +6,9 @@ import ( "errors" "testing" - "github.com/rstudio/connect-client/internal/apptypes" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/apptypes" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/logging/logger.go b/internal/logging/logger.go index ceee531ea..f493afc6c 100644 --- a/internal/logging/logger.go +++ b/internal/logging/logger.go @@ -5,7 +5,7 @@ package logging import ( "log/slog" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/types" ) // Phase indicates which part of an Operation we are performing diff --git a/internal/logging/logger_test.go b/internal/logging/logger_test.go index 3d3ebb9e2..9c2e69153 100644 --- a/internal/logging/logger_test.go +++ b/internal/logging/logger_test.go @@ -7,9 +7,9 @@ import ( "log/slog" "testing" - "github.com/rstudio/connect-client/internal/logging/loggingtest" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging/loggingtest" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/logging/multi_handler_test.go b/internal/logging/multi_handler_test.go index d28c8f8e3..589547c26 100644 --- a/internal/logging/multi_handler_test.go +++ b/internal/logging/multi_handler_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/logging/loggingtest" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging/loggingtest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/project/project.go b/internal/project/project.go index 75072753a..19280eaa9 100644 --- a/internal/project/project.go +++ b/internal/project/project.go @@ -8,9 +8,9 @@ var Mode string func UserAgent() string { if Version != "" { - return "connect-client/" + Version + return "publishing-client/" + Version } - return "connect-client" + return "publishing-client" } func DevelopmentBuild() bool { diff --git a/internal/publish/publish.go b/internal/publish/publish.go index af29fcf0d..73b376b6d 100644 --- a/internal/publish/publish.go +++ b/internal/publish/publish.go @@ -10,15 +10,15 @@ import ( "os" "time" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/api_client/clients" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/events" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/api_client/clients" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/events" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" ) func CreateBundleFromDirectory(cmd *cli_types.PublishArgs, dest util.Path, log logging.Logger) error { diff --git a/internal/publish/publish_test.go b/internal/publish/publish_test.go index 0bfed1024..9a4bb79ff 100644 --- a/internal/publish/publish_test.go +++ b/internal/publish/publish_test.go @@ -5,15 +5,15 @@ import ( "errors" "testing" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/api_client/clients/clienttest" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/api_client/clients/clienttest" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/services/api/api.go b/internal/services/api/api.go index e2ca61b80..8d1d14808 100644 --- a/internal/services/api/api.go +++ b/internal/services/api/api.go @@ -5,7 +5,7 @@ package api import ( "net/http" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) func InternalError(w http.ResponseWriter, req *http.Request, log logging.Logger, err error) { diff --git a/internal/services/api/deployments/services.go b/internal/services/api/deployments/services.go index fdddeac62..143f9779b 100644 --- a/internal/services/api/deployments/services.go +++ b/internal/services/api/deployments/services.go @@ -3,8 +3,8 @@ package deployments // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/state" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/state" ) type DeploymentsService interface { diff --git a/internal/services/api/deployments/services_test.go b/internal/services/api/deployments/services_test.go index 974df0897..5b61c62f3 100644 --- a/internal/services/api/deployments/services_test.go +++ b/internal/services/api/deployments/services_test.go @@ -5,9 +5,9 @@ package deployments import ( "testing" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/files/file_types_test.go b/internal/services/api/files/file_types_test.go index b8ece9ee3..e10999f1a 100644 --- a/internal/services/api/files/file_types_test.go +++ b/internal/services/api/files/file_types_test.go @@ -6,7 +6,7 @@ import ( "io/fs" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/files/files.go b/internal/services/api/files/files.go index eee18ad19..0ebf43504 100644 --- a/internal/services/api/files/files.go +++ b/internal/services/api/files/files.go @@ -5,8 +5,8 @@ package files import ( "time" - "github.com/rstudio/connect-client/internal/bundles/gitignore" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/bundles/gitignore" + "github.com/rstudio/publishing-client/internal/util" ) type File struct { diff --git a/internal/services/api/files/files_test.go b/internal/services/api/files/files_test.go index 55dbeecbe..28fbdead8 100644 --- a/internal/services/api/files/files_test.go +++ b/internal/services/api/files/files_test.go @@ -5,9 +5,9 @@ package files import ( "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/files/services.go b/internal/services/api/files/services.go index 71a698900..af60f0a7f 100644 --- a/internal/services/api/files/services.go +++ b/internal/services/api/files/services.go @@ -5,9 +5,9 @@ package files import ( "io/fs" - "github.com/rstudio/connect-client/internal/bundles/gitignore" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/bundles/gitignore" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" "github.com/spf13/afero" ) diff --git a/internal/services/api/files/services_test.go b/internal/services/api/files/services_test.go index 4d6790ab9..7577dc76f 100644 --- a/internal/services/api/files/services_test.go +++ b/internal/services/api/files/services_test.go @@ -5,9 +5,9 @@ package files import ( "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/get_accounts.go b/internal/services/api/get_accounts.go index 0afd8ac38..6d2402108 100644 --- a/internal/services/api/get_accounts.go +++ b/internal/services/api/get_accounts.go @@ -6,8 +6,8 @@ import ( "encoding/json" "net/http" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/logging" ) // accountGetDTO is the format of returned account data. diff --git a/internal/services/api/get_deployment.go b/internal/services/api/get_deployment.go index f1c6f3858..767afcac3 100644 --- a/internal/services/api/get_deployment.go +++ b/internal/services/api/get_deployment.go @@ -6,7 +6,7 @@ import ( "encoding/json" "net/http" - "github.com/rstudio/connect-client/internal/services/api/deployments" + "github.com/rstudio/publishing-client/internal/services/api/deployments" ) func GetDeploymentHandlerFunc(deploymentsService deployments.DeploymentsService) http.HandlerFunc { diff --git a/internal/services/api/get_deployment_test.go b/internal/services/api/get_deployment_test.go index 7c25f040a..4640ae97f 100644 --- a/internal/services/api/get_deployment_test.go +++ b/internal/services/api/get_deployment_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/get_file.go b/internal/services/api/get_file.go index 2a27d814a..4d59d6576 100644 --- a/internal/services/api/get_file.go +++ b/internal/services/api/get_file.go @@ -6,10 +6,10 @@ import ( "encoding/json" "net/http" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services/api/files" - "github.com/rstudio/connect-client/internal/services/api/paths" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services/api/files" + "github.com/rstudio/publishing-client/internal/services/api/paths" + "github.com/rstudio/publishing-client/internal/util" ) func GetFileHandlerFunc(base util.Path, filesService files.FilesService, pathsService paths.PathsService, log logging.Logger) http.HandlerFunc { diff --git a/internal/services/api/get_file_test.go b/internal/services/api/get_file_test.go index 995ac12f9..b22778e34 100644 --- a/internal/services/api/get_file_test.go +++ b/internal/services/api/get_file_test.go @@ -9,10 +9,10 @@ import ( "net/http/httptest" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services/api/files" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services/api/files" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/services/api/http_service.go b/internal/services/api/http_service.go index 04aba51ea..ae1a8494d 100644 --- a/internal/services/api/http_service.go +++ b/internal/services/api/http_service.go @@ -10,11 +10,11 @@ import ( "net/url" "strings" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/project" - "github.com/rstudio/connect-client/internal/services" - "github.com/rstudio/connect-client/internal/services/middleware" - "github.com/rstudio/connect-client/internal/state" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/project" + "github.com/rstudio/publishing-client/internal/services" + "github.com/rstudio/publishing-client/internal/services/middleware" + "github.com/rstudio/publishing-client/internal/state" "github.com/pkg/browser" ) diff --git a/internal/services/api/paths/services.go b/internal/services/api/paths/services.go index 084d58511..face4657e 100644 --- a/internal/services/api/paths/services.go +++ b/internal/services/api/paths/services.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" "github.com/spf13/afero" ) diff --git a/internal/services/api/paths/services_test.go b/internal/services/api/paths/services_test.go index 1b20b663c..d4f0edc98 100644 --- a/internal/services/api/paths/services_test.go +++ b/internal/services/api/paths/services_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/publish.go b/internal/services/api/publish.go index 126cbce3a..6c933be1b 100644 --- a/internal/services/api/publish.go +++ b/internal/services/api/publish.go @@ -5,10 +5,10 @@ package api import ( "net/http" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/publish" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/publish" ) func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc { diff --git a/internal/services/api/put_deployment_files.go b/internal/services/api/put_deployment_files.go index 70f021191..5ed7c5e96 100644 --- a/internal/services/api/put_deployment_files.go +++ b/internal/services/api/put_deployment_files.go @@ -6,8 +6,8 @@ import ( "encoding/json" "net/http" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services/api/deployments" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services/api/deployments" ) type PutDeploymentFilesRequestBody struct { diff --git a/internal/services/api/put_deployment_files_test.go b/internal/services/api/put_deployment_files_test.go index e653d66da..95280d6b0 100644 --- a/internal/services/api/put_deployment_files_test.go +++ b/internal/services/api/put_deployment_files_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/api/test.go b/internal/services/api/test.go index f4d8a9cf9..b7adfd775 100644 --- a/internal/services/api/test.go +++ b/internal/services/api/test.go @@ -3,11 +3,11 @@ package api // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/services/api/deployments" - "github.com/rstudio/connect-client/internal/services/api/files" - "github.com/rstudio/connect-client/internal/services/api/paths" - "github.com/rstudio/connect-client/internal/state" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/services/api/deployments" + "github.com/rstudio/publishing-client/internal/services/api/files" + "github.com/rstudio/publishing-client/internal/services/api/paths" + "github.com/rstudio/publishing-client/internal/state" + "github.com/rstudio/publishing-client/internal/util" "github.com/stretchr/testify/mock" ) diff --git a/internal/services/local_token.go b/internal/services/local_token.go index 3e00f1185..cecd7243d 100644 --- a/internal/services/local_token.go +++ b/internal/services/local_token.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "strings" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) type LocalToken string diff --git a/internal/services/middleware/auth_required.go b/internal/services/middleware/auth_required.go index d2955d851..c05e7072c 100644 --- a/internal/services/middleware/auth_required.go +++ b/internal/services/middleware/auth_required.go @@ -6,7 +6,7 @@ import ( "context" "net/http" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) // AuthRequired verifies that the session has been diff --git a/internal/services/middleware/cookie_auth.go b/internal/services/middleware/cookie_auth.go index 3e2c2062e..37ca8786b 100644 --- a/internal/services/middleware/cookie_auth.go +++ b/internal/services/middleware/cookie_auth.go @@ -7,8 +7,8 @@ import ( "github.com/chmike/securecookie" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" ) const sessionCookieName string = "posit-publish-session" diff --git a/internal/services/middleware/insert_prefix_test.go b/internal/services/middleware/insert_prefix_test.go index 9477b282a..e8ae9560a 100644 --- a/internal/services/middleware/insert_prefix_test.go +++ b/internal/services/middleware/insert_prefix_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/services/middleware/local_token_auth.go b/internal/services/middleware/local_token_auth.go index f0f96037c..0032fbbe8 100644 --- a/internal/services/middleware/local_token_auth.go +++ b/internal/services/middleware/local_token_auth.go @@ -5,8 +5,8 @@ package middleware import ( "net/http" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services" ) // LocalToken looks for a `token` query parameter. If diff --git a/internal/services/middleware/log_request.go b/internal/services/middleware/log_request.go index b90a20b91..7a423ae35 100644 --- a/internal/services/middleware/log_request.go +++ b/internal/services/middleware/log_request.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) type statusCapturingResponseWriter struct { diff --git a/internal/services/middleware/panic_recovery.go b/internal/services/middleware/panic_recovery.go index 92d2f3dd5..5c6457478 100644 --- a/internal/services/middleware/panic_recovery.go +++ b/internal/services/middleware/panic_recovery.go @@ -6,7 +6,7 @@ import ( "net/http" "runtime" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) func PanicRecovery(log logging.Logger, next http.HandlerFunc) http.HandlerFunc { diff --git a/internal/services/proxy/http_proxy.go b/internal/services/proxy/http_proxy.go index 76d7aee56..4ab6ddc2e 100644 --- a/internal/services/proxy/http_proxy.go +++ b/internal/services/proxy/http_proxy.go @@ -12,7 +12,7 @@ import ( "log/slog" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) type proxy struct { diff --git a/internal/services/ui/ui_service.go b/internal/services/ui/ui_service.go index 1784e35d5..62df0a2b0 100644 --- a/internal/services/ui/ui_service.go +++ b/internal/services/ui/ui_service.go @@ -6,16 +6,16 @@ import ( "net/http" "net/url" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/cli_types" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/services" - "github.com/rstudio/connect-client/internal/services/api" - "github.com/rstudio/connect-client/internal/services/api/deployments" - "github.com/rstudio/connect-client/internal/services/api/files" - "github.com/rstudio/connect-client/internal/services/api/paths" - "github.com/rstudio/connect-client/internal/services/middleware" - "github.com/rstudio/connect-client/web" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/cli_types" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/services" + "github.com/rstudio/publishing-client/internal/services/api" + "github.com/rstudio/publishing-client/internal/services/api/deployments" + "github.com/rstudio/publishing-client/internal/services/api/files" + "github.com/rstudio/publishing-client/internal/services/api/paths" + "github.com/rstudio/publishing-client/internal/services/middleware" + "github.com/rstudio/publishing-client/web" "github.com/gorilla/mux" "github.com/spf13/afero" diff --git a/internal/state/connect.go b/internal/state/connect.go index c60a840b8..81324976d 100644 --- a/internal/state/connect.go +++ b/internal/state/connect.go @@ -5,7 +5,7 @@ package state import ( "os" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/types" ) type ConnectDeployment struct { diff --git a/internal/state/connect_test.go b/internal/state/connect_test.go index 33e0f4a4a..1a258d852 100644 --- a/internal/state/connect_test.go +++ b/internal/state/connect_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/state/deployment.go b/internal/state/deployment.go index 3eea9c204..be5018d87 100644 --- a/internal/state/deployment.go +++ b/internal/state/deployment.go @@ -3,11 +3,11 @@ package state // Copyright (C) 2023 by Posit Software, PBC. import ( - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" ) type TargetID struct { diff --git a/internal/state/deployment_test.go b/internal/state/deployment_test.go index 839e3e349..24a60a819 100644 --- a/internal/state/deployment_test.go +++ b/internal/state/deployment_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/accounts" - "github.com/rstudio/connect-client/internal/bundles" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/accounts" + "github.com/rstudio/publishing-client/internal/bundles" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/state/environment.go b/internal/state/environment.go index fe618bca3..ac08ccce8 100644 --- a/internal/state/environment.go +++ b/internal/state/environment.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/rstudio/connect-client/internal/types" + "github.com/rstudio/publishing-client/internal/types" ) type ConnectEnvironmentVariable struct { diff --git a/internal/state/environment_test.go b/internal/state/environment_test.go index 9a4e570c0..f18b2c9c6 100644 --- a/internal/state/environment_test.go +++ b/internal/state/environment_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/types" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/types" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/state/json_serializer.go b/internal/state/json_serializer.go index c8f2224d6..17f6b6469 100644 --- a/internal/state/json_serializer.go +++ b/internal/state/json_serializer.go @@ -6,8 +6,8 @@ import ( "encoding/json" "fmt" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" ) type jsonSerializer struct { diff --git a/internal/state/json_serializer_test.go b/internal/state/json_serializer_test.go index 3855d5655..6698ff674 100644 --- a/internal/state/json_serializer_test.go +++ b/internal/state/json_serializer_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/types/error_test.go b/internal/types/error_test.go index a13238916..7a729e73a 100644 --- a/internal/types/error_test.go +++ b/internal/types/error_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/types/optional_test.go b/internal/types/optional_test.go index 3bd3e9778..e0203f8b5 100644 --- a/internal/types/optional_test.go +++ b/internal/types/optional_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/dcf/dcf.go b/internal/util/dcf/dcf.go index 5772ea969..4e17d53b6 100644 --- a/internal/util/dcf/dcf.go +++ b/internal/util/dcf/dcf.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" ) type Record map[string]string diff --git a/internal/util/dcf/dcf_test.go b/internal/util/dcf/dcf_test.go index 35e57a4f7..aa4f84cec 100644 --- a/internal/util/dcf/dcf_test.go +++ b/internal/util/dcf/dcf_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/util" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/internal/util/dcf/dcftest.go b/internal/util/dcf/dcftest.go index e54a82058..e83058314 100644 --- a/internal/util/dcf/dcftest.go +++ b/internal/util/dcf/dcftest.go @@ -5,7 +5,7 @@ package dcf import ( "io" - "github.com/rstudio/connect-client/internal/util" + "github.com/rstudio/publishing-client/internal/util" "github.com/stretchr/testify/mock" ) diff --git a/internal/util/files_test.go b/internal/util/files_test.go index 75c7938e7..43c969dda 100644 --- a/internal/util/files_test.go +++ b/internal/util/files_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/http_test.go b/internal/util/http_test.go index b5968a55d..c701a81a2 100644 --- a/internal/util/http_test.go +++ b/internal/util/http_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/random_test.go b/internal/util/random_test.go index 330fc33d1..b73147628 100644 --- a/internal/util/random_test.go +++ b/internal/util/random_test.go @@ -5,7 +5,7 @@ package util import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/slice_test.go b/internal/util/slice_test.go index 60882c5dd..13fba99a4 100644 --- a/internal/util/slice_test.go +++ b/internal/util/slice_test.go @@ -5,7 +5,7 @@ package util import ( "testing" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/symlink_walker.go b/internal/util/symlink_walker.go index 508c9dd88..cbd318308 100644 --- a/internal/util/symlink_walker.go +++ b/internal/util/symlink_walker.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/rstudio/connect-client/internal/logging" + "github.com/rstudio/publishing-client/internal/logging" ) type symlinkWalker struct { diff --git a/internal/util/symlink_walker_test.go b/internal/util/symlink_walker_test.go index 3442ff821..7ed323dd7 100644 --- a/internal/util/symlink_walker_test.go +++ b/internal/util/symlink_walker_test.go @@ -11,8 +11,8 @@ import ( "sort" "testing" - "github.com/rstudio/connect-client/internal/logging" - "github.com/rstudio/connect-client/internal/util/utiltest" + "github.com/rstudio/publishing-client/internal/logging" + "github.com/rstudio/publishing-client/internal/util/utiltest" "github.com/spf13/afero" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/justfile b/justfile index 2f5f60104..24adb1b10 100644 --- a/justfile +++ b/justfile @@ -5,7 +5,7 @@ _interactive := `tty -s && echo "-it" || echo ""` _ci := "${CI:-false}" -_tag := "rstudio/connect-client:latest" +_tag := "rstudio/publishing-client:latest" _with_runner := if env_var_or_default("DOCKER", "true") == "true" { "just _with_docker" @@ -31,7 +31,7 @@ clean: clean-agent # Clean the agent's build artifacts clean-agent: - rm -rf ./bin/**/connect-client + rm -rf ./bin/**/publishing-client # create the security certificates certs: @@ -52,12 +52,12 @@ build-agent: echo "" if [ "${BUILD_MODE:-}" == "development" ]; then - echo "Generating a development build of connect-client." + echo "Generating a development build of publishing-client." else - echo "Generating production builds of connect-client." + echo "Generating production builds of publishing-client." fi - if {{ _with_runner }} ./scripts/build.bash ./cmd/connect-client; then + if {{ _with_runner }} ./scripts/build.bash ./cmd/publishing-client; then echo "Build was successful" else echo "" @@ -148,7 +148,7 @@ run-agent *args: #!/usr/bin/env bash set -euo pipefail - {{ _with_runner }} go run ./cmd/connect-client {{ args }} + {{ _with_runner }} go run ./cmd/publishing-client {{ args }} # Build the image. Typically does not need to be done very often. image: @@ -164,7 +164,7 @@ image: fi # Start the agent and show the UI -# NOTE: this must be called from within a docker container if so +# NOTE: this must be called from within a docker container if so # needed (it will not automatically use a running if defined) # This is because this recipe is called from the web/justfile, which # is already executing within a docker container (if configured to use) @@ -182,7 +182,7 @@ start-agent-for-e2e: echo "Working directory is $(pwd)" - ./bin/$GOOS-$GOARCH/connect-client publish-ui \ + ./bin/$GOOS-$GOARCH/publishing-client publish-ui \ ./test/sample-content/fastapi-simple \ --listen=127.0.0.1:9000 \ --token=abc123 diff --git a/scripts/build.bash b/scripts/build.bash index 1550865e6..8072b5063 100755 --- a/scripts/build.bash +++ b/scripts/build.bash @@ -57,7 +57,7 @@ do fi env GOOS="$GOOS" GOARCH="$GOARCH" go build -o "$output_name" -ldflags \ - "-X 'github.com/rstudio/connect-client/internal/project.Version=$version' -X 'github.com/rstudio/connect-client/internal/project.Mode=$developmentMode'" \ + "-X 'github.com/rstudio/publishing-client/internal/project.Version=$version' -X 'github.com/rstudio/publishing-client/internal/project.Mode=$developmentMode'" \ "$package" if [ $? -ne 0 ]; then echo 'An error has occurred! Aborting the script execution...' @@ -66,4 +66,4 @@ do echo "Making $output_name executable" chmod +x "$output_name" fi -done \ No newline at end of file +done diff --git a/test/README.md b/test/README.md index e79062d35..4b1d205ca 100644 --- a/test/README.md +++ b/test/README.md @@ -1,12 +1,12 @@ -# connect-client tests +# publishing-client tests -These tests will use the `connect-client` binary in the following environments: +These tests will use the `publishing-client` binary in the following environments: * windows-amd64 (Github Actions only) * macos-amd64 (Github Actions only) * linux-amd64 (Local Docker & Github Actions) * linux-arm64 (Local Docker & Github Actions) -You can also run the tests against your local environment. +You can also run the tests against your local environment. First, build the docker containers needed: ``` @@ -19,7 +19,7 @@ just build linux-amd64 Run against linux-amd64 and linux-arm64: ``` -just run-client linux-amd64 +just run-client linux-amd64 just run-client linux-arm64 ``` @@ -33,5 +33,3 @@ just run-client-local darwin-amd64 Running locally installs BATS locally in the `test/libs` directory (.gitignore'd). Github Actions will use the virtual environment runners to test against `windows-amd64` and `darwin-amd64`. - - diff --git a/test/bats/server-tests/server-tests.bats b/test/bats/server-tests/server-tests.bats index 3b9c28508..31217d8db 100644 --- a/test/bats/server-tests/server-tests.bats +++ b/test/bats/server-tests/server-tests.bats @@ -6,5 +6,5 @@ load ${BATS_ASSERT_LIB} @test "${BINARY_PATH} list servers" { run ${BINARY_PATH} list-accounts assert_success - assert_output --partial "No accounts are saved. To add an account, see \`connect-client add-server --help\`." -} \ No newline at end of file + assert_output --partial "No accounts are saved. To add an account, see \`publishing-client add-server --help\`." +} diff --git a/test/justfile b/test/justfile index cd25f902d..d8bc07b9f 100644 --- a/test/justfile +++ b/test/justfile @@ -2,7 +2,7 @@ set shell := ["bash", "-uc"] export TARGET_SERVER := env_var_or_default("TARGET_SERVER", "http://localhost:3939") # export API_KEY := env_var_or_default("PERFTEST_API_KEY", `echo -n admin | md5sum | cut -f1 -d" "`) -_tag := "rstudio/connect-client" +_tag := "rstudio/publishing-client" build target: #!/usr/bin/env bash @@ -36,7 +36,7 @@ run-client target: --platform "${_platform}" \ -e BATS_SUPPORT_LIB="/libs/bats-support/load" \ -e BATS_ASSERT_LIB="/libs/bats-assert/load" \ - -e BINARY_PATH=/publishing-client/bin/{{target}}/connect-client \ + -e BINARY_PATH=/publishing-client/bin/{{target}}/publishing-client \ -v "$(pwd)"/../:/publishing-client \ -w /publishing-client/ \ --rm {{_tag}}-{{target}} just test/_test-client {{target}} @@ -69,12 +69,12 @@ local-ui-client target: docker run \ -v "$(pwd)"/../:/publishing-client \ -w /publishing-client/ \ - --rm {{_tag}}-{{target}} ../bin/{{target}}/connect-client publish-ui ./test/content/simple-notebook/ --listen=localhost:9999 + --rm {{_tag}}-{{target}} ../bin/{{target}}/publishing-client publish-ui ./test/content/simple-notebook/ --listen=localhost:9999 elif [[ {{target}} =~ "windows" ]]; then set shell := ["powershell.exe", "-c"] \ - ..\bin\artifact\windows-amd64\connect-client.exe publish-ui test/content/simple-notebook/ --listen=localhost:9999 + ..\bin\artifact\windows-amd64\publishing-client.exe publish-ui test/content/simple-notebook/ --listen=localhost:9999 elif [[ {{target}} =~ "macos" || {{target}} =~ "darwin" ]]; then - ../bin/darwin-amd64/connect-client publish-ui \ + ../bin/darwin-amd64/publishing-client publish-ui \ sample-content/fastapi-simple --listen=127.0.0.1:9999 fi docker run \ @@ -114,7 +114,7 @@ run-client-local target: just bats-install && \ BATS_SUPPORT_LIB={{invocation_directory()}}/libs/bats-support/load \ BATS_ASSERT_LIB={{invocation_directory()}}/libs/bats-assert/load \ - BINARY_PATH=../bin/{{target}}/connect-client \ + BINARY_PATH=../bin/{{target}}/publishing-client \ ./libs/bats-core/bin/bats --tap -T -r ./bats/ bats-install: diff --git a/web/README.md b/web/README.md index 4885ce2a0..a0f10f712 100644 --- a/web/README.md +++ b/web/README.md @@ -35,5 +35,5 @@ This application is built using: All tasks are done through the justfile recipes, present within the top level `justfile` file. Recipes present include macro-operations for the multiple projects (Go and Web SPA) included in this repo. -Specialized recipes for the Go project are located within the `cmd/connect-client/justfile` and +Specialized recipes for the Go project are located within the `cmd/publishing-client/justfile` and specialized recipes for the Web project are located within the `web/justfile`. From 3c830a6773dbb697b13beb86d078072a22f57bf8 Mon Sep 17 00:00:00 2001 From: tdstein Date: Wed, 13 Sep 2023 11:38:55 -0400 Subject: [PATCH 2/4] Modifies caching strategy --- .github/workflows/main.yaml | 28 ++++++++++++++-------------- .github/workflows/pull-request.yaml | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 849ad7736..ff02d5c8b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -44,7 +44,7 @@ jobs: id: cache-docker-image-restore uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -65,7 +65,7 @@ jobs: id: cache-docker-image-save uses: actions/cache/save@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -89,7 +89,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -151,7 +151,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -199,7 +199,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -250,7 +250,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -288,7 +288,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -336,7 +336,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -488,7 +488,7 @@ jobs: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} os: linux-amd64 - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -510,7 +510,7 @@ jobs: id: cache-linux-amd64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -545,7 +545,7 @@ jobs: id: cache-linux-amd64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -599,7 +599,7 @@ jobs: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} os: linux-arm64 - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -621,7 +621,7 @@ jobs: id: cache-linux-arm64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -666,7 +666,7 @@ jobs: id: cache-linux-arm64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 3d1f4e534..c2a3da1fb 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -41,7 +41,7 @@ jobs: id: cache-docker-image-restore uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -62,7 +62,7 @@ jobs: id: cache-docker-image-save uses: actions/cache/save@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -86,7 +86,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -148,7 +148,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -196,7 +196,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -247,7 +247,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -285,7 +285,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -333,7 +333,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cache-${{ github.ref }} with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -485,7 +485,7 @@ jobs: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} os: linux-amd64 - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -507,7 +507,7 @@ jobs: id: cache-linux-amd64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -542,7 +542,7 @@ jobs: id: cache-linux-amd64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -596,7 +596,7 @@ jobs: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} os: linux-arm64 - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -618,7 +618,7 @@ jobs: id: cache-linux-arm64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -663,7 +663,7 @@ jobs: id: cache-linux-arm64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cache-${{ github.ref }} with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} From b29f8d023ab60d1bde1a98b10f437397637858fe Mon Sep 17 00:00:00 2001 From: tdstein Date: Wed, 13 Sep 2023 12:05:37 -0400 Subject: [PATCH 3/4] Testing GitHub Actions --- .github/workflows/main.yaml | 28 ++++++++++++++-------------- .github/workflows/pull-request.yaml | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ff02d5c8b..849ad7736 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -44,7 +44,7 @@ jobs: id: cache-docker-image-restore uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -65,7 +65,7 @@ jobs: id: cache-docker-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -89,7 +89,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -151,7 +151,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -199,7 +199,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -250,7 +250,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -288,7 +288,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -336,7 +336,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -488,7 +488,7 @@ jobs: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image os: linux-amd64 - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -510,7 +510,7 @@ jobs: id: cache-linux-amd64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -545,7 +545,7 @@ jobs: id: cache-linux-amd64-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -599,7 +599,7 @@ jobs: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image os: linux-arm64 - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -621,7 +621,7 @@ jobs: id: cache-linux-arm64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -666,7 +666,7 @@ jobs: id: cache-linux-arm64-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index c2a3da1fb..3d1f4e534 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -41,7 +41,7 @@ jobs: id: cache-docker-image-restore uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -62,7 +62,7 @@ jobs: id: cache-docker-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -86,7 +86,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -148,7 +148,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -196,7 +196,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -247,7 +247,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -285,7 +285,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -333,7 +333,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-docker-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -485,7 +485,7 @@ jobs: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image os: linux-amd64 - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -507,7 +507,7 @@ jobs: id: cache-linux-amd64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -542,7 +542,7 @@ jobs: id: cache-linux-amd64-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -596,7 +596,7 @@ jobs: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image os: linux-arm64 - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -618,7 +618,7 @@ jobs: id: cache-linux-arm64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -663,7 +663,7 @@ jobs: id: cache-linux-arm64-image uses: actions/cache/restore@v3 env: - cache-name: cache-${{ github.ref }} + cache-name: cache-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} From 5855597d9f9938dec3d404e55ed43eee2d27daef Mon Sep 17 00:00:00 2001 From: tdstein Date: Wed, 20 Sep 2023 11:13:02 -0400 Subject: [PATCH 4/4] Changes cache name --- .github/workflows/pull-request.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 3d1f4e534..e2077c6e0 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -41,7 +41,7 @@ jobs: id: cache-docker-image-restore uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -62,7 +62,7 @@ jobs: id: cache-docker-image-save uses: actions/cache/save@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('build/package/Dockerfile') }} @@ -86,7 +86,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -148,7 +148,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -196,7 +196,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -247,7 +247,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -285,7 +285,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -333,7 +333,7 @@ jobs: id: cache-docker-image uses: actions/cache/restore@v3 env: - cache-name: cache-docker-image + cache-name: cached-image with: path: /tmp/build-image.tar key: ${{ runner.os }}-docker-image-${{ env.cache-name }}-${{ hashFiles('/tmp/build-image.tar') }} @@ -485,7 +485,7 @@ jobs: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-amd64-image + cache-name: cached-linux-amd64-image os: linux-amd64 - if: ${{ steps.cache-linux-amd64-restore.outputs.cache-hit != 'true' }} @@ -507,7 +507,7 @@ jobs: id: cache-linux-amd64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cached-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -542,7 +542,7 @@ jobs: id: cache-linux-amd64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-amd64-image + cache-name: cached-linux-amd64-image with: path: /tmp/linux-amd64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -596,7 +596,7 @@ jobs: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} env: - cache-name: cache-linux-arm64-image + cache-name: cached-linux-arm64-image os: linux-arm64 - if: ${{ steps.cache-linux-arm64-restore.outputs.cache-hit != 'true' }} @@ -618,7 +618,7 @@ jobs: id: cache-linux-arm64-image-save uses: actions/cache/save@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cached-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }} @@ -663,7 +663,7 @@ jobs: id: cache-linux-arm64-image uses: actions/cache/restore@v3 env: - cache-name: cache-linux-arm64-image + cache-name: cached-linux-arm64-image with: path: /tmp/linux-arm64-image.tar key: ${{ env.cache-name }}-${{ hashFiles('test/docker/Dockerfile') }}