Skip to content
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

Removing hack folder for bicep types generator #8278

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Removing hack folder for bicep types generator #8278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: radius-bicep-types
path: ./hack/bicep-types-radius/generated
path: ./bicep-types-radius/generated
if-no-files-found: error
- name: 'Login via Azure CLI'
if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
Expand All @@ -305,7 +305,7 @@ jobs:
- name: Publish bicep types
if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
run: |
bicep publish-extension ./hack/bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/radius:${{ env.REL_CHANNEL == 'edge' && 'latest' || env.REL_CHANNEL }} --force
bicep publish-extension ./bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/radius:${{ env.REL_CHANNEL == 'edge' && 'latest' || env.REL_CHANNEL }} --force

publish-release:
name: Publish GitHub Release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functional-test-cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: radius_bicep_types_cloud
path: ./hack/bicep-types-radius/generated
path: ./bicep-types-radius/generated
if-no-files-found: error

- name: 'Login via Azure CLI'
Expand All @@ -376,7 +376,7 @@ jobs:

- name: Publish bicep types
run: |
bicep publish-extension ./hack/bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/test/radius:${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }} --force
bicep publish-extension ./bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/test/radius:${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }} --force

- name: Generate test bicepconfig.json
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functional-test-noncloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.name }}_radius_bicep_types
path: ./hack/bicep-types-radius/generated
path: ./bicep-types-radius/generated
if-no-files-found: error

- name: Create a secure local registry
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:

- name: Publish bicep types
run: |
bicep publish-extension ./hack/bicep-types-radius/generated/index.json --target br:${{ env.LOCAL_REGISTRY_SERVER }}:${{ env.LOCAL_REGISTRY_PORT }}/radius:${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }} --force
bicep publish-extension ./bicep-types-radius/generated/index.json --target br:${{ env.LOCAL_REGISTRY_SERVER }}:${{ env.LOCAL_REGISTRY_PORT }}/radius:${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }} --force

- name: Generate test bicepconfig.json
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
make generate
# Generate resource reference docs
- name: Generate resource reference docs
run: python docs/.github/scripts/generate_resource_references.py ./radius/hack/bicep-types-radius/generated/ ./docs/docs/content/reference/resources
run: python docs/.github/scripts/generate_resource_references.py ./radius/bicep-types-radius/generated/ ./docs/docs/content/reference/resources
- name: Upload resource reference docs
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-bicep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
mkdir tmp-radius-bicep-extension
- name: Publish bicep types
run: |
bicep publish-extension ./hack/bicep-types-radius/generated/index.json --target ./tmp-radius-bicep-extension/radius.tgz
bicep publish-extension ./bicep-types-radius/generated/index.json --target ./tmp-radius-bicep-extension/radius.tgz
- name: Install jq
run: sudo apt-get install -y jq
- name: Modify bicepconfig.json
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ node_modules
tmp-*

# Auto-generated Bicep markdown files
hack/bicep-types-radius/generated/**/*.md
bicep-types-radius/generated/**/*.md

# Bicep extensions
*.tgz
2 changes: 1 addition & 1 deletion .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .prettierignore
pkg/validator/testdata/put-environments-invalid-json.json

