From fb268794451f5c5c3f70e7cacd2fdd607f609f21 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Tue, 21 Sep 2021 19:30:30 -0400 Subject: [PATCH] Update references to google now (#8) --- .github/workflows/test.yaml | 6 +++--- README.md | 10 +++++----- action.yml | 4 ++-- dist/index.js | 2 +- package.json | 4 ++-- src/client.ts | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bfff2a7..d0e09ca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -59,7 +59,7 @@ jobs: uses: './' with: create_credentials_file: true - workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/github-oidc-auth-google-cloud' + workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/google-github-actions' service_account: 'github-secret-accessor@actions-oidc-test.iam.gserviceaccount.com' - id: 'gcloud' @@ -89,7 +89,7 @@ jobs: uses: './' with: token_format: 'access_token' - workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/github-oidc-auth-google-cloud' + workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/google-github-actions' service_account: 'github-secret-accessor@actions-oidc-test.iam.gserviceaccount.com' id_token: @@ -113,7 +113,7 @@ jobs: uses: './' with: token_format: 'id_token' - workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/github-oidc-auth-google-cloud' + workload_identity_provider: 'projects/469401941463/locations/global/workloadIdentityPools/github-actions/providers/google-github-actions' service_account: 'github-secret-accessor@actions-oidc-test.iam.gserviceaccount.com' id_token_audience: 'my-aud' id_token_include_email: true diff --git a/README.md b/README.md index b05b01c..381fd56 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# oidc-auth-google-cloud +# auth This GitHub Action exchanges a GitHub Actions OIDC token into a Google Cloud access token using [Workload Identity Federation][wif]. This obviates the need @@ -40,7 +40,7 @@ jobs: steps: - id: 'auth' name: 'Authenticate to Google Cloud' - uses: 'sethvargo/oidc-auth-google-cloud@v0.3.0' + uses: 'google-github-actions/auth@v0.3.0' with: token_format: 'access_token' workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider' @@ -164,7 +164,7 @@ jobs: # Configure Workload Identity Federation via a credentials file. - id: 'auth' name: 'Authenticate to Google Cloud' - uses: 'sethvargo/oidc-auth-google-cloud@v0.3.0' + uses: 'google-github-actions/auth@v0.3.0' with: create_credentials_file: 'access_token' workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider' @@ -202,7 +202,7 @@ jobs: # Configure Workload Identity Federation and generate an access token. - id: 'auth' name: 'Authenticate to Google Cloud' - uses: 'sethvargo/oidc-auth-google-cloud@v0.3.0' + uses: 'google-github-actions/auth@v0.3.0' with: token_format: 'access_token' workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider' @@ -236,7 +236,7 @@ jobs: # Configure Workload Identity Federation and generate an access token. - id: 'auth' name: 'Authenticate to Google Cloud' - uses: 'sethvargo/oidc-auth-google-cloud@v0.3.0' + uses: 'google-github-actions/auth@v0.3.0' with: token_format: 'access_token' workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider' diff --git a/action.yml b/action.yml index 5bccb2f..4980ddd 100644 --- a/action.yml +++ b/action.yml @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: 'OIDC Authenticate to Google Cloud' -author: 'sethvargo' +name: 'Authenticate to Google Cloud' +author: 'Google LLC' description: |- Generate credentials to authenticate to Google Cloud from GitHub Actions using an OIDC token and Workload Identity Federation. diff --git a/dist/index.js b/dist/index.js index 5a0be48..b31fd4d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1894,7 +1894,7 @@ class Client { opts.headers = {}; } if (!opts.headers['User-Agent']) { - opts.headers['User-Agent'] = 'sethvargo:oidc-auth-google-cloud/0.2.1'; + opts.headers['User-Agent'] = 'google-github-actions:auth/0.3.0'; } return new Promise((resolve, reject) => { const req = https_1.default.request(opts, (res) => { diff --git a/package.json b/package.json index de04466..f834314 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "oidc-auth-gcp", "version": "0.1.0", - "description": "Authenticate to Google Cloud using a GitHub Actions OIDC token.", + "description": "Authenticate to Google Cloud using a variety of mechanisms including OIDC tokens.", "main": "dist/index.js", "scripts": { "build": "ncc build src/main.ts", @@ -11,7 +11,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/sethvargo/oidc-auth-gcp" + "url": "https://github.com/google-github-actions/auth" }, "keywords": [ "actions", diff --git a/src/client.ts b/src/client.ts index 030b839..af8262b 100644 --- a/src/client.ts +++ b/src/client.ts @@ -120,7 +120,7 @@ export class Client { } if (!opts.headers['User-Agent']) { - opts.headers['User-Agent'] = 'sethvargo:oidc-auth-google-cloud/0.3.0'; + opts.headers['User-Agent'] = 'google-github-actions:auth/0.3.0'; } return new Promise((resolve, reject) => {