From d740ab6326f8461acbc4be1109ffa557f8a8ee66 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Tue, 26 Nov 2024 22:34:25 -0800 Subject: [PATCH] Remove unused sshPrivateKey config --- provider-ci/internal/pkg/config.go | 6 ------ .../templates/bridged-provider/.github/workflows/main.yml | 6 ------ .../bridged-provider/.github/workflows/nightly-test.yml | 6 ------ .../bridged-provider/.github/workflows/prerelease.yml | 6 ------ .../bridged-provider/.github/workflows/release.yml | 6 ------ .../.github/workflows/run-acceptance-tests.yml | 6 ------ provider-ci/internal/pkg/templates/defaults.config.yaml | 5 ----- 7 files changed, 41 deletions(-) diff --git a/provider-ci/internal/pkg/config.go b/provider-ci/internal/pkg/config.go index 4612c1168..fae84025a 100644 --- a/provider-ci/internal/pkg/config.go +++ b/provider-ci/internal/pkg/config.go @@ -205,12 +205,6 @@ type Config struct { // https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22docker%3A%22&type=code Docker bool `yaml:"docker"` - // SSHPrivateKey sets up SSH with specified private key before running - // tests in CI job. This should be provided from a secret. Used by the - // docker provider only: - // https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22sshPrivateKey%3A%22&type=code - SSHPrivateKey string `yaml:"sshPrivateKey"` - // GCP authenticates with GCP before running tests in CI job. Used in gcp // and docker: // https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22gcp%3A%22&type=code diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml index 4c3718395..661461d63 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml @@ -200,12 +200,6 @@ jobs: - name: Login to Google Cloud Registry run: gcloud --quiet auth configure-docker #{{- end }}# - #{{- if .Config.SSHPrivateKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@836c84ec59a0e7bc0eabc79988384eb567561ee2 # v0.7.0 - with: - ssh-private-key: #{{ .Config.SSHPrivateKey }}# - #{{- end }}# #{{- if index .Config.SetupScript }}# - name: Run setup script run: #{{ index .Config.SetupScript }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml index 77b97fd23..4327d7e74 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml @@ -109,12 +109,6 @@ jobs: - name: Login to Google Cloud Registry run: gcloud --quiet auth configure-docker #{{- end }}# - #{{- if .Config.SSHPrivateKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@836c84ec59a0e7bc0eabc79988384eb567561ee2 # v0.7.0 - with: - ssh-private-key: #{{ .Config.SSHPrivateKey }}# - #{{- end }}# #{{- if index .Config.SetupScript }}# - name: Run setup script run: #{{ index .Config.SetupScript }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml index ad90b6d47..d730349e8 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml @@ -139,12 +139,6 @@ jobs: - name: Login to Google Cloud Registry run: gcloud --quiet auth configure-docker #{{- end }}# - #{{- if .Config.SSHPrivateKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@836c84ec59a0e7bc0eabc79988384eb567561ee2 # v0.7.0 - with: - ssh-private-key: #{{ .Config.SSHPrivateKey }}# - #{{- end }}# #{{- if index .Config.SetupScript }}# - name: Run setup script run: #{{ index .Config.SetupScript }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml index 87bea980b..9a4168d9e 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml @@ -148,12 +148,6 @@ jobs: - name: Login to Google Cloud Registry run: gcloud --quiet auth configure-docker #{{- end }}# - #{{- if .Config.SSHPrivateKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@836c84ec59a0e7bc0eabc79988384eb567561ee2 # v0.7.0 - with: - ssh-private-key: #{{ .Config.SSHPrivateKey }}# - #{{- end }}# #{{- if index .Config.SetupScript }}# - name: Run setup script run: #{{ index .Config.SetupScript }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml index 4f8a5b891..9ba32e9d4 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml @@ -196,12 +196,6 @@ jobs: - name: Login to Google Cloud Registry run: gcloud --quiet auth configure-docker #{{- end }}# - #{{- if .Config.SSHPrivateKey }}# - - name: Setup SSH key - uses: webfactory/ssh-agent@836c84ec59a0e7bc0eabc79988384eb567561ee2 # v0.7.0 - with: - ssh-private-key: #{{ .Config.SSHPrivateKey }}# - #{{- end }}# #{{- if index .Config.SetupScript }}# - name: Run setup script run: #{{ index .Config.SetupScript }}# diff --git a/provider-ci/internal/pkg/templates/defaults.config.yaml b/provider-ci/internal/pkg/templates/defaults.config.yaml index 0c79147a2..9fb1bb008 100644 --- a/provider-ci/internal/pkg/templates/defaults.config.yaml +++ b/provider-ci/internal/pkg/templates/defaults.config.yaml @@ -210,11 +210,6 @@ checkUpstreamUpgrade: true # Used in 9 providers: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22docker%3A%22&type=code #docker: false -# Setup SSH with specified private key before running tests in CI job. -# This should be provided from a secret -# Used by the docker provider only: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22sshPrivateKey%3A%22&type=code -#sshPrivateKey: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }} - # Authenticate with GCP before running tests in CI job # Used in gcp and docker: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22gcp%3A%22&type=code #gcp: false