Skip to content

chore(site): regenerate provisioner stub #9151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 18, 2023
Merged

chore(site): regenerate provisioner stub #9151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b26471d
chore(e2e): regenerate provisioner stub
mtojek Aug 17, 2023
7a19216
fix
mtojek Aug 17, 2023
fc5909e
fix
mtojek Aug 17, 2023
82b3624
revert
mtojek Aug 17, 2023
e56ca1e
fix
mtojek Aug 17, 2023
9919d25
make gen
mtojek Aug 17, 2023
26c905e
Install protoc
mtojek Aug 17, 2023
d1ecde9
Merge branch 'main' into 8789-e2e-parameters
mtojek Aug 18, 2023
220fa2a
Merge branch 'main' into 8789-e2e-parameters
mtojek Aug 18, 2023
4680e8d
do not install protoc
mtojek Aug 18, 2023
b9bc34c
Use nix to build site
mtojek Aug 18, 2023
7ddea77
Install nix
mtojek Aug 18, 2023
da8a9b4
Run pnpm_install on make gen
mtojek Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,15 @@ jobs:
- name: Setup Terraform
uses: ./.github/actions/setup-tf

- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v4

- name: Run the Magic Nix Cache
uses: DeterminateSystems/magic-nix-cache-action@v2

- name: Build
run: |
make -B site/out/index.html
nix-shell --command 'make -B site/out/index.html'

- run: pnpm playwright:install
working-directory: site
Expand Down
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ gen: \
.prettierignore \
site/.prettierrc.yaml \
site/.prettierignore \
site/.eslintignore
site/.eslintignore \
site/e2e/provisionerGenerated.ts
.PHONY: gen

# Mark all generated files as fresh so make thinks they're up-to-date. This is
Expand All @@ -492,6 +493,7 @@ gen/mark-fresh:
site/.prettierrc.yaml \
site/.prettierignore \
site/.eslintignore \
site/e2e/provisionerGenerated.ts \
"
for file in $$files; do
echo "$$file"
Expand Down Expand Up @@ -538,6 +540,11 @@ site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find ./coders
cd site
pnpm run format:types

site/e2e/provisionerGenerated.ts:
cd site
../scripts/pnpm_install.sh
pnpm run gen:provisioner

coderd/rbac/object_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
go run scripts/rbacgen/main.go ./coderd/rbac > coderd/rbac/object_gen.go

Expand Down
2 changes: 1 addition & 1 deletion scripts/helm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ cdroot
temp_dir="$(mktemp -d)"

cdroot
cd ./helm/$chart
cd "./helm/${chart}"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review: not relevant to this PR, but didn't want to open another one for the one-liner

log "--- Updating dependencies"
helm dependency update .
log "--- Packaging helm chart $chart for version $version ($output_path)"
Expand Down
9 changes: 9 additions & 0 deletions site/e2e/provisionerGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export interface RichParameter {
validationMax?: number | undefined
validationMonotonic: string
required: boolean
/** legacy_variable_name was removed (= 14) */
displayName: string
order: number
ephemeral: boolean
}

/** RichParameterValue holds the key/value mapping of a parameter. */
Expand Down Expand Up @@ -356,6 +359,12 @@ export const RichParameter = {
if (message.displayName !== "") {
writer.uint32(122).string(message.displayName)
}
if (message.order !== 0) {
writer.uint32(128).int32(message.order)
}
if (message.ephemeral === true) {
writer.uint32(136).bool(message.ephemeral)
}
return writer
},
}
Expand Down
2 changes: 1 addition & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint:types": "tsc --noEmit",
"playwright:install": "playwright install --with-deps chromium",
"playwright:test": "playwright test --config=e2e/playwright.config.ts",
"gen:provisioner": "protoc --plugin=./node_modules/.bin/protoc-gen-ts-proto --ts_proto_out=./e2e/ --ts_proto_opt=outputJsonMethods=false,outputEncodeMethods=encode-no-creation,outputClientImpl=false,nestJs=false,outputPartialMethods=false,fileSuffix=Generated,suffix=hey -I ../provisionersdk/proto ../provisionersdk/proto/provisioner.proto && prettier --cache --write './e2e/provisionerGenerated.ts'",
"gen:provisioner": "protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./e2e/ --ts_proto_opt=outputJsonMethods=false,outputEncodeMethods=encode-no-creation,outputClientImpl=false,nestJs=false,outputPartialMethods=false,fileSuffix=Generated,suffix=hey -I ../provisionersdk/proto ../provisionersdk/proto/provisioner.proto && pnpm exec prettier --ignore-path '/dev/null' --cache --write './e2e/provisionerGenerated.ts'",
"storybook": "STORYBOOK=true storybook dev -p 6006",
"storybook:build": "storybook build --webpack-stats-json",
"test": "jest --selectProjects test",
Expand Down