Merge branch 'main' into add-executable-credentialsource

googleapis · Feb 7, 2024 · b02f3fd · b02f3fd
2 parents a8768b6 + 6e9c9fd
commit b02f3fd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,7 +20,7 @@ jobs:
           with:
             php-version: 7.4
         - name: Install Dependencies
-          uses: nick-invision/retry@v2
+          uses: nick-invision/retry@v3
           with:
             timeout_minutes: 10
             max_attempts: 3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
               with:
                 php-version: ${{ matrix.php }}
             - name: Install Dependencies
-              uses: nick-invision/retry@v2
+              uses: nick-invision/retry@v3
               with:
                 timeout_minutes: 10
                 max_attempts: 3
@@ -37,7 +37,7 @@ jobs:
               with:
                 php-version: "7.4"
             - name: Install Dependencies
-              uses: nick-invision/retry@v2
+              uses: nick-invision/retry@v3
               with:
                 timeout_minutes: 10
                 max_attempts: 3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
  * [feat]: add support for Firebase v6.0 (#391)
 
+## [1.35.0](https://github.com/googleapis/google-auth-library-php/compare/v1.34.0...v1.35.0) (2024-02-01)
+
+
+### Features
+
+* Add `expires_in` and `token_type` to tokens from `ServiceAccountJwtAccessCredentials` ([#513](https://github.com/googleapis/google-auth-library-php/issues/513)) ([ee2436d](https://github.com/googleapis/google-auth-library-php/commit/ee2436da42bcf3b2ee09ec8d9eda086293c3a3d9))
+* Workforce credentials ([#485](https://github.com/googleapis/google-auth-library-php/issues/485)) ([c1b240f](https://github.com/googleapis/google-auth-library-php/commit/c1b240f77e5d2b97c481c9d1f23bd57524a22553))
+
+
+### Bug Fixes
+
+* Disallow vulnerable guzzle versions ([#520](https://github.com/googleapis/google-auth-library-php/issues/520)) ([cb782dd](https://github.com/googleapis/google-auth-library-php/commit/cb782dd46db94e5ae514c8e66cff6faddfeb4ed8))
+
 ## [1.34.0](https://github.com/googleapis/google-auth-library-php/compare/v1.33.0...v1.34.0) (2024-01-03)
 
 

diff --git a/tests/Credentials/ExternalAccountCredentialsTest.php b/tests/Credentials/ExternalAccountCredentialsTest.php
@@ -327,6 +327,9 @@ public function testGetQuotaProject()
     }
 
     /**
+     * Test the getProjectId method, which makes an API call using the project number in order to
+     * retrieve the project ID.
+     *
      * @dataProvider provideGetProjectId
      */
     public function testGetProjectId(array $jsonCreds, string $expectedProjectNumber)
@@ -386,6 +389,11 @@ public function provideGetProjectId()
         ];
     }
 
+    /**
+     * the getProjectId method makes an API call using the project number in order to retrieve the
+     * project ID. Test that a cached access token is used for the API call to fetch the projectId,
+     * instead of retrieving a new one.
+     */
     public function testCacheIsCalledForGetProjectIdWithCache()
     {
         $jsonCreds = [