hack/bicep-types-radius/generated/*
bicep-types-radius/generated/*

bicep-types/*

Expand Down
0 ...ations.core/2023-10-01-preview/types.json → ...ations.core/2023-10-01-preview/types.json
View file
Open in desktop
File renamed without changes.
0 ...ations.dapr/2023-10-01-preview/types.json → ...ations.dapr/2023-10-01-preview/types.json
View file
Open in desktop
File renamed without changes.
0 ....datastores/2023-10-01-preview/types.json → ....datastores/2023-10-01-preview/types.json
View file
Open in desktop
File renamed without changes.
0 ...s.messaging/2023-10-01-preview/types.json → ...s.messaging/2023-10-01-preview/types.json
View file
Open in desktop
File renamed without changes.
0 hack/bicep-types-radius/generated/index.json → bicep-types-radius/generated/index.json
View file
Open in desktop
File renamed without changes.
0 ...es-radius/src/autorest.bicep/.eslintrc.js → ...es-radius/src/autorest.bicep/.eslintrc.js
View file
Open in desktop
File renamed without changes.
0 ...ypes-radius/src/autorest.bicep/.gitignore → ...ypes-radius/src/autorest.bicep/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ypes-radius/src/autorest.bicep/.npmignore → ...ypes-radius/src/autorest.bicep/.npmignore
View file
Open in desktop
File renamed without changes.
0 ...radius/src/autorest.bicep/.prettierignore → ...radius/src/autorest.bicep/.prettierignore
View file
Open in desktop
File renamed without changes.
0 ...pes-radius/src/autorest.bicep/.prettierrc → ...pes-radius/src/autorest.bicep/.prettierrc
View file
Open in desktop
File renamed without changes.
0 ...types-radius/src/autorest.bicep/README.md → ...types-radius/src/autorest.bicep/README.md
View file
Open in desktop
File renamed without changes.
0 ...-radius/src/autorest.bicep/jest.config.ts → ...-radius/src/autorest.bicep/jest.config.ts
View file
Open in desktop
File renamed without changes.
0 ...dius/src/autorest.bicep/package-lock.json → ...dius/src/autorest.bicep/package-lock.json
View file
Open in desktop
File renamed without changes.
0 ...es-radius/src/autorest.bicep/package.json → ...es-radius/src/autorest.bicep/package.json
View file
Open in desktop
File renamed without changes.
0 ...pes-radius/src/autorest.bicep/src/main.ts → ...pes-radius/src/autorest.bicep/src/main.ts
View file
Open in desktop
File renamed without changes.
0 ...adius/src/autorest.bicep/src/resources.ts → ...adius/src/autorest.bicep/src/resources.ts
View file
Open in desktop
File renamed without changes.
0 .../src/autorest.bicep/src/type-generator.ts → .../src/autorest.bicep/src/type-generator.ts
View file
Open in desktop
File renamed without changes.
0 ...es-radius/src/autorest.bicep/src/utils.ts → ...es-radius/src/autorest.bicep/src/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...orest.bicep/src/writers/markdown-table.ts → ...orest.bicep/src/writers/markdown-table.ts
View file
Open in desktop
File renamed without changes.
0 ...sic/test.rp1/2021-10-31/docs/testtype1.md → ...sic/test.rp1/2021-10-31/docs/testtype1.md
View file
Open in desktop
File renamed without changes.
0 ...ated/basic/test.rp1/2021-10-31/types.json → ...ated/basic/test.rp1/2021-10-31/types.json
View file
Open in desktop
File renamed without changes.
0 ...erated/basic/test.rp1/2021-10-31/types.md → ...erated/basic/test.rp1/2021-10-31/types.md
View file
Open in desktop
File renamed without changes.
0 ...icep/test/integration/integration.test.ts → ...icep/test/integration/integration.test.ts
View file
Open in desktop
File renamed without changes.
0 ...on/specs/basic/resource-manager/README.md → ...on/specs/basic/resource-manager/README.md
View file
Open in desktop
File renamed without changes.
0 ...ager/Test.Rp1/stable/2021-10-31/spec.json → ...ager/Test.Rp1/stable/2021-10-31/spec.json
View file
Open in desktop
File renamed without changes.
0 ...n-types/resource-management/v3/types.json → ...n-types/resource-management/v3/types.json
View file
Open in desktop
File renamed without changes.
0 .../autorest.bicep/test/integration/utils.ts → .../autorest.bicep/test/integration/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...s-radius/src/autorest.bicep/tsconfig.json → ...s-radius/src/autorest.bicep/tsconfig.json
View file
Open in desktop
File renamed without changes.
0 ...p-types-radius/src/generator/.eslintrc.js → ...p-types-radius/src/generator/.eslintrc.js
View file
Open in desktop
File renamed without changes.
0 ...cep-types-radius/src/generator/.gitignore → bicep-types-radius/src/generator/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...es-radius/src/generator/package-lock.json → ...es-radius/src/generator/package-lock.json
View file
Open in desktop
File renamed without changes.
0 ...p-types-radius/src/generator/package.json → ...p-types-radius/src/generator/package.json
View file
Open in desktop
File renamed without changes.
0 ...Bicep.TypeGen.Autorest/packages.lock.json → ...Bicep.TypeGen.Autorest/packages.lock.json
View file
Open in desktop
File renamed without changes.
0 ...-radius/src/generator/src/cmd/generate.ts → ...-radius/src/generator/src/cmd/generate.ts
View file
Open in desktop
File renamed without changes.
0 ...-types-radius/src/generator/src/config.ts → ...-types-radius/src/generator/src/config.ts
View file
Open in desktop
File renamed without changes.
0 ...p-types-radius/src/generator/src/utils.ts → ...p-types-radius/src/generator/src/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...-types-radius/src/generator/tsconfig.json → ...-types-radius/src/generator/tsconfig.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions build/generate.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ generate-bicep-types: generate-node-installed ## Generate Bicep extensibility ty
git submodule update --init --recursive; \
npm --prefix bicep-types/src/bicep-types install; \
npm --prefix bicep-types/src/bicep-types ci && npm --prefix bicep-types/src/bicep-types run build; \
npm --prefix hack/bicep-types-radius/src/autorest.bicep ci && npm --prefix hack/bicep-types-radius/src/autorest.bicep run build; \
echo "Run generator from hack/bicep-types-radius/src/generator dir"; \
npm --prefix hack/bicep-types-radius/src/generator ci && npm --prefix hack/bicep-types-radius/src/generator run generate -- --specs-dir ../../../../swagger --release-version ${VERSION} --verbose
npm --prefix bicep-types-radius/src/autorest.bicep ci && npm --prefix bicep-types-radius/src/autorest.bicep run build; \
echo "Run generator from bicep-types-radius/src/generator dir"; \
npm --prefix bicep-types-radius/src/generator ci && npm --prefix bicep-types-radius/src/generator run generate -- --specs-dir ../../../../swagger --release-version ${VERSION} --verbose

# go-get-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/..
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/contributing-code/contributing-code-organization/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In general you should ask for guidance before creating a new top-level folder in
| `typespec/` | Definitions for generating Radius swagger files. |
| `deploy/` | Assets used to package, deploy, and install Radius |
| `docs/` | All project documentation |
| `hack/` | Utility code to generate Radius bicep types |
| `bicep-types-radius/` | Utility code to generate Radius bicep types |
| `pkg/` | The majority of the Go code powering Radius |
| `swagger/` | OpenAPI Specification v2 files to describe the REST APIs of Radius resource providers |
| `test/` | Integration and end-to-end tests |
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/contributing-code/contributing-code-schema-changes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Note: Alternatively, if you already have the Radius CLI installed, you can choos
make generate
```

1. `cd` into the `hack/bicep-types-radius/generated` folder
1. `cd` into the `bicep-types-radius/generated` folder
1. Run `bicep publish-provider <file> --target <ref>` to upload the schema changes to your file system. The file uploaded will be the `index.json` file as it contains all references to the types schema. The `<file-name>` can be named as desired, but we recommend using an archive (i.e. `.zip`, `.tgz`, etc). This will make it easier to view the files that get uploaded if needed.

```bash
Expand Down
Loading