Skip to content

Commit

Permalink
Merge branch 'v3.27' into fix/refactor-components
Browse files Browse the repository at this point in the history
  • Loading branch information
ryaplots authored Aug 11, 2023
2 parents 184d0b5 + 8e28795 commit 4589469
Show file tree
Hide file tree
Showing 267 changed files with 23,763 additions and 26,354 deletions.
17 changes: 14 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ otherwise we will not be able to process this pull request.
-->

#### Summary

<!--
A short summary, referencing related issues:
Closes #0000, References #0000, etc.
Expand All @@ -12,25 +13,33 @@ Closes #0000, References #0000, etc.
...

#### Changes

<!-- What are the changes made in this pull request? -->

- ...
- ...


#### Testing

<!-- How did you verify that this change works? -->
<!--
Explain the detailed steps to test this feature.
Please note that these steps may be used by others to test this feature.
Describe pre-requisites and/or assumptions made about the testing environment.
-->

...

##### Regressions

<!-- Please indicate features that this change could affect and how that was tested. -->
<!--
Please indicate features that this change could affect and how that was tested.
Also describe the steps required for others to test these regressions.
-->

...

#### Notes for Reviewers

<!--
NOTE: This section is optional.
Expand All @@ -43,10 +52,12 @@ implementation proposal in the referenced issues.
...

#### Checklist

<!-- Make sure that this pull request is complete. -->

- [ ] Scope: The referenced issue is addressed, there are no unrelated changes.
- [ ] Compatibility: The changes are backwards compatible with existing API, storage, configuration and CLI, according to the compatibility commitments in `README.md` for the chosen target branch.
- [ ] Documentation: Relevant documentation is added or updated.
- [ ] The steps/process to test this feature are clearly explained including testing for regressions.
- [ ] Changelog: Significant features, behavior changes, deprecations and fixes are added to `CHANGELOG.md`.
- [ ] Commits: Commit messages follow guidelines in `CONTRIBUTING.md`, there are no fixup commits left.
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
- name: Run stack
run: tools/bin/mage dev:startDevStack &
- name: Run previously failed test first
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v5
if: steps.get-failed-spec.outputs.failed-test != ''
with:
config-file: config/cypress.config.js
Expand All @@ -183,7 +183,7 @@ jobs:
group: previously-failed-${{ needs.determine-if-required.outputs.hash }}
spec: ${{ steps.get-failed-spec.outputs.failed-test }}
- name: Run frontend end-to-end tests
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v5
with:
config-file: config/cypress.config.js
config: baseUrl=https://localhost:8885
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
- name: Run stack
run: tools/bin/mage dev:startDevStack &
- name: Run end-to-end smoke tests (Firefox)
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v5
with:
config-file: config/cypress.config.js
config: baseUrl=https://localhost:8885
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,7 @@ jobs:
run: tools/bin/mage dev:misspell
- name: Format SQL files
run: tools/bin/mage sql:fmt
- name: Format proto files
run: tools/bin/mage proto:fmt
- name: Check for diff
run: tools/bin/mage git:diff
2 changes: 2 additions & 0 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ jobs:
uses: ./.github/actions/build-mage
- name: Generate protos
run: tools/bin/mage proto:clean proto:all
- name: Lint protos
run: tools/bin/mage proto:lint
- name: Check for diff
run: tools/bin/mage git:diff
6 changes: 6 additions & 0 deletions .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ jobs:
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Install Buf
uses: bufbuild/buf-setup-action@v1
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
Expand Down Expand Up @@ -145,6 +147,10 @@ jobs:
env:
DOCKER_CLI_EXPERIMENTAL: enabled
DOCKER_PREFIX: thethingsnetwork
- uses: bufbuild/buf-push-action@v1
with:
input: api
buf_token: ${{ secrets.BUF_TOKEN }}
- name: Prepare merge PR
run: |
gh pr create \
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ For details about compatibility between different releases, see the **Commitment

### Added

- Add support for `administrative_contact` and `technical_contact` in the Console
- Add support for `administrative_contact` and `technical_contact` in the Console.
- Reimplement move away prompt in payload formatter views in the Console.

### Changed

Expand All @@ -21,6 +22,9 @@ For details about compatibility between different releases, see the **Commitment

### Fixed

- OAuth clients created by an admin no longer trigger an email requesting approval from one of the tenant's admins.
- Broken network routing policy links in the Packet Broker panel of the admin panel in the Console.

### Security

