Skip to content

Commit a159def

Browse files
authored
use submodules, add makefile, use npm instead of yarn, add workflow (#17)
* use submodules, add makefile, use npm instead of yarn, add workflow * fix name * run install * update makefile * add codeowners * add dependabot * wip * wip * dependabot: generate Files changed: M src/pomerium-console/activity_log.client.ts M src/pomerium-console/activity_log.ts M src/pomerium-console/clusters.client.ts M src/pomerium-console/clusters.ts M src/pomerium-console/devices.client.ts M src/pomerium-console/devices.ts M src/pomerium-console/external_data_sources.client.ts M src/pomerium-console/external_data_sources.ts M src/pomerium-console/google/protobuf/descriptor.ts M src/pomerium-console/google/protobuf/duration.ts M src/pomerium-console/google/protobuf/empty.ts M src/pomerium-console/google/protobuf/struct.ts M src/pomerium-console/google/protobuf/timestamp.ts M src/pomerium-console/key_chain.client.ts M src/pomerium-console/key_chain.ts M src/pomerium-console/namespaces.client.ts M src/pomerium-console/namespaces.ts M src/pomerium-console/policy.client.ts M src/pomerium-console/policy.ts M src/pomerium-console/report.client.ts M src/pomerium-console/report.ts M src/pomerium-console/route_health_check.ts M src/pomerium-console/route_redirect_action.ts M src/pomerium-console/routes.client.ts M src/pomerium-console/routes.ts M src/pomerium-console/settings.client.ts M src/pomerium-console/settings.ts M src/pomerium-console/types.ts M src/pomerium-console/users.client.ts M src/pomerium-console/users.ts M src/pomerium-console/validate/validate.ts * wip * wip * update * fix dependabot --------- Co-authored-by: calebdoxsey <calebdoxsey@users.noreply.github.com>
1 parent b573a5c commit a159def

48 files changed

Lines changed: 4357 additions & 2213 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @pomerium/dev-backend

.github/dependabot.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "gitsubmodule"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
groups:
8+
gitsubmodule:
9+
patterns:
10+
- "*"
11+
exclude-patterns:
12+
- "deps/github.com/pomerium/**"
13+
- package-ecosystem: "github-actions"
14+
directory: "/"
15+
schedule:
16+
interval: "monthly"
17+
groups:
18+
github-actions:
19+
patterns:
20+
- "*"
21+
- package-ecosystem: "npm"
22+
directory: "/"
23+
schedule:
24+
interval: "monthly"
25+
groups:
26+
npm:
27+
patterns:
28+
- "*"

.github/workflows/build.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Build
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "main"
8+
9+
jobs:
10+
build:
11+
if: ${{ github.actor != 'dependabot[bot]' }}
12+
name: Build
13+
uses: ./.github/workflows/reusable-build.yaml
14+
with:
15+
ref: ${{ github.head_ref }}

.github/workflows/dependabot.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Dependabot
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
generate:
8+
if: ${{ github.actor == 'dependabot[bot]' }}
9+
name: Generate
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
14+
with:
15+
ref: ${{ github.head_ref }}
16+
submodules: "true"
17+
token: ${{ secrets.APPARITOR_GITHUB_TOKEN }}
18+
19+
- name: Generate
20+
run: make generate
21+
22+
- name: Commit
23+
uses: devops-infra/action-commit-push@e6a24fad602d1f92e46432c89a7e0c7fdd45d62d
24+
with:
25+
github_token: ${{ secrets.APPARITOR_GITHUB_TOKEN }}
26+
commit_message: "dependabot: generate"
27+
28+
build:
29+
if: ${{ github.actor == 'dependabot[bot]' }}
30+
name: Build
31+
needs: generate
32+
uses: ./.github/workflows/reusable-build.yaml
33+
with:
34+
ref: ${{ github.head_ref }}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Build
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
ref:
7+
required: true
8+
type: string
9+
10+
jobs:
11+
build:
12+
name: Build
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
17+
with:
18+
ref: ${{ inputs.ref }}
19+
20+
- name: Setup Node
21+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
22+
23+
- name: Build
24+
run: make build
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Update Pomerium
2+
3+
on:
4+
schedule:
5+
- cron: "40 1 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
update:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
14+
with:
15+
submodules: "true"
16+
token: ${{ secrets.APPARITOR_GITHUB_TOKEN }}
17+
18+
- name: Update Pomerium
19+
run: make update-pomerium
20+
21+
- name: Generate
22+
run: make generate
23+
24+
- name: Check for changes
25+
id: git-diff
26+
run: |
27+
git config --global user.email "apparitor@users.noreply.github.com"
28+
git config --global user.name "GitHub Actions"
29+
git add deps/github.com/pomerium/enterprise-client
30+
git diff --cached --exit-code || echo "changed=true" >> $GITHUB_OUTPUT
31+
32+
- name: Create Pull Request
33+
if: ${{ steps.git-diff.outputs.changed }} == 'true'
34+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
35+
with:
36+
author: GitHub Actions <apparitor@users.noreply.github.com>
37+
body: "This PR updates Pomerium Dependencies"
38+
commit-message: "ci: update pomerium dependencies"
39+
delete-branch: true
40+
labels: ci
41+
title: "ci: update pomerium dependencies"
42+
token: ${{ secrets.APPARITOR_GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
deps/*
2-
lib/*
31
node_modules/
2+
lib/

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "deps/github.com/pomerium/enterprise-client"]
2+
path = deps/github.com/pomerium/enterprise-client
3+
url = git@github.com:pomerium/enterprise-client
4+
[submodule "deps/github.com/envoyproxy/protoc-gen-validate"]
5+
path = deps/github.com/envoyproxy/protoc-gen-validate
6+
url = git@github.com:envoyproxy/protoc-gen-validate
7+
[submodule "deps/github.com/googleapis/googleapis"]
8+
path = deps/github.com/googleapis/googleapis
9+
url = git@github.com:googleapis/googleapis

Makefile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
.PHONY: all
2+
all: generate build
3+
4+
.PHONY: build
5+
build: install
6+
@echo "==> $@"
7+
npm run build
8+
9+
.PHONY: build-cjs
10+
build-cjs: install
11+
@echo "==> $@"
12+
npm run build:cjs
13+
14+
.PHONY: build-esm
15+
build-esm: install
16+
@echo "==> $@"
17+
npm run build:esm
18+
19+
.PHONY: clean
20+
clean:
21+
@echo "==> $@"
22+
npm run clean
23+
24+
.PHONY: generate
25+
generate: install
26+
@echo "==> $@"
27+
./scripts/generate
28+
29+
.PHONY: install
30+
install:
31+
@echo "==> $0"
32+
npm install
33+
34+
.PHONY: update-pomerium
35+
update-pomerium:
36+
@echo "==> $0"
37+
git submodule update --remote deps/github.com/pomerium
Submodule protoc-gen-validate added at 3c1639c

0 commit comments

Comments
 (0)