diff --git a/.github/mistaken-pull-closer.yml b/.github/mistaken-pull-closer.yml index c3e7e5200..586371263 100644 --- a/.github/mistaken-pull-closer.yml +++ b/.github/mistaken-pull-closer.yml @@ -5,7 +5,6 @@ filters: # Don't close PRs in the pubsub_dev branch. - '@.pull_request.base.ref != "pubsub_dev"' - - '@.pull_request.base.ref != "diregapic"' # The message to post to the closed PR. commentBody: | diff --git a/.github/workflows/diregapic.yaml b/.github/workflows/diregapic.yaml deleted file mode 100644 index 26df316eb..000000000 --- a/.github/workflows/diregapic.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -name: DIREGAPIC Updater -on: - schedule: - - cron: '0 * * * *' - workflow_dispatch: - -jobs: - regenerate-compute: - runs-on: ubuntu-latest - container: gcr.io/gapic-images/googleapis:20220222 - steps: - - name: Checkout master - uses: actions/checkout@v3 - with: - ref: master - - name: Download discovery docs - run: | - curl https://www.googleapis.com/discovery/v1/apis/compute/v1/rest --output google/cloud/compute/v1/compute.v1.json - echo compute_revision=$(grep -oP '"revision":\s*"\d+"' google/cloud/compute/v1/compute.v1.json | grep -oP '\d+') >> $GITHUB_ENV - - name: Regenerate API definitions - run: | - bazel build //google/cloud/compute/v1:compute_gen - cp bazel-bin/google/cloud/compute/v1/compute_gen.proto google/cloud/compute/v1/compute.proto - bazel build //google/cloud/compute/v1:compute_grpc_service_config_gen - cp bazel-bin/google/cloud/compute/v1/compute_grpc_service_config_gen.json google/cloud/compute/v1/compute_grpc_service_config.json - bazel build //google/cloud/compute/v1:compute_gapic_gen - cp bazel-bin/google/cloud/compute/v1/compute_gapic_gen.yaml google/cloud/compute/v1/compute_gapic.yaml - echo api_changes=$(git diff-index --shortstat HEAD) >> $GITHUB_ENV - - name: Build GAPIC clients - if: contains(env.api_changes, 'file') - run: | - bazel build //google/cloud/compute/v1/... - bazel build //google/cloud/compute/v1/... - - name: Create PR - uses: googleapis/code-suggester@v2 - env: - ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} - with: - command: pr - upstream_owner: googleapis - upstream_repo: googleapis - title: 'feat: [DIREGAPIC] Update API definitions' - description: 'feat: Update Compute Engine API to revision ${{ env.compute_revision }}' - message: 'feat: Update Compute Engine API to revision ${{ env.compute_revision }}' - primary: 'master' - branch: diregapic - git_dir: '.' - force: true - fork: true diff --git a/google/cloud/video/livestream/v1/outputs.proto b/google/cloud/video/livestream/v1/outputs.proto index d54fa653f..90ab85b4f 100644 --- a/google/cloud/video/livestream/v1/outputs.proto +++ b/google/cloud/video/livestream/v1/outputs.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.video.livestream.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/protobuf/duration.proto"; @@ -106,7 +105,7 @@ message Manifest { // Maximum number of segments that this manifest holds. Once the manifest // reaches this maximum number of segments, whenever a new segment is added to // the manifest, the oldest segment will be removed from the manifest. - // The minimum value is 1 and the default value is 5. + // The minimum value is 3 and the default value is 5. int32 max_segment_count = 4; // How long to keep a segment on the output Google Cloud Storage bucket after diff --git a/google/cloud/video/livestream/v1/resources.proto b/google/cloud/video/livestream/v1/resources.proto index 40407465f..b9159ec97 100644 --- a/google/cloud/video/livestream/v1/resources.proto +++ b/google/cloud/video/livestream/v1/resources.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.video.livestream.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; import "google/cloud/video/livestream/v1/outputs.proto"; @@ -143,8 +142,7 @@ message Channel { // specified output location. STREAMING = 1; - // Channel is waiting for the input stream through the input. Live streams - // do not start yet. + // Channel is waiting for the input stream through the input. AWAITING_INPUT = 2; // Channel is running, but has trouble publishing the live streams onto the @@ -154,6 +152,7 @@ message Channel { // Channel is generating live streams with no input stream. Live streams are // filled out with black screen, while input stream is missing. + // Not supported yet. STREAMING_NO_INPUT = 5; // Channel is stopped, finishing live streams. @@ -366,6 +365,9 @@ message Event { // Event has been created but not scheduled yet. PENDING = 5; + + // Event was stopped before running for its full duration. + STOPPED = 6; } // The resource name of the event, in the form of: diff --git a/google/cloud/video/livestream/v1/service.proto b/google/cloud/video/livestream/v1/service.proto index c2c6f8797..8ef65d808 100644 --- a/google/cloud/video/livestream/v1/service.proto +++ b/google/cloud/video/livestream/v1/service.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.