## [3.27.0] - 2023-07-31
Expand Down
28 changes: 28 additions & 0 deletions api/buf.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by buf. DO NOT EDIT.
version: v1
deps:
- remote: buf.build
owner: envoyproxy
repository: protoc-gen-validate
commit: 6607b10f00ed4a3d98f906807131c44a
digest: shake256:acc7b2ededb2f88d296862943a003b157bdb68ec93ed13dcd8566b2d06e47993ea6daf12013b9655658aaf6bbdb141cf65bfe400ce2870f4654b0a5b45e57c09
- remote: buf.build
owner: googleapis
repository: googleapis
commit: 711e289f6a384c4caeebaff7c6931ade
digest: shake256:e08fb55dad7469f69df00304eed31427d2d1576e9aab31e6bf86642688e04caaf0372f15fe6974cf79432779a635b3ea401ca69c943976dc42749524e4c25d94
- remote: buf.build
owner: grpc-ecosystem
repository: grpc-gateway
commit: fed2dcdcfd694403ad51cd3c94957830
digest: shake256:ed076a21e3d772892fc465ced0e4dd50f9dba86fdd4473920eaa25efa4807644e8e021be423dcfcee74bf4242e7e57422393f9b1abb10acb18ea1a5df509bb19
- remote: buf.build
owner: thethingsindustries
repository: protoc-gen-go-flags
commit: 52b4cd8b18524e84bb482a76c8cbc40d
digest: shake256:7f437ce3569ccf3a4c47595fc89d3ecc8061cbddef425c96ccff76e72ff30348fc606744da0f28a220889c39cb1317aef3a1683e37f73f1168e3a8972952808b
- remote: buf.build
owner: thethingsindustries
repository: protoc-gen-go-json
commit: a58d3aa4ec3e404b842caf703697a2ad
digest: shake256:1a6505d210fe2437eef5a11c0cf6a4b49ef98239eea06a00ae3189fcbbfa04aa968282881f5375a28d6f09350cc9de596b068a34c27529aac642a575fe5f6e82
153 changes: 153 additions & 0 deletions api/buf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
version: v1
name: buf.build/thethingsnetwork/lorawan-stack
deps:
- buf.build/grpc-ecosystem/grpc-gateway
- buf.build/googleapis/googleapis
- buf.build/envoyproxy/protoc-gen-validate
- buf.build/thethingsindustries/protoc-gen-go-flags
- buf.build/thethingsindustries/protoc-gen-go-json
build:
excludes:
- third_party
breaking:
use:
- FILE
lint:
use:
- DEFAULT
# generated with: $ buf lint --error-format=config-ignore-yaml
ignore_only:
ENUM_NO_ALLOW_ALIAS:
- ttn/lorawan/v3/lorawan.proto
ENUM_VALUE_PREFIX:
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_integrations_alcsync.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/client.proto
- ttn/lorawan/v3/end_device.proto
- ttn/lorawan/v3/enums.proto
- ttn/lorawan/v3/gateway.proto
- ttn/lorawan/v3/lorawan.proto
- ttn/lorawan/v3/messages.proto
- ttn/lorawan/v3/metadata.proto
- ttn/lorawan/v3/rights.proto
ENUM_VALUE_UPPER_SNAKE_CASE:
- ttn/lorawan/v3/rights.proto
ENUM_ZERO_VALUE_SUFFIX:
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_integrations_alcsync.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/client.proto
- ttn/lorawan/v3/contact_info.proto
- ttn/lorawan/v3/devicerepository.proto
- ttn/lorawan/v3/end_device.proto
- ttn/lorawan/v3/enums.proto
- ttn/lorawan/v3/gateway.proto
- ttn/lorawan/v3/lorawan.proto
- ttn/lorawan/v3/messages.proto
- ttn/lorawan/v3/metadata.proto
- ttn/lorawan/v3/notification_service.proto
- ttn/lorawan/v3/rights.proto
FIELD_LOWER_SNAKE_CASE:
- ttn/lorawan/v3/applicationserver_integrations_alcsync.proto
FILE_LOWER_SNAKE_CASE:
- ttn/lorawan/v3/_api.proto
ONEOF_LOWER_SNAKE_CASE:
- ttn/lorawan/v3/lorawan.proto
RPC_REQUEST_RESPONSE_UNIQUE:
- ttn/lorawan/v3/application_services.proto
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_integrations_storage.proto
- ttn/lorawan/v3/applicationserver_packages.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/applicationserver_web.proto
- ttn/lorawan/v3/client_services.proto
- ttn/lorawan/v3/contact_info.proto
- ttn/lorawan/v3/deviceclaimingserver.proto
- ttn/lorawan/v3/devicerepository.proto
- ttn/lorawan/v3/end_device_services.proto
- ttn/lorawan/v3/gateway_services.proto
- ttn/lorawan/v3/gatewayserver.proto
- ttn/lorawan/v3/identityserver.proto
- ttn/lorawan/v3/joinserver.proto
- ttn/lorawan/v3/networkserver.proto
- ttn/lorawan/v3/notification_service.proto
- ttn/lorawan/v3/oauth_services.proto
- ttn/lorawan/v3/organization_services.proto
- ttn/lorawan/v3/packetbrokeragent.proto
- ttn/lorawan/v3/qrcodegenerator.proto
- ttn/lorawan/v3/search_services.proto
- ttn/lorawan/v3/user_services.proto
RPC_REQUEST_STANDARD_NAME:
- ttn/lorawan/v3/application_services.proto
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_packages.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/applicationserver_web.proto
- ttn/lorawan/v3/client_services.proto
- ttn/lorawan/v3/contact_info.proto
- ttn/lorawan/v3/deviceclaimingserver.proto
- ttn/lorawan/v3/devicerepository.proto
- ttn/lorawan/v3/end_device_services.proto
- ttn/lorawan/v3/events.proto
- ttn/lorawan/v3/gateway_services.proto
- ttn/lorawan/v3/gatewayserver.proto
- ttn/lorawan/v3/identityserver.proto
- ttn/lorawan/v3/joinserver.proto
- ttn/lorawan/v3/networkserver.proto
- ttn/lorawan/v3/notification_service.proto
- ttn/lorawan/v3/oauth_services.proto
- ttn/lorawan/v3/organization_services.proto
- ttn/lorawan/v3/packetbrokeragent.proto
- ttn/lorawan/v3/qrcodegenerator.proto
- ttn/lorawan/v3/user_services.proto
RPC_RESPONSE_STANDARD_NAME:
- ttn/lorawan/v3/application_services.proto
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_integrations_storage.proto
- ttn/lorawan/v3/applicationserver_packages.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/applicationserver_web.proto
- ttn/lorawan/v3/client_services.proto
- ttn/lorawan/v3/contact_info.proto
- ttn/lorawan/v3/deviceclaimingserver.proto
- ttn/lorawan/v3/devicerepository.proto
- ttn/lorawan/v3/end_device_services.proto
- ttn/lorawan/v3/events.proto
- ttn/lorawan/v3/gateway_services.proto
- ttn/lorawan/v3/gatewayserver.proto
- ttn/lorawan/v3/identityserver.proto
- ttn/lorawan/v3/joinserver.proto
- ttn/lorawan/v3/networkserver.proto
- ttn/lorawan/v3/notification_service.proto
- ttn/lorawan/v3/oauth_services.proto
- ttn/lorawan/v3/organization_services.proto
- ttn/lorawan/v3/packetbrokeragent.proto
- ttn/lorawan/v3/qrcodegenerator.proto
- ttn/lorawan/v3/search_services.proto
- ttn/lorawan/v3/user_services.proto
SERVICE_SUFFIX:
- ttn/lorawan/v3/application_services.proto
- ttn/lorawan/v3/applicationserver.proto
- ttn/lorawan/v3/applicationserver_integrations_storage.proto
- ttn/lorawan/v3/applicationserver_packages.proto
- ttn/lorawan/v3/applicationserver_pubsub.proto
- ttn/lorawan/v3/applicationserver_web.proto
- ttn/lorawan/v3/client_services.proto
- ttn/lorawan/v3/configuration_services.proto
- ttn/lorawan/v3/contact_info.proto
- ttn/lorawan/v3/deviceclaimingserver.proto
- ttn/lorawan/v3/devicerepository.proto
- ttn/lorawan/v3/end_device_services.proto
- ttn/lorawan/v3/events.proto
- ttn/lorawan/v3/gateway_services.proto
- ttn/lorawan/v3/gatewayserver.proto
- ttn/lorawan/v3/identityserver.proto
- ttn/lorawan/v3/joinserver.proto
- ttn/lorawan/v3/networkserver.proto
- ttn/lorawan/v3/oauth_services.proto
- ttn/lorawan/v3/organization_services.proto
- ttn/lorawan/v3/packetbrokeragent.proto
- ttn/lorawan/v3/qrcodegenerator.proto
- ttn/lorawan/v3/search_services.proto
- ttn/lorawan/v3/user_services.proto
Loading

0 comments on commit 4589469

Please sign in to comment.