Skip to content

Commit 03c1ff9

Browse files
nithyatsunithyatsu
authored
Merge branch 'main' into add-terraform-bicep-config
2 parents 89d06e1 + 2b66ff8 commit 03c1ff9

79 files changed

Lines changed: 886 additions & 605 deletions

File tree

Some content is hidden

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

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ indent_size = 2
1111
[*.{go,mod}]
1212
indent_style = tab
1313

14+
[*.{tsv}]
15+
indent_style = tab
16+
1417
[*.md]
1518
indent_size = unset
1619

@@ -30,3 +33,12 @@ binary_next_line = true # shfmt: -bn
3033
switch_case_indent = true # shfmt: -ci
3134
space_redirects = true # shfmt: -sr
3235
keep_padding = true # shfmt: -kp
36+
37+
[Makefile]
38+
indent_style = tab
39+
40+
[**/node_modules/**]
41+
ignore = true
42+
43+
[**/.venv/**]
44+
ignore = true

‎.gitattributes‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,23 @@
55
*.{cmd,[cC][mM][dD]} text eol=crlf
66
*.{bat,[bB][aA][tT]} text eol=crlf
77

8-
# Images are binary
9-
*.png binary
10-
*.jpg binary
11-
*.jpeg binary
8+
# Common files
9+
*.pdf binary
10+
11+
# Image files
1212
*.gif binary
13+
*.tif binary
1314
*.ico binary
15+
*.jpg binary
16+
*.jpeg binary
17+
*.png binary
18+
19+
# Microsoft Office documents
20+
*.pptx binary
21+
*.potx binary
22+
*.docx binary
23+
*.dotx binary
24+
*.vsdx binary
1425

1526
# Lock files are generated and should ignore line endings
1627
devcontainer-lock.json -text linguist-generated=true

‎.github/CODEOWNERS‎

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,57 @@
1+
# Code Owners for github.com/radius-project/radius
2+
# Generated from template - do not edit directly
3+
14
# General maintainers and approvers for the entire repository
25
* @radius-project/maintainers-radius @radius-project/approvers-radius
36

4-
# Ownership for dependency-related files. Allow the on-call team to approve dependency version updates (e.g., from Dependabot, Snyk PRs)
5-
# Files in the root directory
6-
**/go.mod @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
7-
**/go.sum @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
8-
9-
# Devcontainer files
10-
.devcontainer/** @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
11-
12-
# Allows on-call members to respond to changes in .github
13-
.github/workflows/*.yaml @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
14-
.github/workflows/*.yml @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
15-
16-
# GitHub configs
17-
.github/*.yaml @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
18-
.github/*.yml @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
19-
20-
# Dockerfile
21-
test/*/Dockerfile @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
22-
deploy/images/*/Dockerfile @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
23-
# node.js npm and pnpm configuration
24-
/.node-version @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
25-
**/package.json @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
26-
**/pnpm-lock.yaml @radius-project/on-call @radius-project/maintainers-radius @radius-project/approvers-radius
7+
# Dependency files - on-call can also approve these (Dependabot, etc.)
8+
9+
# Node.js
10+
**/package.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
11+
**/package-lock.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
12+
**/pnpm-lock.yaml @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
13+
**/yarn.lock @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
14+
**/.nvmrc @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
15+
**/.npmrc @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
16+
**/.node-version @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
17+
**/tsconfig.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
18+
**/tsconfig.*.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
19+
**/*.tsconfig.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
20+
21+
# Go
22+
**/go.mod @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
23+
**/go.sum @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
24+
**/go.work @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
25+
**/go.work.sum @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
26+
**/.go-version @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
27+
28+
# .NET
29+
**/*.csproj @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
30+
**/*.sln @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
31+
**/nuget.config @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
32+
**/global.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
33+
34+
# Python
35+
**/requirements.txt @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
36+
**/pyproject.toml @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
37+
**/uv.lock @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
38+
**/poetry.lock @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
39+
**/Pipfile @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
40+
**/Pipfile.lock @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
41+
**/.python-version @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
42+
43+
# Rust
44+
**/Cargo.toml @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
45+
**/Cargo.lock @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
46+
47+
# Bicep
48+
**/bicepconfig.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
49+
50+
# Container files
51+
**/Dockerfile @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
52+
**/*.Dockerfile @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
53+
**/.devcontainer/*.json @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
54+
55+
# GitHub workflows
56+
.github/workflows/*.yml @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call
57+
.github/workflows/*.yaml @radius-project/maintainers-radius @radius-project/approvers-radius @radius-project/on-call

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
# yaml-language-server: $schema=https://www.schemastore.org/github-workflow.json
2-
3-
# Dependency Review Action
4-
#
5-
# This Action will scan dependency manifest files that change as part of a Pull Request,
6-
# surfacing known-vulnerable versions of the packages declared or updated in the PR.
7-
# Once installed, if the workflow run is marked as required,
8-
# PRs introducing known-vulnerable packages will be blocked from merging.
9-
#
10-
# Source repository: https://github.com/actions/dependency-review-action
112
---
123
name: Dependency Review
134

@@ -18,20 +9,8 @@ permissions: {}
189

1910
jobs:
2011
dependency-review:
21-
name: Dependency Review
22-
runs-on: ubuntu-24.04
23-
timeout-minutes: 5
12+
uses: radius-project/.github/.github/workflows/__dependency-review.yml@main
2413
permissions:
2514
contents: read
2615
pull-requests: write
2716
checks: write
28-
steps:
29-
- name: Checkout
30-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31-
with:
32-
persist-credentials: false
33-
34-
- name: Run Dependency Review
35-
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
36-
with:
37-
comment-summary-in-pr: on-failure

‎.terraform-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.14.9

‎build/build.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ else
5353
endif
5454

5555
# Linker flags: https://cmake.org/cmake/help/latest/envvar/LDFLAGS.html.
56-
LDFLAGS := "-s -w -X $(BASE_PACKAGE_NAME)/pkg/version.channel=$(REL_CHANNEL) -X $(BASE_PACKAGE_NAME)/pkg/version.release=$(REL_VERSION) -X $(BASE_PACKAGE_NAME)/pkg/version.commit=$(GIT_COMMIT) -X $(BASE_PACKAGE_NAME)/pkg/version.version=$(GIT_VERSION) -X $(BASE_PACKAGE_NAME)/pkg/version.chartVersion=$(CHART_VERSION)"
56+
TERRAFORM_VERSION := $(shell cat .terraform-version)
57+
LDFLAGS := "-s -w -X $(BASE_PACKAGE_NAME)/pkg/version.channel=$(REL_CHANNEL) -X $(BASE_PACKAGE_NAME)/pkg/version.release=$(REL_VERSION) -X $(BASE_PACKAGE_NAME)/pkg/version.commit=$(GIT_COMMIT) -X $(BASE_PACKAGE_NAME)/pkg/version.version=$(GIT_VERSION) -X $(BASE_PACKAGE_NAME)/pkg/version.chartVersion=$(CHART_VERSION) -X $(BASE_PACKAGE_NAME)/pkg/recipes/terraform.terraformVersion=$(TERRAFORM_VERSION)"
5758

5859
# Combination of flags into GOARGS.
5960
GOARGS := -v -gcflags $(GCFLAGS) -ldflags $(LDFLAGS)

‎cmd/rad/cmd/debuglogs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func init() {
5656
}
5757

5858
func debugLogs(cmd *cobra.Command, args []string) error {
59-
w, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()), DirectoryConfigFromContext(cmd.Context()))
59+
w, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()))
6060
if err != nil {
6161
return err
6262
}

‎cmd/rad/cmd/resourceExpose.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Press CTRL+C to exit the command and terminate the tunnel.`,
4747
# on local port 5000
4848
rad resource expose --application icecream-store Applications.Core/containers orders --port 5000 --remote-port 80`,
4949
RunE: func(cmd *cobra.Command, args []string) error {
50-
workspace, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()), DirectoryConfigFromContext(cmd.Context()))
50+
workspace, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()))
5151
if err != nil {
5252
return err
5353
}

‎cmd/rad/cmd/resourceLogs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ rad resource logs Applications.Core/containers orders --application icecream-sto
5454
# read logs from the 'daprd' sidecar container of the 'orders' resource of the 'icecream-store' application
5555
rad resource logs Applications.Core/containers orders --application icecream-store --container daprd`,
5656
RunE: func(cmd *cobra.Command, args []string) error {
57-
workspace, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()), DirectoryConfigFromContext(cmd.Context()))
57+
workspace, err := cli.RequireWorkspace(cmd, ConfigFromContext(cmd.Context()))
5858
if err != nil {
5959
return err
6060
}

‎cmd/rad/cmd/root.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ import (
9090
workspace_list "github.com/radius-project/radius/pkg/cli/cmd/workspace/list"
9191
workspace_show "github.com/radius-project/radius/pkg/cli/cmd/workspace/show"
9292
workspace_switch "github.com/radius-project/radius/pkg/cli/cmd/workspace/switch"
93-
"github.com/radius-project/radius/pkg/cli/config"
9493
"github.com/radius-project/radius/pkg/cli/connections"
9594
"github.com/radius-project/radius/pkg/cli/delete"
9695
"github.com/radius-project/radius/pkg/cli/deploy"
@@ -468,20 +467,6 @@ func initConfig() {
468467
}
469468

470469
ConfigHolder.Config = v
471-
472-
wd, err := os.Getwd()
473-
if err != nil {
474-
fmt.Printf("Error: failed to find current working directory: %v\n", err)
475-
os.Exit(1) //nolint:forbidigo // this is OK inside the CLI startup.
476-
}
477-
478-
dc, err := config.LoadDirectoryConfig(wd)
479-
if err != nil {
480-
fmt.Printf("Error: failed to load config: %v\n", err)
481-
os.Exit(1) //nolint:forbidigo // this is OK inside the CLI startup.
482-
}
483-
484-
ConfigHolder.DirectoryConfig = dc
485470
}
486471

487472
// TODO: Deprecate once all the commands are moved to new framework
@@ -494,16 +479,6 @@ func ConfigFromContext(ctx context.Context) *viper.Viper {
494479
return holder.Config
495480
}
496481

497-
// TODO: Deprecate once all the commands are moved to new framework
498-
func DirectoryConfigFromContext(ctx context.Context) *config.DirectoryConfig {
499-
holder := ctx.Value(framework.NewContextKey("config")).(*framework.ConfigHolder)
500-
if holder == nil {
501-
return nil
502-
}
503-
504-
return holder.DirectoryConfig
505-
}
506-
507482
func getRootSpanName() string {
508483
args := os.Args
509484
if len(args) > 1 {

0 commit comments

Comments
 (0)