Skip to content

feat: store coder_workspace_tags in the database #13294

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 27 commits into from
May 20, 2024
Merged

feat: store coder_workspace_tags in the database #13294

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8507793
WIP
mtojek May 16, 2024
0f34937
parse
mtojek May 16, 2024
ec69cce
update deps
mtojek May 16, 2024
fe1872a
WIP
mtojek May 17, 2024
8ead2d6
merge
mtojek May 17, 2024
b59e3a7
query
mtojek May 17, 2024
e2afd43
Insert
mtojek May 17, 2024
ab1f079
dbmem
mtojek May 17, 2024
849ad82
fix versions
mtojek May 17, 2024
b490c46
fmt
mtojek May 17, 2024
1981571
fix
mtojek May 17, 2024
86c3610
fix migrations
mtojek May 17, 2024
40895b0
WIP
mtojek May 17, 2024
1167fd4
more unit test
mtojek May 17, 2024
b748f6c
WIP
mtojek May 17, 2024
910e6fd
make gen
mtojek May 17, 2024
5accbf7
Fix lint
mtojek May 17, 2024
dae3da7
dbauthz tests
mtojek May 17, 2024
b7c8e05
fix: flake.nix
mtojek May 17, 2024
c29dd4e
fix helper
mtojek May 17, 2024
d14c521
if exists
mtojek May 20, 2024
3b9196b
Merge branch 'main' into 13218-workspace-tags
mtojek May 20, 2024
9dcd3b4
make gen
mtojek May 20, 2024
6b455ce
migration number
mtojek May 20, 2024
0e710c7
more unit tests
mtojek May 20, 2024
e65cdab
vendorHash
mtojek May 20, 2024
767ada8
fix: sort.slice
mtojek May 20, 2024
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
Prev Previous commit
Next Next commit
parse
  • Loading branch information
@mtojek
mtojek committed May 17, 2024
commit 0f34937f5cbb1a4e4d7932b47db80b3447baefa0
7 changes: 5 additions & 2 deletions provisioner/terraform/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)

for _, dataResource := range module.DataResources {
if dataResource.Type != "coder_workspace_tags" {
s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name)
s.logger.Debug(ctx, "skip resource as it is not a coder_workspace_tags", "resource_name", dataResource.Name, "resource_type", dataResource.Type)
continue
}

Expand Down Expand Up @@ -114,6 +114,8 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
if err != nil {
return nil, xerrors.Errorf("can't preview the resource file: %v", err)
}
key = strings.Trim(key, `"`)

value, err := previewFileContent(tagItem.ValueExpr.Range())
if err != nil {
return nil, xerrors.Errorf("can't preview the resource file: %v", err)
Expand All @@ -124,14 +126,15 @@ func (s *server) loadWorkspaceTags(ctx context.Context, module *tfconfig.Module)
}
}
}
return workspaceTags, nil // TODO
return workspaceTags, nil
}

func previewFileContent(fileRange hcl.Range) (string, error) {
body, err := os.ReadFile(fileRange.Filename)
if err != nil {
return "", err
}
return string(fileRange.SliceBytes(body)), nil

}

Expand Down
12 changes: 10 additions & 2 deletions provisioner/terraform/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestParse(t *testing.T) {
// If ErrorContains is not empty, then the ParseComplete should have an Error containing the given string
ErrorContains string
}{
/*{
{
Name: "single-variable",
Files: map[string]string{
"main.tf": `variable "A" {
Expand Down Expand Up @@ -200,7 +200,7 @@ func TestParse(t *testing.T) {
},
},
},
},*/
},
{
Name: "workspace-tags",
Files: map[string]string{
Expand Down Expand Up @@ -252,6 +252,14 @@ func TestParse(t *testing.T) {
}
}`,
},
Response: &proto.ParseComplete{
WorkspaceTags: map[string]string{
"cluster": `"developers"`,
"os": `data.coder_parameter.os_selector.value`,
"debug": `"${data.coder_parameter.feature_debug_enabled.value}+12345"`,
"cache": `data.coder_parameter.feature_cache_enabled.value == "true" ? "nix-with-cache" : "no-cache"`,
},
},
},
}

Expand Down