Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: provider: coder_workspace_owner: avoid setting null values#232

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.

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

Already on GitHub?Sign in to your account

Merged
johnstcn merged 2 commits intomainfromcj/fixup_datasource_coder_workspace_owner
May 27, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 1 addition & 0 deletionsprovider/provider_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ func TestProviderEmpty(t *testing.T) {
provider "coder" {}
data "coder_provisioner" "me" {}
data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
data "coder_external_auth" "git" {
id = "git"
}
Expand Down
33 changes: 9 additions & 24 deletionsprovider/workspace_owner.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,62 +11,47 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

type Role struct {
Name string `json:"name"`
DisplayName string `json:"display-name"`
}

func workspaceOwnerDataSource() *schema.Resource {
return &schema.Resource{
Description: "Use this data source to fetch information about the workspace owner.",
ReadContext: func(ctx context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
if idStr, ok:= os.LookupEnv("CODER_WORKSPACE_OWNER_ID");ok {
if idStr:= os.Getenv("CODER_WORKSPACE_OWNER_ID");idStr != "" {
rd.SetId(idStr)
} else {
rd.SetId(uuid.NewString())
}

if username, ok:= os.LookupEnv("CODER_WORKSPACE_OWNER");ok {
if username:= os.Getenv("CODER_WORKSPACE_OWNER");username != "" {
_ = rd.Set("name", username)
} else {
_ = rd.Set("name", "default")
}

if fullname, ok:= os.LookupEnv("CODER_WORKSPACE_OWNER_NAME");ok {
if fullname:= os.Getenv("CODER_WORKSPACE_OWNER_NAME");fullname != "" {
_ = rd.Set("full_name", fullname)
} else { // compat: field can be blank, fill in default
_ = rd.Set("full_name", "default")
}

if email, ok:= os.LookupEnv("CODER_WORKSPACE_OWNER_EMAIL");ok {
if email:= os.Getenv("CODER_WORKSPACE_OWNER_EMAIL");email != "" {
_ = rd.Set("email", email)
} else {
_ = rd.Set("email", "default@example.com")
}

if sshPubKey, ok := os.LookupEnv("CODER_WORKSPACE_OWNER_SSH_PUBLIC_KEY"); ok {
_ = rd.Set("ssh_public_key", sshPubKey)
}

if sshPrivKey, ok := os.LookupEnv("CODER_WORKSPACE_OWNER_SSH_PRIVATE_KEY"); ok {
_ = rd.Set("ssh_private_key", sshPrivKey)
}
_ = rd.Set("ssh_public_key", os.Getenv("CODER_WORKSPACE_OWNER_SSH_PUBLIC_KEY"))
_ = rd.Set("ssh_private_key", os.Getenv("CODER_WORKSPACE_OWNER_SSH_PRIVATE_KEY"))

var groups []string
if groupsRaw, ok := os.LookupEnv("CODER_WORKSPACE_OWNER_GROUPS"); ok {
if err := json.NewDecoder(strings.NewReader(groupsRaw)).Decode(&groups); err != nil {
return diag.Errorf("invalid user groups: %s", err.Error())
}
_ = rd.Set("groups", groups)
}

if tok, ok := os.LookupEnv("CODER_WORKSPACE_OWNER_SESSION_TOKEN"); ok {
_ = rd.Set("session_token", tok)
}
_ = rd.Set("groups", groups)

if tok, ok := os.LookupEnv("CODER_WORKSPACE_OWNER_OIDC_ACCESS_TOKEN"); ok {
_ = rd.Set("oidc_access_token", tok)
}
_ = rd.Set("session_token", os.Getenv("CODER_WORKSPACE_OWNER_SESSION_TOKEN"))
_ = rd.Set("oidc_access_token", os.Getenv("CODER_WORKSPACE_OWNER_OIDC_ACCESS_TOKEN"))

return nil
},
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp