diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9acbabb1..f3ca5561 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:b9e4584a1fe3c749e3c37c92497b13dce653b2e694f0261f0610eb0e15941357 -# created: 2022-05-05T21:08:42.530332893Z + digest: sha256:ddb19a6df6c1fa081bc99fb29658f306dd64668bc26f75d1353b28296f3a78e6 +# created: 2022-06-07T21:18:30.024751809Z diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index d1e8b5e6..4a30a08e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -3,7 +3,7 @@ branchProtectionRules: isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false + requiresStrictStatusChecks: true requiredStatusCheckContexts: - "ci/kokoro: Samples test" - "ci/kokoro: System test" @@ -15,3 +15,10 @@ branchProtectionRules: - cla/google - windows - OwlBot Post Processor +permissionRules: + - team: yoshi-admins + permission: admin + - team: jsteam-admins + permission: admin + - team: jsteam + permission: push diff --git a/package.json b/package.json index 842997c7..ca68bf53 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "@types/sinon": "^10.0.0", "@types/tmp": "0.2.3", "@types/uuid": "^8.0.0", + "abort-controller": "^3.0.0", "assert": "^2.0.0", "browserify": "^17.0.0", "c8": "^7.0.0", @@ -86,7 +87,6 @@ "webpack-cli": "^4.0.0" }, "dependencies": { - "abort-controller": "^3.0.0", "extend": "^3.0.2", "https-proxy-agent": "^5.0.0", "is-stream": "^2.0.0", diff --git a/src/common.ts b/src/common.ts index de1acbc1..2915b271 100644 --- a/src/common.ts +++ b/src/common.ts @@ -11,7 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {AbortSignal} from 'abort-controller'; import {Agent} from 'http'; import {URL} from 'url'; @@ -100,7 +99,9 @@ export interface GaxiosOptions { validateStatus?: (status: number) => boolean; retryConfig?: RetryConfig; retry?: boolean; - signal?: AbortSignal; + // Should be instance of https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal + // interface. Left as 'any' due to incompatibility between spec and abort-controller. + signal?: any; size?: number; /** * Implementation of `fetch` to use when making the API call. By default,